X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Frouteros.c;h=131b4da17fdd9a0a5ccc4f1c6c84ff96f67d198c;hb=0b7cd83a5e6bac068ea83a88a5ddcfb07c09fbec;hp=fa08b3b08f3e73e62b0af50b1213822cb25336ed;hpb=88bd89f106abd5c0a9f9a80246e31a16c36a3c6d;p=collectd.git

diff --git a/src/routeros.c b/src/routeros.c
index fa08b3b0..131b4da1 100644
--- a/src/routeros.c
+++ b/src/routeros.c
@@ -89,7 +89,8 @@ static void submit_interface(cr_data_t *rd, /* {{{ */
 
 static int handle_interface(__attribute__((unused))
                             ros_connection_t *c, /* {{{ */
-                            const ros_interface_t *i, void *user_data) {
+                            const ros_interface_t *i,
+                            void *user_data) {
   if ((i == NULL) || (user_data == NULL))
     return EINVAL;
 
@@ -170,7 +171,8 @@ static void submit_regtable(cr_data_t *rd, /* {{{ */
 
 static int handle_regtable(__attribute__((unused))
                            ros_connection_t *c, /* {{{ */
-                           const ros_registration_table_t *r, void *user_data) {
+                           const ros_registration_table_t *r,
+                           void *user_data) {
   if ((r == NULL) || (user_data == NULL))
     return EINVAL;
 
@@ -230,9 +232,7 @@ static int cr_read(user_data_t *user_data) /* {{{ */
     rd->connection =
         ros_connect(rd->node, rd->service, rd->username, rd->password);
     if (rd->connection == NULL) {
-      char errbuf[128];
-      ERROR("routeros plugin: ros_connect failed: %s",
-            sstrerror(errno, errbuf, sizeof(errbuf)));
+      ERROR("routeros plugin: ros_connect failed: %s", STRERRNO);
       return -1;
     }
   }
@@ -376,18 +376,17 @@ static int cr_config_router(oconfig_item_t *ci) /* {{{ */
     }
   }
 
-  snprintf(read_name, sizeof(read_name), "routeros/%s", router_data->node);
-  if (status == 0)
-    status = plugin_register_complex_read(
-        /* group = */ NULL, read_name, cr_read, /* interval = */ 0,
-        &(user_data_t){
-            .data = router_data, .free_func = (void *)cr_free_data,
-        });
-
-  if (status != 0)
+  if (status != 0) {
     cr_free_data(router_data);
+    return status;
+  }
 
-  return status;
+  snprintf(read_name, sizeof(read_name), "routeros/%s", router_data->node);
+  return plugin_register_complex_read(
+      /* group = */ NULL, read_name, cr_read, /* interval = */ 0,
+      &(user_data_t){
+          .data = router_data, .free_func = (void *)cr_free_data,
+      });
 } /* }}} int cr_config_router */
 
 static int cr_config(oconfig_item_t *ci) {