projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix double declaration
[collectd.git]
/
src
/
curl_json.c
diff --git
a/src/curl_json.c
b/src/curl_json.c
index
1cf6381
..
2dac747
100644
(file)
--- a/
src/curl_json.c
+++ b/
src/curl_json.c
@@
-760,7
+760,7
@@
static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */
/* If all went well, register this database for reading */
if (status == 0)
{
/* If all went well, register this database for reading */
if (status == 0)
{
- user_data_t ud;
+ user_data_t ud
= { 0 }
;
char *cb_name;
if (db->instance == NULL)
char *cb_name;
if (db->instance == NULL)
@@
-769,7
+769,6
@@
static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */
DEBUG ("curl_json plugin: Registering new read callback: %s",
db->instance);
DEBUG ("curl_json plugin: Registering new read callback: %s",
db->instance);
- memset (&ud, 0, sizeof (ud));
ud.data = (void *) db;
ud.free_func = cj_free;
ud.data = (void *) db;
ud.free_func = cj_free;
@@
-922,7
+921,7
@@
static int cj_curl_perform(cj_t *db) /* {{{ */
return (-1);
}
if (db->stats != NULL)
return (-1);
}
if (db->stats != NULL)
- curl_stats_dispatch (db->stats, db->curl, cj_host (db), "curl_json", db->instance
, NULL
);
+ curl_stats_dispatch (db->stats, db->curl, cj_host (db), "curl_json", db->instance);
curl_easy_getinfo(db->curl, CURLINFO_EFFECTIVE_URL, &url);
curl_easy_getinfo(db->curl, CURLINFO_RESPONSE_CODE, &rc);
curl_easy_getinfo(db->curl, CURLINFO_EFFECTIVE_URL, &url);
curl_easy_getinfo(db->curl, CURLINFO_RESPONSE_CODE, &rc);
@@
-968,9
+967,9
@@
static int cj_perform (cj_t *db) /* {{{ */
}
#if HAVE_YAJL_V2
}
#if HAVE_YAJL_V2
-
status = yajl_complete_parse(db->yajl);
+ status = yajl_complete_parse(db->yajl);
#else
#else
-
status = yajl_parse_complete(db->yajl);
+ status = yajl_parse_complete(db->yajl);
#endif
if (status != yajl_status_ok)
{
#endif
if (status != yajl_status_ok)
{