X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcurl_xml.c;h=924665c72af1b2e792b9a8f317372713f79b1b83;hb=0a8741b9061f8df4a78a448c021612db06e17425;hp=f3aa2d9af432fe33345c755b74e5475ce9c2c76b;hpb=c7d859191d8fbfc129dea8cfaf9e13e78fd6642c;p=collectd.git diff --git a/src/curl_xml.c b/src/curl_xml.c index f3aa2d9a..924665c7 100644 --- a/src/curl_xml.c +++ b/src/curl_xml.c @@ -23,7 +23,6 @@ #include "common.h" #include "plugin.h" -#include "configfile.h" #include "utils_curl_stats.h" #include "utils_llist.h" @@ -1017,7 +1016,6 @@ static int cx_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) @@ -1026,12 +1024,14 @@ static int cx_config_add_url (oconfig_item_t *ci) /* {{{ */ DEBUG ("curl_xml plugin: Registering new read callback: %s", db->instance); - ud.data = (void *) db; - ud.free_func = cx_free; - cb_name = ssnprintf_alloc ("curl_xml-%s-%s", db->instance, db->url); + plugin_register_complex_read (/* group = */ "curl_xml", cb_name, cx_read, - /* interval = */ 0, &ud); + /* interval = */ 0, + &(user_data_t) { + .data = db, + .free_func = cx_free, + }); sfree (cb_name); } else