X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_redis.c;h=135a458785ba55da955ea5c3c206a1467c3f4269;hb=141816828389e3ad98f66db29b4a702479dcb05d;hp=4bfcc73d2b5b92fa61bd37e8855a6b2d2657aad9;hpb=82c9b0daf5ff90d01f4a4371f11727cd613e4b01;p=collectd.git diff --git a/src/write_redis.c b/src/write_redis.c index 4bfcc73d..135a4587 100644 --- a/src/write_redis.c +++ b/src/write_redis.c @@ -25,11 +25,11 @@ **/ #include "collectd.h" + #include "plugin.h" #include "common.h" #include "configfile.h" -#include #include #include @@ -64,7 +64,7 @@ static int wr_write (const data_set_t *ds, /* {{{ */ wr_node_t *node = ud->data; char ident[512]; char key[512]; - char value[512]; + char value[512] = { 0 }; char time[24]; size_t value_size; char *value_ptr; @@ -79,7 +79,6 @@ static int wr_write (const data_set_t *ds, /* {{{ */ ident); ssnprintf (time, sizeof (time), "%.9f", CDTIME_T_TO_DOUBLE(vl->time)); - memset (value, 0, sizeof (value)); value_size = sizeof (value); value_ptr = &value[0]; status = format_values (value_ptr, value_size, ds, vl, node->store_rates); @@ -169,12 +168,10 @@ static int wr_config_node (oconfig_item_t *ci) /* {{{ */ wr_node_t *node; int timeout; int status; - int i; - node = malloc (sizeof (*node)); + node = calloc (1, sizeof (*node)); if (node == NULL) return (ENOMEM); - memset (node, 0, sizeof (*node)); node->host = NULL; node->port = 0; node->timeout.tv_sec = 0; @@ -193,7 +190,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; @@ -253,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;