Many build fixes that turned up with GCC 4.6.

[collectd.git] / src / disk.c

diff --git a/src/disk.c b/src/disk.c
index 0a90899..6187459 100644 (file)
--- a/src/disk.c
+++ b/src/disk.c
@@ -426,7 +426,6 @@ static int disk_read (void)
        int numfields;
        int fieldshift = 0;
 
        int numfields;
        int fieldshift = 0;
 

-       int major = 0;

        int minor = 0;
 
        counter_t read_sectors  = 0;
        int minor = 0;
 
        counter_t read_sectors  = 0;


@@ -464,7 +463,6 @@ static int disk_read (void)
                if ((numfields != (14 + fieldshift)) && (numfields != 7))
                        continue;
 
                if ((numfields != (14 + fieldshift)) && (numfields != 7))
                        continue;
 

-               major = atoll (fields[0]);

                minor = atoll (fields[1]);
 
                disk_name = fields[2 + fieldshift];
                minor = atoll (fields[1]);
 
                disk_name = fields[2 + fieldshift];