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

Timestamp:

Feb 16, 2007, 2:16:14 PM (17 years ago)

Author:

Bruno Cornec

Message:

Some merges from stable (synchro for mem. mngt)

File:

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

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

@@ -2 +2 @@
    $Id$
 */
+
 
 /**
@@ -21 +22 @@
 /*@unused@*/
 //static char cvsid[] = "$Id$";
-
-/**
- * A global copy of @c bkpinfo, to aid in debugging. As the name implies, <em>don't use this</em>.
- * @ingroup globalGroup
- */
-struct s_bkpinfo *g_bkpinfo_DONTUSETHIS = NULL;
 
 /**
@@ -77 +72 @@
     /*@ initialize ***************************************************** */
     prev_part_no = 0;
-    // BERLIOS: tmp[0] = '\0';
 
 
@@ -83 +77 @@
 
     if (physical_drive_size < 0) {
-        mr_asprintf(&tmp, " %s does not exist.", drive);
+        mr_asprintf(&tmp, "%s %s does not exist.", flaw_str, drive);
+        mr_free(flaw_str);
         flaws_str = tmp;
     } else {
@@ -225 +220 @@
             return ++res;       // fatal error
         }
+
+        mr_asprintf(&device, "%ss%d", drive, curr_part_no);
         // BERLIOS : useless ? mr_asprintf(&mountpoint, mountlist->el[pos].mountpoint);
         if (pos > 0 && !npos) {
-            mr_asprintf(&device, "%ss%d", drive, curr_part_no);
             /* gap in the partition list? */
             if (curr_part_no - prev_part_no > 1) {
@@ -346 +342 @@
                 res++;
             }
-            mr_free(device);
         } else {
             /* Check subpartitions */
             for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-                mr_asprintf(&device, "%ss%d%c", drive, curr_part_no,
-                         cur_sp_no);
+                mr_asprintf(&device, "%ss%d%c", drive, curr_part_no, cur_sp_no);
                 pos = find_device_in_mountlist(mountlist, device);
                 if (pos < 0) {
@@ -446 +440 @@
                 amount_allocated += mountlist->el[pos].size / 1024;
                 prev_sp_no = cur_sp_no;
-                mr_free(device);
-            }
-        }
+            }
+        }
+        mr_free(device);
 
         /* OK, continue with main loop */
@@ -482 +476 @@
         flaws_str = tmp1;
         mr_free(tmp);
+        /* BERLIOS: Flawed since rev 1 !! */
+        res++;
     }
     if (res) {
@@ -521 +517 @@
 
     prev_part_no = 0;
-    // BERLIOS : useless ? tmp[0] = '\0';
-
 
     physical_drive_size = get_phys_size_of_drive(drive);
@@ -582 +576 @@
                        || (curr_part_no <= 4 && prev_part_no > 0)) {
                 mr_asprintf(&tmp, " Gap between %s%d and %d.", drive,
-                         prev_part_no, curr_part_no);
+                        prev_part_no, curr_part_no);
                 log_it(tmp);
                 if (flaws_str) {
@@ -716 +710 @@
         flaws_str = tmp1;
         mr_free(tmp);
+        /* BERLIOS: Flawed since rev 1 !! - Is it sure ?? */
+        res++;
     }
 
@@ -743 +739 @@
 
     /*@ buffer *********************************************************** */
-    struct list_of_disks *drivelist;
-    char *tmp;
-    char *tmp1;
-    char *flaws_str;
+    struct list_of_disks *drivelist = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *flaws_str = NULL;
 
     /*@ int ************************************************************** */
@@ -856 +852 @@
             && strcmp(curr_mountpoint, "raid")) {
             mr_asprintf(&tmp, " %s %s's.", number_to_text(copies),
-                     curr_mountpoint);
+                    curr_mountpoint);
             log_it(tmp);
             mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
@@ -887 +883 @@
 
     /*@ buffers ********************************************************* */
-    char *drive;
-    char *tmp;
+    char *drive = NULL;
 
     long long size;
@@ -899 +894 @@
         mr_asprintf(&drive, mountlist->el[lino].device);
         if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
