X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdaemon%2Ftypes_list.c;h=34c222c7870dab6f0bb0a96bd3714910435fdae2;hb=2761915bed8c6caea41018be3e675aa712cc0b0a;hp=cf28c2e149b838e9c6ecd0b126b498d23d4d8a2a;hpb=4bca6c6b7e03ab4aa0d6a8a59dda3e44608f63f1;p=collectd.git

diff --git a/src/daemon/types_list.c b/src/daemon/types_list.c
index cf28c2e1..34c222c7 100644
--- a/src/daemon/types_list.c
+++ b/src/daemon/types_list.c
@@ -25,10 +25,12 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 
 #include "plugin.h"
 #include "configfile.h"
+#include "types_list.h"
 
 static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
 {
@@ -101,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)
@@ -111,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;
@@ -127,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 "