Merge branch 'ff/aggregate'

[collectd.git] / src / ethstat.c

diff --git a/src/ethstat.c b/src/ethstat.c
index bc02477..08381a8 100644 (file)
--- a/src/ethstat.c
+++ b/src/ethstat.c
@@ -66,6 +66,7 @@ static int ethstat_add_interface (const oconfig_item_t *ci) /* {{{ */
   if (tmp == NULL)
     return (-1);
   interfaces = tmp;
+  interfaces[interfaces_num] = NULL;
 
   status = cf_util_get_string (ci, interfaces + interfaces_num);
   if (status != 0)
@@ -104,7 +105,7 @@ static int ethstat_add_map (const oconfig_item_t *ci) /* {{{ */
   memset (map, 0, sizeof (*map));
 
   sstrncpy (map->type, ci->values[1].value.string, sizeof (map->type));
-  if (ci->values_num == 2)
+  if (ci->values_num == 3)
     sstrncpy (map->type_instance, ci->values[2].value.string,
         sizeof (map->type_instance));
 
@@ -303,10 +304,9 @@ static int ethstat_read_interface (char *device)
   {
     const char *stat_name;
 
-    stat_name = (void *) &strings->data[i * ETH_GSTRING_LEN],
-              DEBUG("ethstat plugin: device = \"%s\": %s = %"PRIu64,
-                  device, stat_name,
-                  (uint64_t) stats->data[i]);
+    stat_name = (void *) &strings->data[i * ETH_GSTRING_LEN];
+    DEBUG("ethstat plugin: device = \"%s\": %s = %"PRIu64,
+        device, stat_name, (uint64_t) stats->data[i]);
     ethstat_submit_value (device,
         stat_name, (derive_t) stats->data[i]);
   }