-            mr_asprintf(&tmp,
-                     "Not putting %s in list of drives: it's a virtual drive",
-                     drive);
-            mr_msg(8, tmp);
-            mr_free(tmp);
+            mr_msg(8, "Not putting %s in list of drives: it's a virtual drive", drive);
             continue;
         }
@@ -909 +900 @@
         size = mountlist->el[lino].size;
         if (size == 0) {
-            mr_asprintf(&tmp,
-                     "Not putting %s in list of drives: it has zero size (maybe an LVM volume)",
-                     drive);
-            mr_msg(8, tmp);
-            mr_free(tmp);
+            mr_msg(8, "Not putting %s in list of drives: it has zero size (maybe an LVM volume)", drive);
             continue;
         }
 
-/*
-      for (i = strlen (drive); isdigit (drive[i - 1]); i--);
-      drive[i] = '\0';
-      if (get_phys_size_of_drive (drive) <= 0 && drive[i - 1] == 'p')
-    {
-      i--;
-      drive[i] = '\0';
-    }
-      for (j = 0; j < noof_drives && strcmp (drivelist[j], drive) != 0; j++);
-*/
-
-        mr_asprintf(&tmp,
-                 "Putting %s with size %lli in list of drives",
-                 drive, size);
-        mr_msg(8, tmp);
-        mr_free(tmp);
+        mr_msg(8, "Putting %s with size %lli in list of drives", drive, size);
 
         (void) truncate_to_drive_name(drive);
@@ -960 +932 @@
  */
 void make_list_of_unallocated_raid_partitions(struct mountlist_itself
-                                              *output_list, struct mountlist_itself
-                                              *mountlist, struct raidlist_itself
+                                              *output_list,
+                                              struct mountlist_itself
+                                              *mountlist,
+                                              struct raidlist_itself
                                               *raidlist)
 {
@@ -971 +945 @@
 
     /*@ buffers ********************************************************* */
-    char *tmp;
+    char *tmp = NULL;
 
     assert(output_list != NULL);
@@ -1043 +1017 @@
 int load_mountlist(struct mountlist_itself *mountlist, char *fname)
 {
-    FILE *fin;
+    FILE *fin = NULL;
     /* malloc ** */
     char *incoming = NULL;
-    char *siz;
-    char *tmp;
-    char *p;
-
-    int items;
-    int j;
+    char *siz = NULL;
+    char *tmp = NULL;
+    char *p = NULL;
+
+    int items = 0;
+    int j = 0;
     size_t n = 0;
 
     assert(mountlist != NULL);
     assert_string_is_neither_NULL_nor_zerolength(fname);
-    malloc_string(siz);
+
     if (!(fin = fopen(fname, "r"))) {
         log_it("Unable to open mountlist - '%s'", fname);
         log_to_screen(_("Cannot open mountlist"));
-        mr_free(siz);
         return (1);
     }
-    items = 0;
+    malloc_string(siz);
     mr_getline(&incoming, &n, fin);
     log_it("Loading mountlist...");
@@ -1130 +1103 @@
             mr_free(tmp);
 
-            mr_asprintf(&tmp,
-                     "%s %s %s %lld %s",
+            log_it("%s %s %s %lld %s",
                      mountlist->el[items].device,
                      mountlist->el[items].mountpoint,
@@ -1137 +1109 @@
                      mountlist->el[items].size,
                      mountlist->el[items].label);
-
-            log_it(tmp);
-            mr_free(tmp);
             items++;
         }
@@ -1149 +1118 @@
 
     log_it("Mountlist loaded successfully.");
-    mr_asprintf(&tmp, "%d entries in mountlist", items);
-    log_it(tmp);
-    mr_free(tmp);
+    log_it("%d entries in mountlist", items);
 
     mr_free(siz);
     return (0);
 }
-
 
 
@@ -1256 +1222 @@
 {
     /*@ mallocs *** */
-    char *device;
-    char *mountpoint;
-    char *format;
+    char *device = NULL;
+    char *mountpoint = NULL;
+    char *format = NULL;
 
     long long size;
@@ -1283 +1249 @@
 
     mountlist->el[b].size = size;
+    mr_free(device);
+    mr_free(mountpoint);
+    mr_free(format);
 }