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

Timestamp:

Jun 17, 2009, 10:53:23 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Simplify log_it calls when possible (with just a fixed string)
• issue with truncate_to_drive_name reported by valgrind at restore time. Needs rewrite IMO

File:

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

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

@@ -652 +652 @@
     /*@ buffers ********************************************************* */
     char *drive = NULL;
+    char *truncdrive = NULL;
 
     long long size;
@@ -676 +677 @@
         log_msg(8, "Putting %s with size %lli in list of drives", drive, size);
 
-        (void) truncate_to_drive_name(drive);
-        log_msg(8, "drive truncated to %s", drive);
+        truncdrive = truncate_to_drive_name(drive);
+        log_msg(8, "drive truncated to %s", truncdrive);
 
         for (j = 0;
              j < noof_drives
-             && strcmp(drivelist->el[j].device, drive) != 0; j++) {
+             && strcmp(drivelist->el[j].device, truncdrive) != 0; j++) {
             continue;
         }
         if (j == noof_drives) {
-            strncpy(drivelist->el[noof_drives++].device, drive, 63);
+            strcpy(drivelist->el[noof_drives++].device, truncdrive);
         }
         paranoid_free(drive);
+        paranoid_free(truncdrive);
     }
     drivelist->entries = noof_drives;