Merge branch 'collectd-5.5'

diff --git a/configure.ac b/configure.ac
index 4435193..8dda710 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -486,6 +486,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/daemon/utils_match.c b/src/daemon/utils_match.c
index 5273c90..914b6e2 100644 (file)
--- a/src/daemon/utils_match.c
+++ b/src/daemon/utils_match.c
@@ -170,7 +170,7 @@ static int default_callback (const char __attribute__((unused)) *str,
 
     if (data->ds_type & UTILS_MATCH_CF_DERIVE_INC)
     {
-      data->value.counter++;
+      data->value.derive++;
       data->values_num++;
       return (0);
     }

diff --git a/src/md.c b/src/md.c
index 6a96a90..44cad2e 100644 (file)
--- a/src/md.c
+++ b/src/md.c
@@ -30,6 +30,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 c801984..e734358 100644 (file)
--- a/src/utils_db_query.c
+++ b/src/utils_db_query.c
@@ -257,7 +257,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);
@@ -270,7 +270,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);