X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frouteros.c;h=6c48826f2a93bbe968eed3a2c09c6f74e64fb4bb;hb=fc2993befd2d9d6d9392cf109f033d0d6f421436;hp=9ea82976d3569e61e62f262b24fc734364bd3b87;hpb=1b10ab706f8b70ce2f086e59a54cc09d671ad989;p=collectd.git diff --git a/src/routeros.c b/src/routeros.c index 9ea82976..6c48826f 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; } } @@ -242,9 +242,7 @@ static int cr_read(user_data_t *user_data) /* {{{ */ status = ros_interface(rd->connection, handle_interface, /* user data = */ rd); if (status != 0) { - char errbuf[128]; - ERROR("routeros plugin: ros_interface failed: %s", - sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("routeros plugin: ros_interface failed: %s", STRERROR(status)); ros_disconnect(rd->connection); rd->connection = NULL; return -1; @@ -255,9 +253,8 @@ static int cr_read(user_data_t *user_data) /* {{{ */ status = ros_registration_table(rd->connection, handle_regtable, /* user data = */ rd); if (status != 0) { - char errbuf[128]; ERROR("routeros plugin: ros_registration_table failed: %s", - sstrerror(status, errbuf, sizeof(errbuf))); + STRERROR(status)); ros_disconnect(rd->connection); rd->connection = NULL; return -1; @@ -270,9 +267,8 @@ static int cr_read(user_data_t *user_data) /* {{{ */ status = ros_system_resource(rd->connection, handle_system_resource, /* user data = */ rd); if (status != 0) { - char errbuf[128]; ERROR("routeros plugin: ros_system_resource failed: %s", - sstrerror(status, errbuf, sizeof(errbuf))); + STRERROR(status)); ros_disconnect(rd->connection); rd->connection = NULL; return -1;