]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/collectd/0015-curl_xml-plugin-Fixed-tautological-pointer-compariso.patch
Merge branch 'master' into next
[ipfire-2.x.git] / src / patches / collectd / 0015-curl_xml-plugin-Fixed-tautological-pointer-compariso.patch
1 From 0afea60611f115a28b8ec331aba610e3038c1ef2 Mon Sep 17 00:00:00 2001
2 From: Arthur Marble <arthur@info9.net>
3 Date: Sun, 17 Aug 2014 17:34:04 -0500
4 Subject: [PATCH 15/22] curl_xml plugin: Fixed tautological pointer comparison
5 error.
6
7 Fixes: http://bugs.debian.org/758481
8 Signed-off-by: Florian Forster <octo@collectd.org>
9 ---
10 src/curl_xml.c | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13 diff --git a/src/curl_xml.c b/src/curl_xml.c
14 index e31e73d..28b2ded 100644
15 --- a/src/curl_xml.c
16 +++ b/src/curl_xml.c
17 @@ -344,7 +344,7 @@ static int cx_handle_instance_xpath (xmlXPathContextPtr xpath_ctx, /* {{{ */
18 /* If the base xpath returns more than one block, the result is assumed to be
19 * a table. The `Instnce' option is not optional in this case. Check for the
20 * condition and inform the user. */
21 - if (is_table && (vl->type_instance == NULL))
22 + if (is_table)
23 {
24 WARNING ("curl_xml plugin: "
25 "Base-XPath %s is a table (more than one result was returned), "
26 --
27 1.9.3
28