table plugin: Add explicit NULL checks to clear functions.

[collectd.git] / src / tail_csv.c

diff --git a/src/tail_csv.c b/src/tail_csv.c
index ee539eb..b1a3292 100644 (file)
--- a/src/tail_csv.c
+++ b/src/tail_csv.c
@@ -67,7 +67,6 @@ static int tcsv_submit(instance_definition_t *id, metric_definition_t *md,
   vl.values_len = 1;
   vl.values = &v;
 
-  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
   sstrncpy(vl.plugin, "tail_csv", sizeof(vl.plugin));
   if (id->instance != NULL)
     sstrncpy(vl.plugin_instance, id->instance, sizeof(vl.plugin_instance));
@@ -478,11 +477,11 @@ static int tcsv_config_add_file(oconfig_item_t *ci) {
 
   ssnprintf(cb_name, sizeof(cb_name), "tail_csv/%s", id->path);
 
-  user_data_t ud = {.data = id, .free_func = tcsv_instance_definition_destroy};
-
-  status =
-      plugin_register_complex_read(NULL, cb_name, tcsv_read, id->interval, &ud);
-
+  status = plugin_register_complex_read(
+      NULL, cb_name, tcsv_read, id->interval,
+      &(user_data_t){
+          .data = id, .free_func = tcsv_instance_definition_destroy,
+      });
   if (status != 0) {
     ERROR("tail_csv plugin: Registering complex read function failed.");
     tcsv_instance_definition_destroy(id);