X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmemcached.c;h=9e6e725293d152561bd3287427f3e90dffb217f5;hb=db961f476426f5dd3ca1663ffc094f0fc7f6f8a2;hp=42882ae5082b34a1e99dbb387982a24684dac16a;hpb=6159b6f81403b90eb2b1f1c60fa8006cd3405d1b;p=collectd.git diff --git a/src/memcached.c b/src/memcached.c index 42882ae5..9e6e7252 100644 --- a/src/memcached.c +++ b/src/memcached.c @@ -32,7 +32,6 @@ #include "common.h" #include "plugin.h" -#include "configfile.h" #include #include @@ -549,16 +548,17 @@ static int memcached_read (user_data_t *user_data) static int memcached_add_read_callback (memcached_t *st) { - user_data_t ud = { 0 }; char callback_name[3*DATA_MAX_NAME_LEN]; int status; - ud.data = st; - ud.free_func = memcached_free; - assert (st->name != NULL); ssnprintf (callback_name, sizeof (callback_name), "memcached/%s", st->name); + user_data_t ud = { + .data = st, + .free_func = memcached_free + }; + status = plugin_register_complex_read (/* group = */ "memcached", /* name = */ callback_name, /* callback = */ memcached_read,