From: Fabien Wernli <faxmodem@collectd.org>
Date: Mon, 9 Feb 2015 20:16:32 +0000 (+0100)
Subject: Revert "curl_xml plugin: Fixed tautological pointer comparison error."
X-Git-Tag: collectd-5.5.0~12^2~4^2^2~2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=5e9542b303a5f36b905473c4de6a4ab01f3ed632;p=collectd.git

Revert "curl_xml plugin: Fixed tautological pointer comparison error."
Fixes #931
This reverts commit 0afea60611f115a28b8ec331aba610e3038c1ef2.
---

diff --git a/src/curl_xml.c b/src/curl_xml.c
index 28b2ded0..e31e73d2 100644
--- 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), "