X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fwrite_graphite.c;h=fe2376ad7382f0d2ae14f39ef6500c26e49ec8df;hb=4d370741101aeb037ae52f3529a4a0869e0dc08a;hp=77003f1cd635634d4521008d9b12e7509de1c3bb;hpb=37d3677e95febc653d8f67fc19f67eb4110910eb;p=collectd.git diff --git a/src/write_graphite.c b/src/write_graphite.c index 77003f1c..fe2376ad 100644 --- a/src/write_graphite.c +++ b/src/write_graphite.c @@ -46,7 +46,6 @@ #include "common.h" #include "plugin.h" -#include "configfile.h" #include "utils_complain.h" #include "utils_format_graphite.h" @@ -475,7 +474,6 @@ static int config_set_char (char *dest, static int wg_config_node (oconfig_item_t *ci) { struct wg_callback *cb; - user_data_t user_data = { 0 }; char callback_name[DATA_MAX_NAME_LEN]; int status = 0; @@ -577,12 +575,15 @@ static int wg_config_node (oconfig_item_t *ci) ssnprintf (callback_name, sizeof (callback_name), "write_graphite/%s", cb->name); - user_data.data = cb; - user_data.free_func = wg_callback_free; - plugin_register_write (callback_name, wg_write, &user_data); + user_data_t ud = { + .data = cb, + .free_func = wg_callback_free + }; + + plugin_register_write (callback_name, wg_write, &ud); - user_data.free_func = NULL; - plugin_register_flush (callback_name, wg_flush, &user_data); + ud.free_func = NULL; + plugin_register_flush (callback_name, wg_flush, &ud); return (0); }