X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frouteros.c;h=ff8789ed4a365692d2f9a928a4c0b191738fd20b;hb=61a1fa91ba73e4fe3a34949f77c5f017056f2b7a;hp=2512613cd19436f74b3550341366b268c8baa853;hpb=b317e0c149e5ea17fda320b02002920fe887a67c;p=collectd.git

diff --git a/src/routeros.c b/src/routeros.c
index 2512613c..ff8789ed 100644
--- a/src/routeros.c
+++ b/src/routeros.c
@@ -125,7 +125,7 @@ static void cr_submit_counter (cr_data_t *rd, const char *type, /* {{{ */
 
 	vl.values = values;
 	vl.values_len = STATIC_ARRAY_SIZE (values);
-	sstrncpy (vl.host, rd->node, sizeof (vl.host)); /* FIXME */
+	sstrncpy (vl.host, rd->node, sizeof (vl.host));
 	sstrncpy (vl.plugin, "routeros", sizeof (vl.plugin));
 	sstrncpy (vl.type, type, sizeof (vl.type));
 	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
@@ -182,7 +182,7 @@ static int handle_regtable (__attribute__((unused)) ros_connection_t *c, /* {{{
   return (0);
 } /* }}} int handle_regtable */
 
-#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0) /* FIXME */
+#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0)
 static int handle_system_resource (__attribute__((unused)) ros_connection_t *c, /* {{{ */
         const ros_system_resource_t *r,
 	__attribute__((unused)) void *user_data)
@@ -276,7 +276,7 @@ static int cr_read (user_data_t *user_data) /* {{{ */
     }
   }
 
-#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0) /* FIXME */
+#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0)
   if (rd->collect_cpu_load
       || rd->collect_memory
       || rd->collect_df
@@ -350,7 +350,7 @@ static int cr_config_router (oconfig_item_t *ci) /* {{{ */
       cf_util_get_boolean (child, &router_data->collect_interface);
     else if (strcasecmp ("CollectRegistrationTable", child->key) == 0)
       cf_util_get_boolean (child, &router_data->collect_regtable);
-#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0) /* FIXME */
+#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0)
     else if (strcasecmp ("CollectCPULoad", child->key) == 0)
       cf_util_get_boolean (child, &router_data->collect_cpu_load);
     else if (strcasecmp ("CollectMemory", child->key) == 0)
@@ -408,8 +408,8 @@ static int cr_config_router (oconfig_item_t *ci) /* {{{ */
   user_data.data = router_data;
   user_data.free_func = (void *) cr_free_data;
   if (status == 0)
-    status = plugin_register_complex_read (read_name, cr_read,
-	/* interval = */ NULL, &user_data);
+    status = plugin_register_complex_read (/* group = */ NULL, read_name,
+	cr_read, /* interval = */ NULL, &user_data);
 
   if (status != 0)
     cr_free_data (router_data);