X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmadwifi.c;h=42474bc7050c313aa967e8c59a7962dccc47fbaa;hb=f7649ae4a3270efe73f55bd00ca7fb89f269b8ec;hp=053bd7fa2c7a47851c33ae1e19e5c5b38d058132;hpb=b847e8ff2fd928813397466a941947c8fce66d66;p=collectd.git

diff --git a/src/madwifi.c b/src/madwifi.c
index 053bd7fa..42474bc7 100644
--- a/src/madwifi.c
+++ b/src/madwifi.c
@@ -538,7 +538,7 @@ static int madwifi_config (const char *key, const char *value)
 
 
 static void submit (const char *dev, const char *type, const char *ti1,
-			const char *ti2, value_t *val, int len)
+			const char *ti2, value_t *val, size_t len)
 {
 	value_list_t vl = VALUE_LIST_INIT;
 
@@ -558,28 +558,26 @@ static void submit (const char *dev, const char *type, const char *ti1,
 }
 
 static void submit_derive (const char *dev, const char *type, const char *ti1,
-				const char *ti2, derive_t val)
+				const char *ti2, derive_t value)
 {
-	value_t item;
-	item.derive = val;
-	submit (dev, type, ti1, ti2, &item, 1);
+	submit (dev, type, ti1, ti2, &(value_t) { .derive = value }, 1);
 }
 
 static void submit_derive2 (const char *dev, const char *type, const char *ti1,
 				const char *ti2, derive_t val1, derive_t val2)
 {
-	value_t items[2];
-	items[0].derive = val1;
-	items[1].derive = val2;
-	submit (dev, type, ti1, ti2, items, 2);
+	value_t values[] = {
+          { .derive = val1 },
+          { .derive = val2 },
+        };
+
+	submit (dev, type, ti1, ti2, values, STATIC_ARRAY_SIZE (values));
 }
 
 static void submit_gauge (const char *dev, const char *type, const char *ti1,
-				const char *ti2, gauge_t val)
+				const char *ti2, gauge_t value)
 {
-	value_t item;
-	item.gauge = val;
-	submit (dev, type, ti1, ti2, &item, 1);
+	submit (dev, type, ti1, ti2, &(value_t) { .gauge = value }, 1);
 }
 
 static void submit_antx (const char *dev, const char *name,