Changeset 2227 in MondoRescue for branches/2.2.9/mondo/src/mondorestore/mondorestore.c

Timestamp:

Jun 17, 2009, 2:45:52 PM (15 years ago)

Author:

Bruno Cornec

Message:

Remove the iamhere function (will hopefully suppress valgrind errors at restore time)

File:

• branches/2.2.9/mondo/src/mondorestore/mondorestore.c (modified) (19 diffs)

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

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