Changeset 3060 in MondoRescue for branches/3.0/mondo/src/common/libmondo-mountlist.c

Timestamp:

Nov 10, 2012, 5:05:37 AM (11 years ago)

Author:

Bruno Cornec

Message:

r5035@localhost: bruno | 2012-11-09 03:17:01 +0100

• Fix a compilation error and most compilation warnings

File:

• branches/3.0/mondo/src/common/libmondo-mountlist.c (modified) (10 diffs)

branches/3.0/mondo/src/common/libmondo-mountlist.c

@@ -50 +50 @@
     int pos = 0, npos = 0;
     int res = 0;
-    int mountpoint_copies = 0;
     int device_copies = 0;
     int i = 0;
@@ -111 +110 @@
             }
             /* does partition /dev/adXsYZ exist more than once in the mountlist? */
-            for (i = 0, mountpoint_copies = 0, device_copies = 0;
+            for (i = 0, device_copies = 0;
                  i < mountlist->entries; i++) {
                 if (!strcmp(device, mountlist->el[i].device)) {
@@ -208 +207 @@
             }
             /* does partition /dev/adXsY exist more than once in the mountlist? */
-            for (i = 0, mountpoint_copies = 0, device_copies = 0;
+            for (i = 0, device_copies = 0;
                  i < mountlist->entries; i++) {
                 if (!strcmp(device, mountlist->el[i].device)) {
@@ -271 +270 @@
                 }
                 /* does partition /dev/adXsYZ exist more than once in the mountlist? */
-                for (i = 0, mountpoint_copies = 0, device_copies = 0;
+                for (i = 0, device_copies = 0;
                      i < mountlist->entries; i++) {
                     if (!strcmp(device, mountlist->el[i].device)) {
@@ -372 +371 @@
     int pos = 0;
     int res = 0;
-    int mountpoint_copies = 0;
     int device_copies = 0;
     int i = 0;
@@ -454 +452 @@
         }
         /* does partition /dev/hdNX exist more than once in the mountlist? */
-        for (i = 0, mountpoint_copies = 0, device_copies = 0;
+        for (i = 0, device_copies = 0;
              i < mountlist->entries; i++) {
             if (!strcmp(device, mountlist->el[i].device)) {
@@ -812 +810 @@
     char *tmp = NULL;
     char *p = NULL;
+    char *q = NULL;
 
     int items = 0;
@@ -827 +826 @@
     malloc_string(incoming);
     malloc_string(siz);
-    (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+    q = fgets(incoming, MAX_STR_LEN - 1, fin);
     log_it("Loading mountlist...");
-    while (!feof(fin)) {
+    while (!feof(fin) && (q != NULL)) {
 #if linux
         res = sscanf(incoming,
@@ -863 +862 @@
                     "Ignoring %s in mountlist - not loading that line :) ",
                     mountlist->el[items].device);
-            (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+            q = fgets(incoming, MAX_STR_LEN - 1, fin);
             continue;
         }
@@ -906 +905 @@
             }
         }
-        (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+        q = fgets(incoming, MAX_STR_LEN - 1, fin);
     }
     paranoid_fclose(fin);