X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcurl_json.c;h=ab0237e14df982a1f621e286014cacb70b14d340;hb=4d370741101aeb037ae52f3529a4a0869e0dc08a;hp=d4e78039e3ab264c08cffeb95d3b4256789412b8;hpb=e6798095bb2f063dd97619399575fef3e0fe501e;p=collectd.git diff --git a/src/curl_json.c b/src/curl_json.c index d4e78039..ab0237e1 100644 --- a/src/curl_json.c +++ b/src/curl_json.c @@ -25,7 +25,6 @@ #include "common.h" #include "plugin.h" -#include "configfile.h" #include "utils_avltree.h" #include "utils_complain.h" #include "utils_curl_stats.h" @@ -759,7 +758,6 @@ static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */ /* If all went well, register this database for reading */ if (status == 0) { - user_data_t ud = { 0 }; char *cb_name; if (db->instance == NULL) @@ -768,12 +766,14 @@ static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */ DEBUG ("curl_json plugin: Registering new read callback: %s", db->instance); - ud.data = (void *) db; - ud.free_func = cj_free; - cb_name = ssnprintf_alloc ("curl_json-%s-%s", db->instance, db->url ? db->url : db->sock); + user_data_t ud = { + .data = db, + .free_func = cj_free + }; + plugin_register_complex_read (/* group = */ NULL, cb_name, cj_read, /* interval = */ db->interval, &ud);