X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwrite_graphite.c;h=2dce2d716cfb64e8e2802eb1f9e18564979b92d9;hb=d59524524af36bf9e3eb6108d21744076c79701d;hp=f890b97119ed4ef1619101ece18b7391e33bfc7a;hpb=5afde1077e3c8fc119b79caa2572cbf84dbfe5ca;p=collectd.git diff --git a/src/write_graphite.c b/src/write_graphite.c index f890b971..2dce2d71 100644 --- a/src/write_graphite.c +++ b/src/write_graphite.c @@ -43,6 +43,7 @@ */ #include "collectd.h" + #include "common.h" #include "plugin.h" #include "configfile.h" @@ -194,7 +195,6 @@ static int wg_flush_nolock (cdtime_t timeout, struct wg_callback *cb) static int wg_callback_init (struct wg_callback *cb) { struct addrinfo *ai_list; - struct addrinfo *ai_ptr; cdtime_t now; int status; @@ -229,7 +229,7 @@ static int wg_callback_init (struct wg_callback *cb) } assert (ai_list != NULL); - for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) + for (struct addrinfo *ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) { cb->sock_fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol); @@ -475,7 +475,6 @@ static int wg_config_node (oconfig_item_t *ci) struct wg_callback *cb; user_data_t user_data = { 0 }; char callback_name[DATA_MAX_NAME_LEN]; - int i; int status = 0; cb = calloc (1, sizeof (*cb)); @@ -512,7 +511,7 @@ static int wg_config_node (oconfig_item_t *ci) pthread_mutex_init (&cb->send_lock, /* attr = */ NULL); C_COMPLAIN_INIT (&cb->init_complaint); - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; @@ -588,9 +587,7 @@ static int wg_config_node (oconfig_item_t *ci) static int wg_config (oconfig_item_t *ci) { - int i; - - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i;