summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 645dadb)
raw | patch | inline | side by side (parent: 645dadb)
author | Marc Fournier <marc.fournier@camptocamp.com> | |
Wed, 8 Jan 2014 17:05:40 +0000 (18:05 +0100) | ||
committer | Marc Fournier <marc.fournier@camptocamp.com> | |
Wed, 8 Jan 2014 17:15:38 +0000 (18:15 +0100) |
This reverts commit bbbf37d55a3959951604c4be482e9a705a0f86d9.
A different fix for this problem was commited to the collectd-5.4 branch
(8327ee64) and conflicts with this patch. Also, initializing url the
same way as 8327ee64 does it, to avoid a merge conflict.
A different fix for this problem was commited to the collectd-5.4 branch
(8327ee64) and conflicts with this patch. Also, initializing url the
same way as 8327ee64 does it, to avoid a merge conflict.
src/curl_xml.c | patch | blob | history |
diff --git a/src/curl_xml.c b/src/curl_xml.c
index 77aee60b7755c06660706696b9c36de82791c056..b941f02a2942a0d07907d1d6169407cbc49de0d6 100644 (file)
--- a/src/curl_xml.c
+++ b/src/curl_xml.c
long rc;
char *ptr;
char *url;
+ url = db->url;
- db->buffer_fill = 0;
+ db->buffer_fill = 0;
status = curl_easy_perform (curl);
if (status != CURLE_OK)
{
- ERROR ("curl_xml plugin: curl_easy_perform failed with status %i: %s",
- status, db->curl_errbuf);
+ ERROR ("curl_xml plugin: curl_easy_perform failed with status %i: %s (%s)",
+ status, db->curl_errbuf, url);
return (-1);
}