Changeset 2205 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-mountlist.c

Timestamp:

May 14, 2009, 3:10:51 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Cleanups
• Fix test on return value for open (-1 is the right value to test not 0)
• Improve asprintf usage for mountlist

File:

• branches/2.2.9/mondo/src/common/libmondo-mountlist.c (modified) (4 diffs)

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

@@ -658 +658 @@
         asprintf(&drive, "%s", mountlist->el[lino].device);
         if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
-            log_msg(8, "Not putting %s in list of drives: it's a virtual drive",
-                    drive);
+            log_msg(8, "Not putting %s in list of drives: it's a virtual drive", drive);
+            paranoid_free(drive);
             continue;
         }
@@ -665 +665 @@
         size = mountlist->el[lino].size;
         if (size == 0) {
-            log_msg(8,
-                    "Not putting %s in list of drives: it has zero size (maybe an LVM volume)",
-                    drive);
+            log_msg(8, "Not putting %s in list of drives: it has zero size (maybe an LVM volume)", drive);
+            paranoid_free(drive);
             continue;
         }
 
-        log_msg(8, "Putting %s with size %lli in list of drives",
-                drive, size);
+        log_msg(8, "Putting %s with size %lli in list of drives", drive, size);
 
         (void) truncate_to_drive_name(drive);
         for (j = 0;
              j < noof_drives
-             && strcmp(drivelist->el[j].device, drive) != 0; j++)
+             && strcmp(drivelist->el[j].device, drive) != 0; j++) {
+            paranoid_free(drive);
             continue;
+        }
         if (j == noof_drives) {
             strcpy(drivelist->el[noof_drives++].device, drive);
         }
+        paranoid_free(drive);
     }
     drivelist->entries = noof_drives;
@@ -816 +817 @@
         if (res < 5) {
             /* no label found */
-            asprintf(&(mountlist->el[items].label), "%s", "");
+            asprintf(&tmp, "%s", "");
+            mountlist->el[items].label = tmp;
         }
 #elif __FreeBSD__
@@ -824 +826 @@
                mountlist->el[items].mountpoint,
                mountlist->el[items].format, siz);
-        asprintf(&(mountlist->el[items].label), "%s", "");
+        asprintf(&tmp, "%s", "");
+        mountlist->el[items].label = tmp;
 #endif