X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Ftypes_list.c;h=34c222c7870dab6f0bb0a96bd3714910435fdae2;hb=474d70e02d04de92aa7503b3887989729bbbff02;hp=eb50bb8a390969fcf580419b944e05b7fec537b8;hpb=4ea7aebc3f05d082f64a62c679f414cf7cb0e631;p=collectd.git diff --git a/src/daemon/types_list.c b/src/daemon/types_list.c index eb50bb8a..34c222c7 100644 --- a/src/daemon/types_list.c +++ b/src/daemon/types_list.c @@ -25,6 +25,7 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" @@ -102,7 +103,6 @@ static void parse_line (char *buf) char *fields[64]; size_t fields_num; data_set_t *ds; - size_t i; fields_num = strsplit (buf, fields, 64); if (fields_num < 2) @@ -112,12 +112,10 @@ static void parse_line (char *buf) if (fields[0][0] == '#') return; - ds = (data_set_t *) malloc (sizeof (data_set_t)); + ds = calloc (1, sizeof (*ds)); if (ds == NULL) return; - memset (ds, '\0', sizeof (data_set_t)); - sstrncpy (ds->type, fields[0], sizeof (ds->type)); ds->ds_num = fields_num - 1; @@ -128,7 +126,7 @@ static void parse_line (char *buf) return; } - for (i = 0; i < ds->ds_num; i++) + for (size_t i = 0; i < ds->ds_num; i++) if (parse_ds (ds->ds + i, fields[i + 1], strlen (fields[i + 1])) != 0) { ERROR ("types_list: parse_line: Cannot parse data source #%zu "