From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 11 Aug 2016 15:45:48 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.6.0~3^2~5
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=9d3906a53e086d520b5ed71ca57118e8f589574b;hp=a7b0cdea4f6a0f8d29ade21ae058182f720dd432

Merge branch 'collectd-5.4' into collectd-5.5
---

diff --git a/configure.ac b/configure.ac
index ceb0b30d..d214d57a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -440,6 +440,7 @@ then
 #include <linux/major.h>
 #include <linux/types.h>
 ])
+	AC_CHECK_HEADERS([sys/sysmacros.h])
 else
 	have_linux_raid_md_u_h="no"
 fi
diff --git a/src/md.c b/src/md.c
index 3725f9a9..b34cc975 100644
--- a/src/md.c
+++ b/src/md.c
@@ -29,6 +29,10 @@
 #include <linux/major.h>
 #include <linux/raid/md_u.h>
 
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
+
 #define PROC_DISKSTATS "/proc/diskstats"
 #define DEV_DIR "/dev"
 
diff --git a/src/utils_db_query.c b/src/utils_db_query.c
index a5e2f09c..fcded6b4 100644
--- a/src/utils_db_query.c
+++ b/src/utils_db_query.c
@@ -248,7 +248,7 @@ static int udb_result_submit (udb_result_t *r, /* {{{ */
     {
       int status = strjoin (vl.type_instance, sizeof (vl.type_instance),
           r_area->instances_buffer, r->instances_num, "-");
-      if (status != 0)
+      if (status < 0)
       {
         ERROR ("udb_result_submit: creating type_instance failed with status %d.",
             status);
@@ -261,7 +261,7 @@ static int udb_result_submit (udb_result_t *r, /* {{{ */
 
       int status = strjoin (tmp, sizeof (tmp), r_area->instances_buffer,
           r->instances_num, "-");
-      if (status != 0)
+      if (status < 0)
       {
         ERROR ("udb_result_submit: creating type_instance failed with status %d.",
             status);