From fc2993befd2d9d6d9392cf109f033d0d6f421436 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sat, 4 Nov 2017 20:54:30 +0100 Subject: [PATCH] Tree wide: Replace sstrerror() with STRERROR(). --- src/amqp.c | 20 +++++--------------- src/apcups.c | 10 +++++----- src/daemon/plugin.c | 25 ++++++++++--------------- src/email.c | 4 +--- src/exec.c | 5 ++--- src/pinba.c | 4 +--- src/routeros.c | 10 +++------- src/unixsock.c | 3 +-- src/utils_rrdcreate.c | 4 +--- 9 files changed, 29 insertions(+), 56 deletions(-) diff --git a/src/amqp.c b/src/amqp.c index 467b7ff4..96a7510c 100644 --- a/src/amqp.c +++ b/src/amqp.c @@ -441,10 +441,8 @@ static int camqp_connect(camqp_config_t *conf) /* {{{ */ status = amqp_socket_open(socket, CONF(conf, host), conf->port); if (status < 0) { - char errbuf[1024]; status *= -1; - ERROR("amqp plugin: amqp_socket_open failed: %s", - sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("amqp plugin: amqp_socket_open failed: %s", STRERROR(status)); amqp_destroy_connection(conf->connection); conf->connection = NULL; return status; @@ -454,10 +452,8 @@ static int camqp_connect(camqp_config_t *conf) /* {{{ */ /* this interface is deprecated as of rabbitmq-c 0.4 */ sockfd = amqp_open_socket(CONF(conf, host), conf->port); if (sockfd < 0) { - char errbuf[1024]; status = (-1) * sockfd; - ERROR("amqp plugin: amqp_open_socket failed: %s", - sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("amqp plugin: amqp_open_socket failed: %s", STRERROR(status)); amqp_destroy_connection(conf->connection); conf->connection = NULL; return status; @@ -545,10 +541,8 @@ static int camqp_read_body(camqp_config_t *conf, /* {{{ */ while (received < body_size) { status = amqp_simple_wait_frame(conf->connection, &frame); if (status < 0) { - char errbuf[1024]; status = (-1) * status; - ERROR("amqp plugin: amqp_simple_wait_frame failed: %s", - sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("amqp plugin: amqp_simple_wait_frame failed: %s", STRERROR(status)); camqp_close_connection(conf); return status; } @@ -597,10 +591,8 @@ static int camqp_read_header(camqp_config_t *conf) /* {{{ */ status = amqp_simple_wait_frame(conf->connection, &frame); if (status < 0) { - char errbuf[1024]; status = (-1) * status; - ERROR("amqp plugin: amqp_simple_wait_frame failed: %s", - sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("amqp plugin: amqp_simple_wait_frame failed: %s", STRERROR(status)); camqp_close_connection(conf); return status; } @@ -693,9 +685,7 @@ static int camqp_subscribe_init(camqp_config_t *conf) /* {{{ */ status = plugin_thread_create(tmp, /* attr = */ NULL, camqp_subscribe_thread, conf, "amqp subscribe"); if (status != 0) { - char errbuf[1024]; - ERROR("amqp plugin: pthread_create failed: %s", - sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("amqp plugin: pthread_create failed: %s", STRERROR(status)); return status; } diff --git a/src/apcups.c b/src/apcups.c index 31573d1e..262fa424 100644 --- a/src/apcups.c +++ b/src/apcups.c @@ -236,7 +236,8 @@ static int apc_query_server(char const *node, char const *service, char recvline[1024]; char *tokptr; char *toksaveptr; - int try = 0; + int try + = 0; int status; #if APCMAIN @@ -261,7 +262,8 @@ static int apc_query_server(char const *node, char const *service, /* net_send closes the socket on error. */ assert(global_sockfd < 0); if (try == 0) { - try++; + try + ++; count_retries++; continue; } @@ -337,9 +339,7 @@ static int apc_query_server(char const *node, char const *service, net_shutdown(&global_sockfd); if (n < 0) { - char errbuf[1024]; - ERROR("apcups plugin: Reading from socket failed: %s", - sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("apcups plugin: Reading from socket failed: %s", STRERROR(status)); return -1; } diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c index 92b36297..4132f466 100644 --- a/src/daemon/plugin.c +++ b/src/daemon/plugin.c @@ -610,9 +610,7 @@ static void set_thread_name(pthread_t tid, char const *name) { #if defined(HAVE_PTHREAD_SETNAME_NP) int status = pthread_setname_np(tid, n); if (status != 0) { - char errbuf[1024]; - ERROR("set_thread_name(\"%s\"): %s", n, - sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("set_thread_name(\"%s\"): %s", n, STRERROR(status)); } #else /* if defined(HAVE_PTHREAD_SET_NAME_NP) */ pthread_set_name_np(tid, n); @@ -638,10 +636,9 @@ static void start_read_threads(size_t num) /* {{{ */ /* attr = */ NULL, plugin_read_thread, /* arg = */ NULL); if (status != 0) { - char errbuf[1024]; - ERROR("plugin: start_read_threads: pthread_create failed " - "with status %i (%s).", - status, sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("plugin: start_read_threads: pthread_create failed with status %i " + "(%s).", + status, STRERROR(status)); return; } @@ -845,10 +842,9 @@ static void start_write_threads(size_t num) /* {{{ */ /* attr = */ NULL, plugin_write_thread, /* arg = */ NULL); if (status != 0) { - char errbuf[1024]; - ERROR("plugin: start_write_threads: pthread_create failed " - "with status %i (%s).", - status, sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("plugin: start_write_threads: pthread_create failed with status %i " + "(%s).", + status, STRERROR(status)); return; } @@ -2088,10 +2084,9 @@ int plugin_dispatch_values(value_list_t const *vl) { status = plugin_write_enqueue(vl); if (status != 0) { - char errbuf[1024]; - ERROR("plugin_dispatch_values: plugin_write_enqueue failed " - "with status %i (%s).", - status, sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("plugin_dispatch_values: plugin_write_enqueue failed with status %i " + "(%s).", + status, STRERROR(status)); return status; } diff --git a/src/email.c b/src/email.c index e11c6dee..c0f28d04 100644 --- a/src/email.c +++ b/src/email.c @@ -408,9 +408,7 @@ static void *open_connection(void __attribute__((unused)) * arg) { grp = NULL; status = getgrnam_r(group, &sg, grbuf, sizeof(grbuf), &grp); if (status != 0) { - char errbuf[1024]; - log_warn("getgrnam_r (%s) failed: %s", group, - sstrerror(status, errbuf, sizeof(errbuf))); + log_warn("getgrnam_r (%s) failed: %s", group, STRERROR(status)); } else if (grp == NULL) { log_warn("No such group: `%s'", group); } else { diff --git a/src/exec.c b/src/exec.c index 8224d10b..db093aad 100644 --- a/src/exec.c +++ b/src/exec.c @@ -351,7 +351,6 @@ static int fork_child(program_list_t *pl, int *fd_in, int *fd_out, int fd_pipe_in[2] = {-1, -1}; int fd_pipe_out[2] = {-1, -1}; int fd_pipe_err[2] = {-1, -1}; - char errbuf[1024]; int status; int pid; @@ -380,7 +379,7 @@ static int fork_child(program_list_t *pl, int *fd_in, int *fd_out, status = getpwnam_r(pl->user, &sp, nambuf, sizeof(nambuf), &sp_ptr); if (status != 0) { ERROR("exec plugin: Failed to get user information for user ``%s'': %s", - pl->user, sstrerror(status, errbuf, sizeof(errbuf))); + pl->user, STRERROR(status)); goto failed; } @@ -415,7 +414,7 @@ static int fork_child(program_list_t *pl, int *fd_in, int *fd_out, if (status != 0) { ERROR("exec plugin: Failed to get group information " "for group ``%s'': %s", - pl->group, sstrerror(status, errbuf, sizeof(errbuf))); + pl->group, STRERROR(status)); goto failed; } if (gr_ptr == NULL) { diff --git a/src/pinba.c b/src/pinba.c index d5adc9f6..339988df 100644 --- a/src/pinba.c +++ b/src/pinba.c @@ -600,9 +600,7 @@ static int plugin_shutdown(void) /* {{{ */ status = pthread_join(collector_thread_id, /* retval = */ NULL); if (status != 0) { - char errbuf[1024]; - ERROR("pinba plugin: pthread_join(3) failed: %s", - sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("pinba plugin: pthread_join(3) failed: %s", STRERROR(status)); } collector_thread_running = 0; diff --git a/src/routeros.c b/src/routeros.c index 131b4da1..6c48826f 100644 --- a/src/routeros.c +++ b/src/routeros.c @@ -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; diff --git a/src/unixsock.c b/src/unixsock.c index 7cbb385c..bceafe6d 100644 --- a/src/unixsock.c +++ b/src/unixsock.c @@ -138,9 +138,8 @@ static int us_open_socket(void) { status = getgrnam_r(grpname, &sg, grbuf, sizeof(grbuf), &g); if (status != 0) { - char errbuf[1024]; WARNING("unixsock plugin: getgrnam_r (%s) failed: %s", grpname, - sstrerror(status, errbuf, sizeof(errbuf))); + STRERROR(status)); break; } if (g == NULL) { diff --git a/src/utils_rrdcreate.c b/src/utils_rrdcreate.c index 87ad968d..92cecd03 100644 --- a/src/utils_rrdcreate.c +++ b/src/utils_rrdcreate.c @@ -556,9 +556,7 @@ static int srrd_create_async(const char *filename, /* {{{ */ status = pthread_create(&thread, &attr, srrd_create_thread, args); if (status != 0) { - char errbuf[1024]; - ERROR("srrd_create_async: pthread_create failed: %s", - sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("srrd_create_async: pthread_create failed: %s", STRERROR(status)); pthread_attr_destroy(&attr); srrd_create_args_destroy(args); return status; -- 2.11.0