X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_redis.c;h=472241623dd51b02890c9f9324dae3a9a6ec9b56;hb=5523a080010dcb7a61dc0dccc3969a2a048e52f9;hp=36089532cc43ff4b0c14dd89b75a641d69e261f0;hpb=4103105fb43cd72294f165b2541540b3a8a99532;p=collectd.git diff --git a/src/write_redis.c b/src/write_redis.c index 36089532..47224162 100644 --- a/src/write_redis.c +++ b/src/write_redis.c @@ -28,7 +28,6 @@ #include "plugin.h" #include "common.h" -#include "configfile.h" #include #include @@ -168,7 +167,6 @@ static int wr_config_node (oconfig_item_t *ci) /* {{{ */ wr_node_t *node; int timeout; int status; - int i; node = calloc (1, sizeof (*node)); if (node == NULL) @@ -191,7 +189,7 @@ static int wr_config_node (oconfig_item_t *ci) /* {{{ */ return (status); } - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; @@ -233,12 +231,13 @@ static int wr_config_node (oconfig_item_t *ci) /* {{{ */ if (status == 0) { char cb_name[DATA_MAX_NAME_LEN]; - user_data_t ud; ssnprintf (cb_name, sizeof (cb_name), "write_redis/%s", node->name); - ud.data = node; - ud.free_func = wr_config_free; + user_data_t ud = { + .data = node, + .free_func = wr_config_free + }; status = plugin_register_write (cb_name, wr_write, &ud); } @@ -251,9 +250,7 @@ static int wr_config_node (oconfig_item_t *ci) /* {{{ */ static int wr_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;