X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdf.c;h=632787b22be41b678f68487ac6347a6411c7715e;hb=1aa4295ba6875ceb02a7383237bc2485ffab9c1e;hp=83be176469556f53fa627cc682521ffb4db367ff;hpb=f8e1e81d433c5b4e06792c2617abf0e6ec9e76d9;p=collectd.git

diff --git a/src/df.c b/src/df.c
index 83be1764..632787b2 100644
--- a/src/df.c
+++ b/src/df.c
@@ -25,7 +25,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_mount.h"
 #include "utils_ignorelist.h"
 
@@ -162,12 +161,9 @@ static void df_submit_one (char *plugin_instance,
 		const char *type, const char *type_instance,
 		gauge_t value)
 {
-	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].gauge = value;
-
-	vl.values = values;
+	vl.values = &(value_t) { .gauge = value };
 	vl.values_len = 1;
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "df", sizeof (vl.plugin));
@@ -230,7 +226,10 @@ static int df_read (void)
 			}
 
 			/* Duplicate found: leave non-NULL dup_ptr. */
-			if (by_device && (strcmp (mnt_ptr->spec_device, dup_ptr->spec_device) == 0))
+			if (by_device
+                            && (mnt_ptr->spec_device != NULL)
+                            && (dup_ptr->spec_device != NULL)
+                            && (strcmp (mnt_ptr->spec_device, dup_ptr->spec_device) == 0))
 				break;
 			else if (!by_device && (strcmp (mnt_ptr->dir, dup_ptr->dir) == 0))
 				break;