X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmic.c;h=51e677598d51ab8bf174e7e9990bec99b2afffbc;hb=4f9418d694d31137b11100298d8e2c18f717ccb5;hp=570da51bcfd56c20296effdd64e570e3ff9eb6b9;hpb=9b43c4ca7442e7886c1fbe339ce57f297872269f;p=collectd.git

diff --git a/src/mic.c b/src/mic.c
index 570da51b..51e67759 100644
--- a/src/mic.c
+++ b/src/mic.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "utils_ignorelist.h"
@@ -149,19 +150,16 @@ static int mic_config (const char *key, const char *value) {
 	return (0);
 }
 
-static void mic_submit_memory_use(int micnumber, const char *type_instance, U32 val)
+static void mic_submit_memory_use(int micnumber, const char *type_instance, U32 value)
 {
-	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
 	/* MicAccessAPI reports KB's of memory, adjust for this */
-	DEBUG("mic plugin: Memory Value Report; %u %lf",val,((gauge_t)val)*1024.0);
-	values[0].gauge = ((gauge_t)val)*1024.0;
+	DEBUG("mic plugin: Memory Value Report; %u %lf",value,((gauge_t)value)*1024.0);
 
-	vl.values=values;
-	vl.values_len=1;
+	vl.values = &(value_t) { .gauge = ((gauge_t)value) * 1024.0 };
+	vl.values_len = 1;
 
-	strncpy (vl.host, hostname_g, sizeof (vl.host));
 	strncpy (vl.plugin, "mic", sizeof (vl.plugin));
 	ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance), "%i", micnumber);
 	strncpy (vl.type, "memory", sizeof (vl.type));
@@ -189,15 +187,12 @@ static int mic_read_memory(int mic)
 	return (0);
 }
 
-static void mic_submit_temp(int micnumber, const char *type, gauge_t val)
+static void mic_submit_temp(int micnumber, const char *type, gauge_t value)
 {
-	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].gauge = val;
-
-	vl.values=values;
-	vl.values_len=1;
+	vl.values = &(value_t) { .gauge = value };
+	vl.values_len = 1;
 
 	strncpy (vl.host, hostname_g, sizeof (vl.host));
 	strncpy (vl.plugin, "mic", sizeof (vl.plugin));
@@ -213,9 +208,8 @@ static void mic_submit_temp(int micnumber, const char *type, gauge_t val)
 static int mic_read_temps(int mic)
 {
 	size_t num_therms = STATIC_ARRAY_SIZE(therm_ids);
-	size_t j;
 
-	for (j = 0; j < num_therms; j++) {
+	for (size_t j = 0; j < num_therms; j++) {
 		U32 status;
 		U32 temp_buffer;
 		U32 buffer_size = (U32)sizeof(temp_buffer);
@@ -237,15 +231,12 @@ static int mic_read_temps(int mic)
 }
 
 static void mic_submit_cpu(int micnumber, const char *type_instance,
-		int core, derive_t val)
+		int core, derive_t value)
 {
-	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].derive = val;
-
-	vl.values=values;
-	vl.values_len=1;
+	vl.values = &(value_t) { .derive = value };
+	vl.values_len = 1;
 
 	strncpy (vl.host, hostname_g, sizeof (vl.host));
 	strncpy (vl.plugin, "mic", sizeof (vl.plugin));
@@ -286,8 +277,7 @@ static int mic_read_cpu(int mic)
 	}
 
 	if (show_cpu_cores) {
-		int j;
-		for (j = 0; j < core_util.core; j++) {
+		for (int j = 0; j < core_util.core; j++) {
 			mic_submit_cpu(mic, "user", j, core_jiffs[j].user);
 			mic_submit_cpu(mic, "sys", j, core_jiffs[j].sys);
 			mic_submit_cpu(mic, "nice", j, core_jiffs[j].nice);
@@ -297,15 +287,12 @@ static int mic_read_cpu(int mic)
 	return (0);
 }
 
-static void mic_submit_power(int micnumber, const char *type, const char *type_instance, gauge_t val)
+static void mic_submit_power(int micnumber, const char *type, const char *type_instance, gauge_t value)
 {
-	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].gauge = val;
-
-	vl.values=values;
-	vl.values_len=1;
+	vl.values = &(value_t) { .gauge = value };
+	vl.values_len = 1;
 
 	strncpy (vl.host, hostname_g, sizeof (vl.host));
 	strncpy (vl.plugin, "mic", sizeof (vl.plugin));
@@ -356,17 +343,16 @@ static int mic_read_power(int mic)
 
 static int mic_read (void)
 {
-	int i;
 	U32 ret;
 	int error;
 
-	error=0;
-	for (i=0;i<num_mics;i++) {
+	error = 0;
+	for (int i = 0;i<num_mics;i++) {
 		ret = MicInitAdapter(&mic_handle,&mics[i]);
 		if (ret != MIC_ACCESS_API_SUCCESS) {
 			ERROR("mic plugin: Problem initializing MicAdapter: %s",
 					MicGetErrorString(ret));
-			error=1;
+			error = 1;
 		}
 
 		if (error == 0 && show_memory)
@@ -385,12 +371,12 @@ static int mic_read (void)
 		if (ret != MIC_ACCESS_API_SUCCESS) {
 			ERROR("mic plugin: Problem closing MicAdapter: %s",
 					MicGetErrorString(ret));
-			error=2;
+			error = 2;
 			break;
 		}
 	}
 	if (num_mics==0)
-		error=3;
+		error = 3;
 	return error;
 }