X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpinba.c;h=66b9cd1f0bc49ab5397fd357fc4e6d8fbdc14ed2;hb=0d5f3a040375be8936a85614e31c589f668cebaf;hp=9620f1b8fa813b6fca6b0af32a10d8ab74352ef1;hpb=f25d207699e013bb47c0083fe56b8358a98f6f4d;p=collectd.git diff --git a/src/pinba.c b/src/pinba.c index 9620f1b8..66b9cd1f 100644 --- a/src/pinba.c +++ b/src/pinba.c @@ -99,12 +99,12 @@ typedef struct pinba_statnode_s pinba_statnode_t; * Module global variables */ /* {{{ */ -static pinba_statnode_t *stat_nodes = NULL; -static unsigned int stat_nodes_num = 0; +static pinba_statnode_t *stat_nodes; +static unsigned int stat_nodes_num; static pthread_mutex_t stat_nodes_lock; -static char *conf_node = NULL; -static char *conf_service = NULL; +static char *conf_node; +static char *conf_service; static bool collector_thread_running; static bool collector_thread_do_shutdown; @@ -490,7 +490,7 @@ static void *collector_thread(void *arg) /* {{{ */ receive_loop(); memset(&collector_thread_id, 0, sizeof(collector_thread_id)); - collector_thread_running = 0; + collector_thread_running = false; pthread_exit(NULL); return NULL; } /* }}} void *collector_thread */ @@ -585,7 +585,7 @@ static int plugin_init(void) /* {{{ */ ERROR("pinba plugin: pthread_create(3) failed: %s", STRERRNO); return -1; } - collector_thread_running = 1; + collector_thread_running = true; return 0; } /* }}} */ @@ -596,15 +596,15 @@ static int plugin_shutdown(void) /* {{{ */ int status; DEBUG("pinba plugin: Shutting down collector thread."); - collector_thread_do_shutdown = 1; + collector_thread_do_shutdown = true; status = pthread_join(collector_thread_id, /* retval = */ NULL); if (status != 0) { ERROR("pinba plugin: pthread_join(3) failed: %s", STRERROR(status)); } - collector_thread_running = 0; - collector_thread_do_shutdown = 0; + collector_thread_running = false; + collector_thread_do_shutdown = false; } /* if (collector_thread_running) */ return 0;