projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
15037c9
)
Revert "curl_xml plugin: Fixed tautological pointer comparison error."
author
Fabien Wernli
<faxmodem@collectd.org>
Mon, 9 Feb 2015 20:16:32 +0000
(21:16 +0100)
committer
Marc Fournier
<marc.fournier@camptocamp.com>
Tue, 19 May 2015 16:35:56 +0000
(18:35 +0200)
Fixes #931
This reverts commit
0afea60611f115a28b8ec331aba610e3038c1ef2
.
src/curl_xml.c
patch
|
blob
|
history
diff --git
a/src/curl_xml.c
b/src/curl_xml.c
index
28b2ded
..
e31e73d
100644
(file)
--- a/
src/curl_xml.c
+++ b/
src/curl_xml.c
@@
-344,7
+344,7
@@
static int cx_handle_instance_xpath (xmlXPathContextPtr xpath_ctx, /* {{{ */
/* If the base xpath returns more than one block, the result is assumed to be
* a table. The `Instnce' option is not optional in this case. Check for the
* condition and inform the user. */
- if (is_table)
+ if (is_table
&& (vl->type_instance == NULL)
)
{
WARNING ("curl_xml plugin: "
"Base-XPath %s is a table (more than one result was returned), "