Changeset 2230 in MondoRescue for branches/2.2.9/mondo/src/mondorestore

Timestamp:

Jun 17, 2009, 10:53:23 PM (16 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

Location:

branches/2.2.9/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (4 diffs)
• mondo-rstr-compare.c (modified) (3 diffs)
• mondo-rstr-newt.c (modified) (4 diffs)
• mondo-rstr-tools.c (modified) (1 diff)
• mondorestore.c (modified) (18 diffs)

branches/2.2.9/mondo/src/mondorestore/mondo-prep.c

@@ -240 +240 @@
 
 //  do_this_last[0] = '\0';
-    log_it("%s","STARTING");
+    log_it("STARTING");
     log_msg(1, "OK, opened i-want-my-lvm. Shutting down LVM volumes...");
     if (find_home_of_exe("lvm"))    // found it :) cool
@@ -417 +417 @@
     system("sync");
     sleep(1);
-    log_it("%s","ENDING");
+    log_it("ENDING");
     if (retval > 2) {
         log_msg(1, "%d errors. I'm reporting this.", retval);
@@ -1613 +1613 @@
             system("sync");
 #else
-            log_it("%s","New, kernel-friendly partition remover");
+            log_it("New, kernel-friendly partition remover");
             for (i = 20; i > 0; i--) {
                 fprintf(pout_to_fdisk, "d\n%d\n", i);
@@ -2591 +2591 @@
         log_it("--- Hugo, 2002/11/20");
     }
-    log_it("%s","Resizing mountlist");
+    log_it("Resizing mountlist");
     make_list_of_drives_in_mountlist(mountlist, drivelist);
-    log_it("%s","Back from MLoDiM");
+    log_it("Back from MLoDiM");
     for (driveno = 0; driveno < drivelist->entries; driveno++) {
         resize_drive_proportionately_to_suit_new_drives(mountlist,

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -576 +576 @@
 
     /* edit_mountlist if wanted */
-    log_it("%s","About to edit mountlist");
+    log_it("About to edit mountlist");
     if (g_text_mode) {
         save_mountlist_to_disk(mountlist, g_mountlist_fname);
@@ -585 +585 @@
         res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
     }
-    log_it("%s","Finished editing mountlist");
+    log_it("Finished editing mountlist");
     if (res) {
         paranoid_MR_finish(1);
@@ -594 +594 @@
     g_current_media_number = 1;
     mvaddstr_and_log_it(1, 30, "Comparing Automatically");
-    log_it("%s","Pre-MAD");
+    log_it("Pre-MAD");
     retval = mount_all_devices(mountlist, FALSE);
-    log_it("%s","Post-MAD");
+    log_it("Post-MAD");
     if (retval) {
         unmount_all_devices(mountlist);

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -2067 +2067 @@
     int res = 0;
 
-    log_it("%s","entering eml");
+    log_it("entering eml");
 
     if (g_text_mode) {
@@ -2076 +2076 @@
         res = edit_mountlist_in_newt(mountlist_fname, mountlist, raidlist);
     }
-    log_it("%s","leaving eml");
+    log_it("leaving eml");
     return (res);
 }
@@ -2732 +2732 @@
     assert(disklist != NULL);
 
-    log_it("%s","malloc'ing");
+    log_it("malloc'ing");
     malloc_string(tmp);
     malloc_string(help_text);
@@ -2760 +2760 @@
            sizeof(struct list_of_disks));
 
-    log_it("%s","Post-malloc");
+    log_it("Post-malloc");
     strcpy(help_text,
            "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -2419 +2419 @@
 
     assert(wait_for_percentage <= 100);
-    log_it("%s","wait_until_software_raids_are_prepped");
+    log_it("wait_until_software_raids_are_prepped");
     while (unfinished_mdstat_devices > 0) {
             // FIXME: Prefix '/dev/' should really be dynamic!

branches/2.2.9/mondo/src/mondorestore/mondorestore.c

@@ -262 +262 @@
     int retval = 0;
 
-    log_it("%s","inside catchall");
+    log_it("inside catchall");
     assert(bkpinfo != NULL);
     assert(mountlist != NULL);
     assert(raidlist != NULL);
     malloc_string(tmp);
-    log_it("%s","pre wrm");
+    log_it("pre wrm");
     c = which_restore_mode();
-    log_it("%s","post wrm");
+    log_it("post wrm");
     if (c == 'I' || c == 'C') {
         interactively_obtain_media_parameters_from_user(FALSE);
@@ -286 +286 @@
     }
 
-    log_it("%s","post int");
+    log_it("post int");
 
     if (bkpinfo->backup_media_type == iso) {
@@ -465 +465 @@
     }
 
-    log_it("%s","About to load config file");
+    log_it("About to load config file");
     get_cfg_file_from_archive_or_bust();
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
-    log_it("%s","Done loading config file; resizing ML");
+    log_it("Done loading config file; resizing ML");
     if (bkpinfo->backup_media_type == nfs) {
         strcpy(tmp, bkpinfo->prefix);
@@ -493 +493 @@
     }
     for (done = FALSE; !done;) {
-        log_it("%s","About to edit mountlist");
+        log_it("About to edit mountlist");
         if (g_text_mode) {
             save_mountlist_to_disk(mountlist, g_mountlist_fname);
@@ -502 +502 @@
             res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
         }
-        log_it("%s","Finished editing mountlist");
+        log_it("Finished editing mountlist");
         if (res) {
             paranoid_MR_finish(1);
@@ -681 +681 @@
     }
 
-    log_it("%s","About to leave interactive_mode()");
+    log_it("About to leave interactive_mode()");
     if (retval) {
         mvaddstr_and_log_it(g_currentY++,
@@ -691 +691 @@
     paranoid_free(fstab_fname);
     paranoid_free(old_restpath);
-    log_it("%s","Leaving interactive_mode()");
+    log_it("Leaving interactive_mode()");
     return (retval);
 }
@@ -885 +885 @@
         return (retval);
     }
-    log_it("%s","Restoring everything");
+    log_it("Restoring everything");
     retval += restore_everything(NULL);
     clean_multipathconf();
@@ -1006 +1006 @@
                                  "Restore files to where? )",
                                  bkpinfo->restore_path, MAX_STR_LEN / 4)) {
-            log_it("%s","Restoring everything");
+            log_it("Restoring everything");
             retval += restore_everything(filelist);
             free_filelist(filelist);
@@ -2035 +2035 @@
 
         if (g_getfattr) {
-            log_it("%s","Restoring xattr stuff");
+            log_it("Restoring xattr stuff");
             res = set_fattr_list(filelist_subset_fname, xattr_fname);
             if (res) {
@@ -2046 +2046 @@
 
         if (g_getfacl) {
-            log_it("%s","Restoring acl stuff");
+            log_it("Restoring acl stuff");
             res = set_acl_list(filelist_subset_fname, acl_fname);
             if (res) {
@@ -2505 +2505 @@
         fclose(fbw);
         if (length_of_file(biggies_whose_EXATs_we_should_set) > 2) {
-            log_it("%s","Setting biggie-EXATs");
+            log_it("Setting biggie-EXATs");
             if (g_getfattr) {
                 if (length_of_file(xattr_fname) > 0) {
@@ -2522 +2522 @@
             }
         } else {
-            log_it("%s","No biggiefiles selected. So, no biggie-EXATs to set.");
+            log_it("No biggiefiles selected. So, no biggie-EXATs to set.");
         }
     }
@@ -2630 +2630 @@
         }
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-            log_it("%s","Reading EXAT files from tape");
+            log_it("Reading EXAT files from tape");
             res =
                 read_EXAT_files_from_tape(&tmp_size, tmp_fname,
@@ -2944 +2944 @@
     }
 
-    log_it("%s","what time is it");
+    log_it("what time is it");
 
     /* Process command-line parameters */
@@ -3127 +3127 @@
         log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
 
-        log_it("%s","About to call load_mountlist and load_raidtab");
+        log_it("About to call load_mountlist and load_raidtab");
         strcpy(bkpinfo->restore_path, MNT_RESTORING);
         read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
         retval = load_mountlist(mountlist, g_mountlist_fname);
         retval += load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-        log_it("%s","Returned from calling load_mountlist and load_raidtab successfully");
+        log_it("Returned from calling load_mountlist and load_raidtab successfully");
 
         // BCO:To be reviewed
@@ -3156 +3156 @@
 
         if (bkpinfo->restore_mode == nuke) {
-            log_it("%s","nuking");
+            log_it("nuking");
             retval += nuke_mode(mountlist, raidlist);
         } else if (bkpinfo->restore_mode == interactive) {
-            log_it("%s","catchall");
+            log_it("catchall");
             retval += catchall_mode(mountlist, raidlist);
         } else if (bkpinfo->restore_mode == compare) {
-            log_it("%s","compare");
+            log_it("compare");
             retval += compare_mode(mountlist, raidlist);
         } else if (bkpinfo->restore_mode == isoonly) {
-            log_it("%s","iso");
+            log_it("iso");
             retval = iso_mode(mountlist, raidlist, FALSE);
         } else if (bkpinfo->restore_mode == mbr) {
-            log_it("%s","mbr");
+            log_it("mbr");
             retval = mount_all_devices(mountlist, TRUE);
             if (!retval) {
@@ -3178 +3178 @@
             }
         } else if (bkpinfo->restore_mode == isonuke) {
-            log_it("%s","isonuke");
+            log_it("isonuke");
             retval = iso_mode(mountlist, raidlist, TRUE);
         } else {
-            log_it("%s","catchall (no mode specified in command-line call");
+            log_it("catchall (no mode specified in command-line call");
             retval += catchall_mode(mountlist, raidlist);
         }