X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=inline;f=src%2Fcurl_json.c;h=582443186876a1d0b6a518532c47fc441972a699;hb=afb38f31abd27d5b4ce08023f8bbbaeeb353c55f;hp=d4e78039e3ab264c08cffeb95d3b4256789412b8;hpb=da612fa9c6a3343b43789569d64197d7c690be52;p=collectd.git diff --git a/src/curl_json.c b/src/curl_json.c index d4e78039..58244318 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,15 +766,15 @@ 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); plugin_register_complex_read (/* group = */ NULL, cb_name, cj_read, /* interval = */ db->interval, - &ud); + &(user_data_t) { + .data = db, + .free_func = cj_free, + }); sfree (cb_name); } else