Changeset 2227 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

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

Location:

branches/2.2.9/mondo/src

Files:

• common/libmondo-archive.c (modified) (5 diffs)
• common/libmondo-filelist.c (modified) (5 diffs)
• common/libmondo-stream.c (modified) (3 diffs)
• common/libmondo-verify.c (modified) (6 diffs)
• common/newt-specific.c (modified) (4 diffs)
• include/my-stuff.h (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (4 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (3 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (4 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (5 diffs)
• mondorestore/mondorestore.c (modified) (19 diffs)

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

@@ -1475 +1475 @@
                     maintain_collection_of_recent_archives(bkpinfo->tmpdir,
                                                        storing_afioball_fname);
-                    iamhere("Writing EXAT files");
+                    log_it("%s","Writing EXAT files");
                     res +=
                         write_EXAT_files_to_tape(curr_xattr_list_fname,
@@ -1999 +1999 @@
     log_msg(1, "--> tmp = '%s'", tmp);
     if (strstr(tmp, "NTFS")) {
-        iamhere("TRUE");
+        log_it("%s","TRUE");
         ret = TRUE;
     } else {
-        iamhere("FALSE");
+        log_it("%s","FALSE");
         ret = FALSE;
     }
@@ -2271 +2271 @@
             register_in_tape_catalog(fileset, curr_set_no, -1, curr_afioball_fname);
             maintain_collection_of_recent_archives(bkpinfo->tmpdir, curr_afioball_fname);
-            iamhere("Writing EXAT files");
+            log_it("%s","Writing EXAT files");
             res +=
                 write_EXAT_files_to_tape(curr_xattr_list_fname,
@@ -3450 +3450 @@
                  media_descriptor_string(g_backup_media_type));
             chdir("/");
-            iamhere("Before calling verification of image()");
+            log_it("%s","Before calling verification of image()");
             if (bkpinfo->backup_media_type == usb) {
                 res += verify_usb_image();
@@ -3456 +3456 @@
                 res += verify_cd_image();
             }
-            iamhere("After calling verification of image()");
+            log_it("%s","After calling verification of image()");
         }
         if (!res) {

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

@@ -513 +513 @@
                 "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s",
                 filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
-        iamhere(command);
+        log_it("%s",command);
         retval = system(command);
         paranoid_free(command);
@@ -592 +592 @@
     pout = popen(syscall_pout, "w");
     if (!pout) {
-        iamhere("Unable to openout to syscall_pout");
+        log_it("%s","Unable to openout to syscall_pout");
         return (1);
     }
@@ -598 +598 @@
     if (!pin) {
         pclose(pout);
-        iamhere("Unable to openin from syscall");
+        log_it("%s","Unable to openin from syscall");
         return (1);
     }
@@ -605 +605 @@
         pclose(pin);
         pclose(pout);
-        iamhere("Unable to openin masklist");
+        log_it("%s","Unable to openin masklist");
         return (1);
     }
@@ -1881 +1881 @@
     log_msg(3, "Adding %s to filelist", list_of_files_fname);
     if (!(fin = fopen(list_of_files_fname, "r"))) {
-        iamhere(list_of_files_fname);
+        log_it("%s",list_of_files_fname);
         return (1);
     }

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

@@ -555 +555 @@
     last = g_tapecatalog->entries - 1;
     if (last <= 0) {
-        iamhere("Too early to start deleting from collection.");
+        log_it("%s","Too early to start deleting from collection.");
         return (0);
     }
@@ -568 +568 @@
     }
     if (curr < 0) {
-        iamhere
+        log_it("%s",
             ("Not far enough into tape to start deleting old archives from collection.");
         return (0);
@@ -1717 +1717 @@
                    g_tape_stream) / 1024;
         if (g_sigpipe) {
-            iamhere("Sigpipe occurred recently. I'll start a new tape.");
+            log_it("%s","Sigpipe occurred recently. I'll start a new tape.");
             fclose(fin);
             g_sigpipe = FALSE;

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

@@ -281 +281 @@
     }
 
-    iamhere("before vsbf");
+    log_it("%s","before vsbf");
     sprintf(tmp, "Verifying %s#%d's big files",
             media_descriptor_string(bkpinfo->backup_media_type),
             g_current_media_number);
     open_evalcall_form(tmp);
-    iamhere("after vsbf");
+    log_it("%s","after vsbf");
     sprintf(mountpoint, "%s/archives", mtpt);
     if (last_bigfile_num == -1) {
@@ -780 +780 @@
     res = read_header_block_from_stream(&size, fname, &ctrl_chr);
     if (ctrl_chr != BLK_START_AFIOBALLS) {
-        iamhere("YOU SHOULD NOT GET HERE");
-        iamhere("Grabbing the EXAT files");
+        log_it("%s","YOU SHOULD NOT GET HERE");
+        log_it("%s","Grabbing the EXAT files");
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             res =
@@ -805 +805 @@
         }
         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(&size, fname, &ctrl_chr,
@@ -895 +895 @@
     if (ctrl_chr != BLK_START_BIGGIEFILES) {
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-            iamhere("Grabbing the EXAT biggiefiles");
+            log_it("%s","Grabbing the EXAT biggiefiles");
             res =
                 read_EXAT_files_from_tape(&size, orig_fname,
@@ -1019 +1019 @@
     paranoid_free(tmp);
     verify_afioballs_on_CD(mountpoint);
-    iamhere("before verify_all_slices");
+    log_it("%s","before verify_all_slices");
     verify_all_slices_on_CD(mountpoint);
 
@@ -1141 +1141 @@
     }
     verify_afioballs_on_CD(mountpoint);
-    iamhere("before verify_all_slices");
+    log_it("%s","before verify_all_slices");
     verify_all_slices_on_CD(mountpoint);
 

branches/2.2.9/mondo/src/common/newt-specific.c

@@ -1400 +1400 @@
         assert_string_is_neither_NULL_nor_zerolength(source_file);
 
-        iamhere("entering");
+        log_it("%s","entering");
         if (!(fin = fopen(source_file, "r"))) {
             log_OS_error(source_file);
@@ -1483 +1483 @@
         }
         paranoid_free(tmp);
-        iamhere("leaving");
+        log_it("%s","leaving");
         return (0);
     }
@@ -1499 +1499 @@
         char *tmp = NULL;
 
-        iamhere("entering");
+        log_it("%s","entering");
         assert(flentry != NULL);
         if (flentry->severity == 0) {
@@ -1515 +1515 @@
         paranoid_free(tmp);
 
-        iamhere("leaving");
+        log_it("%s","leaving");
         return (comment);
     }

branches/2.2.9/mondo/src/include/my-stuff.h

@@ -277 +277 @@
  */
 #define paranoid_MR_finish(x) {free_MR_global_filenames (); finish(x); }
-
-/**
- * Log file, function, line, and @p x.
- */
-#define iamhere(x) {log_it("%s, %s, %ld: %s", __FILE__, __FUNCTION__, __LINE__, x);}
 
 /**

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

@@ -240 +240 @@
 
 //  do_this_last[0] = '\0';
-    iamhere("STARTING");
+    log_it("%s","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);
-    iamhere("ENDING");
+    log_it("%s","ENDING");
     if (retval > 2) {
         log_msg(1, "%d errors. I'm reporting this.", retval);
@@ -1613 +1613 @@
             system("sync");
 #else
-            iamhere("New, kernel-friendly partition remover");
+            log_it("%s","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");
     }
-    iamhere("Resizing mountlist");
+    log_it("%s","Resizing mountlist");
     make_list_of_drives_in_mountlist(mountlist, drivelist);
-    iamhere("Back from MLoDiM");
+    log_it("%s","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 */
-    iamhere("About to edit mountlist");
+    log_it("%s","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);
     }
-    iamhere("Finished editing mountlist");
+    log_it("%s","Finished editing mountlist");
     if (res) {
         paranoid_MR_finish(1);
@@ -594 +594 @@
     g_current_media_number = 1;
     mvaddstr_and_log_it(1, 30, "Comparing Automatically");
-    iamhere("Pre-MAD");
+    log_it("%s","Pre-MAD");
     retval = mount_all_devices(mountlist, FALSE);
-    iamhere("Post-MAD");
+    log_it("%s","Post-MAD");
     if (retval) {
         unmount_all_devices(mountlist);

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

@@ -2067 +2067 @@
     int res = 0;
 
-    iamhere("entering eml");
+    log_it("%s","entering eml");
 
     if (g_text_mode) {
@@ -2076 +2076 @@
         res = edit_mountlist_in_newt(mountlist_fname, mountlist, raidlist);
     }
-    iamhere("leaving eml");
+    log_it("%s","leaving eml");
     return (res);
 }
@@ -2732 +2732 @@
     assert(disklist != NULL);
 
-    iamhere("malloc'ing");
+    log_it("%s","malloc'ing");
     malloc_string(tmp);
     malloc_string(help_text);
@@ -2760 +2760 @@
            sizeof(struct list_of_disks));
 
-    iamhere("Post-malloc");
+    log_it("%s","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

@@ -1566 +1566 @@
                             0,
                             "Running GRUB...                                                 ");
-        iamhere(command);
+        log_it("%s",command);
         res = run_program_and_log_output(command, 1);
         if (res) {
@@ -2311 +2311 @@
                 MONDO_CFG_FILE_STUB);
         sprintf(command, "cp -f %s %s", tmp, cfg_file);
-        iamhere(command);
+        log_it("%s",command);
         if (strcmp(tmp, cfg_file)
             && run_program_and_log_output(command, 1)) {
@@ -2323 +2323 @@
             call_program_and_get_last_line_of_output("pwd"),
             MOUNTLIST_FNAME_STUB, mountlist_file);
-        iamhere(command);
+        log_it("%s",command);
         if (extract_mountlist_stub) {
             if (strcmp(tmp, cfg_file)
@@ -2344 +2344 @@
     run_program_and_log_output("umount " MNT_CDROM, FALSE);
     if (!does_file_exist(cfg_file)) {
-        iamhere(cfg_file);
+        log_it("%s",cfg_file);
         log_msg(1, "%s not found", cfg_file);
         log_to_screen
@@ -2419 +2419 @@
 
     assert(wait_for_percentage <= 100);
-    iamhere("wait_until_software_raids_are_prepped");
+    log_it("%s","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;
 
-    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);
         }