projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'github/pr/1927'
[collectd.git]
/
src
/
tail_csv.c
diff --git
a/src/tail_csv.c
b/src/tail_csv.c
index
79ea466
..
faeb56f
100644
(file)
--- a/
src/tail_csv.c
+++ b/
src/tail_csv.c
@@
-421,7
+421,6
@@
static int tcsv_config_add_file(oconfig_item_t *ci)
/* Registration variables */
char cb_name[DATA_MAX_NAME_LEN];
/* Registration variables */
char cb_name[DATA_MAX_NAME_LEN];
- user_data_t cb_data = { 0 };
id = calloc(1, sizeof(*id));
if (id == NULL)
id = calloc(1, sizeof(*id));
if (id == NULL)
@@
-482,10
+481,12
@@
static int tcsv_config_add_file(oconfig_item_t *ci)
}
ssnprintf (cb_name, sizeof (cb_name), "tail_csv/%s", id->path);
}
ssnprintf (cb_name, sizeof (cb_name), "tail_csv/%s", id->path);
- 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);
+ 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);
if (status != 0){
ERROR("tail_csv plugin: Registering complex read function failed.");
tcsv_instance_definition_destroy(id);