Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

[ipfire-2.x.git] / src / patches / collectd / 0015-curl_xml-plugin-Fixed-tautological-pointer-compariso.patch

From 0afea60611f115a28b8ec331aba610e3038c1ef2 Mon Sep 17 00:00:00 2001
From: Arthur Marble <arthur@info9.net>
Date: Sun, 17 Aug 2014 17:34:04 -0500
Subject: [PATCH 15/22] curl_xml plugin: Fixed tautological pointer comparison
 error.

Fixes: http://bugs.debian.org/758481
Signed-off-by: Florian Forster <octo@collectd.org>
---
 src/curl_xml.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/curl_xml.c b/src/curl_xml.c
index e31e73d..28b2ded 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 && (vl->type_instance == NULL))
+  if (is_table)
   {
     WARNING ("curl_xml plugin: "
         "Base-XPath %s is a table (more than one result was returned), "
-- 
1.9.3