X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftail_csv.c;h=86c4fa88705e096b45d96ff9cebfaab32d21e8d2;hb=063a5e75b36173e89ffa18d32d47509f6ef968ec;hp=bb9b58aceaa1edc459bbf7220f581c5e796997db;hpb=b76f88c5bafa82e3c939eb65c13acd431e07cc01;p=collectd.git

diff --git a/src/tail_csv.c b/src/tail_csv.c
index bb9b58ac..86c4fa88 100644
--- a/src/tail_csv.c
+++ b/src/tail_csv.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h" /* plugin_register_*, plugin_dispatch_values */
 #include "common.h" /* auxiliary functions */
 #include "utils_tail.h"
@@ -85,7 +86,7 @@ static int tcsv_submit (instance_definition_t *id,
 static cdtime_t parse_time (char const *tbuf)
 {
     double t;
-    char *endptr = 0;
+    char *endptr = NULL;
 
     errno = 0;
     t = strtod (tbuf, &endptr);
@@ -290,10 +291,9 @@ static int tcsv_config_add_metric(oconfig_item_t *ci){
     int status;
     int i;
 
-    md = (metric_definition_t *)malloc(sizeof(*md));
+    md = calloc(1, sizeof(*md));
     if (md == NULL)
         return (-1);
-    memset(md, 0, sizeof(*md));
     md->name = NULL;
     md->type = NULL;
     md->instance = NULL;
@@ -424,12 +424,11 @@ static int tcsv_config_add_file(oconfig_item_t *ci)
 
     /* Registration variables */
     char cb_name[DATA_MAX_NAME_LEN];
-    user_data_t cb_data;
+    user_data_t cb_data = { 0 };
 
-    id = malloc(sizeof(*id));
+    id = calloc(1, sizeof(*id));
     if (id == NULL)
         return (-1);
-    memset(id, 0, sizeof(*id));
     id->instance = NULL;
     id->path = NULL;
     id->metric_list = NULL;
@@ -486,7 +485,6 @@ static int tcsv_config_add_file(oconfig_item_t *ci)
     }
 
     ssnprintf (cb_name, sizeof (cb_name), "tail_csv/%s", id->path);
-    memset(&cb_data, 0, sizeof(cb_data));
     cb_data.data = id;
     cb_data.free_func = tcsv_instance_definition_destroy;
     status = plugin_register_complex_read(NULL, cb_name, tcsv_read, id->interval, &cb_data);