Changeset 783 in MondoRescue for trunk/mondo/mondo/common/libmondo-mountlist.c

Timestamp:

Aug 31, 2006, 5:09:20 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Massive rewrite continues for memory management.
• main structure should now have all parameters allocated dynamically
• new lib libmr.a + dir + build process reviewed to support it.
• new include subdir to host external definitions of the new lib
• code now compiles. Still one remaining link issues for mondorestore. This should allow for some tests soon.

(goal is to separate completely reviewed code and functions and provide clean interfaces)

File:

• trunk/mondo/mondo/common/libmondo-mountlist.c (modified) (5 diffs)

trunk/mondo/mondo/common/libmondo-mountlist.c

@@ -63 +63 @@
     char *tmp1 = NULL;
     char *device = NULL;
+    char *ndevice = NULL;
     // BERLIOS : useless ? char *mountpoint;
 
@@ -203 +204 @@
         npos = 0;
         for (cur_sp_no = 'a'; cur_sp_no <= 'h'; cur_sp_no++) {
-            sprintf(device, "%ss%i%c", device, curr_part_no, cur_sp_no);
-            if (find_device_in_mountlist(mountlist, device) >= 0)
+            asprintf(&ndevice, "%ss%d%c", device, curr_part_no, cur_sp_no);
+            if (find_device_in_mountlist(mountlist, ndevice) >= 0)
                 npos++;
+            paranoid_free(ndevice);
         }
         paranoid_free(device);
@@ -500 +502 @@
 
     /*@ buffers ******************************************************** */
-    char *tmp;
-    char *device;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *device = NULL;
 
     /*@ long *********************************************************** */
-    long physical_drive_size = 0;
-    long amount_allocated = 0;
+    long physical_drive_size = 0L;
+    long amount_allocated = 0L;
 
     /*@ pointers ******************************************************* */
-    char *part_table_fmt;
+    char *part_table_fmt = NULL;
 
     /*@ initialize ***************************************************** */
@@ -559 +562 @@
             continue;
         }
-        // BERLIOS : useless ? strcpy(mountpoint, mountlist->el[pos].mountpoint);
+        // BERLIOS : useless ? str-cpy(mountpoint, mountlist->el[pos].mountpoint);
         /* gap in the partition list? */
         if (curr_part_no - prev_part_no > 1) {
@@ -751 +754 @@
     drivelist = malloc(sizeof(struct list_of_disks));
     assert(mountlist != NULL);
-    assert(flaws_str_A != NULL);
-    assert(flaws_str_B != NULL);
-    assert(flaws_str_C != NULL);
 
     asprintf(&flaws_str, " ");