Changeset 3237 in MondoRescue for branches/3.2/mondo/src/common/libmondo-mountlist.c

Timestamp:

Jan 3, 2014, 5:44:13 PM (10 years ago)

Author:

Bruno Cornec

Message:

which_partition_format now returns a dynamically allocated string which is then used consistently across the project

File:

• branches/3.2/mondo/src/common/libmondo-mountlist.c (modified) (3 diffs)

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

@@ -67 +67 @@
 
     /*@ pointers ******************************************************* */
-    char *part_table_fmt;
+    char *part_table_fmt = NULL;
 
     /*@ initialize ***************************************************** */
@@ -195 +195 @@
             part_table_fmt = which_partition_format(drive);
             /* no spare primary partitions to help accommodate the logical(s)? */
-            if ((curr_part_no >= 5 && prev_part_no == 4)
-                && (strcmp(part_table_fmt, "MBR") == 0)) {
+            if ((curr_part_no >= 5 && prev_part_no == 4) && (strcmp(part_table_fmt, "MBR") == 0)) {
                 mr_asprintf(tmp, " Partition %ss4 is occupied.", drive);
                 log_it(tmp);
@@ -203 +202 @@
                 res++;
             }
+            mr_free(part_table_fmt);
+
             /* does partition /dev/adXsY exist more than once in the mountlist? */
             for (i = 0, device_copies = 0;