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
/
write_graphite.c
diff --git
a/src/write_graphite.c
b/src/write_graphite.c
index
77003f1
..
845ba89
100644
(file)
--- a/
src/write_graphite.c
+++ b/
src/write_graphite.c
@@
-46,7
+46,6
@@
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include "configfile.h"
#include "utils_complain.h"
#include "utils_format_graphite.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;
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;
char callback_name[DATA_MAX_NAME_LEN];
int status = 0;
@@
-577,12
+575,13
@@
static int wg_config_node (oconfig_item_t *ci)
ssnprintf (callback_name, sizeof (callback_name), "write_graphite/%s",
cb->name);
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);
+ plugin_register_write (callback_name, wg_write,
+ &(user_data_t) {
+ .data = cb,
+ .free_func = wg_callback_free,
+ });
- user_data.free_func = NULL;
- plugin_register_flush (callback_name, wg_flush, &user_data);
+ plugin_register_flush (callback_name, wg_flush, &(user_data_t) { .data = cb });
return (0);
}
return (0);
}