X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdf.c;h=4a86799c2e5d7ec7a3bbb6b3003bca8879eede0b;hb=7dcf9ab7675fe91d1bd74998f55031bc3b0480c0;hp=74292d7e5b3478d45136bf3640ad3bb8e115d284;hpb=f0398d0364bc5819471138f646cea6926a0c40bc;p=collectd.git

diff --git a/src/df.c b/src/df.c
index 74292d7e..4a86799c 100644
--- a/src/df.c
+++ b/src/df.c
@@ -17,14 +17,14 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  *
  * Authors:
- *   Florian octo Forster <octo at verplant.org>
+ *   Florian octo Forster <octo at collectd.org>
  *   Paul Sadauskas <psadauskas at gmail.com>
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_mount.h"
 #include "utils_ignorelist.h"
 
@@ -53,7 +53,6 @@ static const char *config_keys[] =
 	"FSType",
 	"IgnoreSelected",
 	"ReportByDevice",
-	"ReportReserved",
 	"ReportInodes",
 	"ValuesAbsolute",
 	"ValuesPercentage"
@@ -191,7 +190,6 @@ static int df_read (void)
 #endif
 	/* struct STATANYFS statbuf; */
 	cu_mount_t *mnt_list;
-	cu_mount_t *mnt_ptr;
 
 	mnt_list = NULL;
 	if (cu_mount_getlist (&mnt_list) == NULL)
@@ -200,7 +198,7 @@ static int df_read (void)
 		return (-1);
 	}
 
-	for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next)
+	for (cu_mount_t *mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next)
 	{
 		unsigned long long blocksize;
 		char disk_name[256];
@@ -271,19 +269,15 @@ static int df_read (void)
 		else
 		{
 			if (strcmp (mnt_ptr->dir, "/") == 0)
-			{
-				if (strcmp (mnt_ptr->type, "rootfs") == 0)
-					continue;
 				sstrncpy (disk_name, "root", sizeof (disk_name));
-			}
 			else
 			{
-				int i, len;
+				int len;
 
 				sstrncpy (disk_name, mnt_ptr->dir + 1, sizeof (disk_name));
 				len = strlen (disk_name);
 
-				for (i = 0; i < len; i++)
+				for (int i = 0; i < len; i++)
 					if (disk_name[i] == '/')
 						disk_name[i] = '-';
 			}