Changeset 2324 in MondoRescue

Timestamp:

Aug 18, 2009, 3:13:54 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3335@localhost: bruno | 2009-08-08 23:04:12 +0200

• Change mr_asprintf to avoid the need of pointer and be consistent with the other mr_mem functions

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-archive.c (modified) (42 diffs)
• common/libmondo-cli.c (modified) (18 diffs)
• common/libmondo-devices.c (modified) (15 diffs)
• common/libmondo-fifo.c (modified) (1 diff)
• common/libmondo-filelist.c (modified) (10 diffs)
• common/libmondo-files.c (modified) (17 diffs)
• common/libmondo-fork.c (modified) (3 diffs)
• common/libmondo-mountlist.c (modified) (17 diffs)
• common/libmondo-raid.c (modified) (9 diffs)
• common/libmondo-stream.c (modified) (11 diffs)
• common/libmondo-tools.c (modified) (8 diffs)
• common/libmondo-verify.c (modified) (7 diffs)
• common/newt-specific.c (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (26 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (10 diffs)
• mondorestore/mondorestore.c (modified) (14 diffs)

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

@@ -202 +202 @@
 
     if (!does_file_exist(filelist)) {
-        mr_asprintf(tmp, "(archive_this_fileset) - filelist %s does not exist", filelist);
-        log_to_screen(tmp);
-        paranoid_free(tmp);
+        log_to_screen("(archive_this_fileset) - filelist %s does not exist", filelist);
         return (1);
     }
@@ -210 +208 @@
     mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         fatal_error("Unable to write tarball to scratchdir");
     }
     paranoid_free(tmp);
 
-    mr_asprintf(command, "star H=star list=%s -c " STAR_ACL_SZ " file=%s",
-            filelist, fname);
+    mr_asprintf(command, "star H=star list=%s -c " STAR_ACL_SZ " file=%s", filelist, fname);
     if (bkpinfo->use_lzo) {
+        mr_free(command);
         fatal_error("Can't use lzop");
     }
@@ -237 +235 @@
             res = 0;
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (res) {
@@ -253 +251 @@
         }
     }
-    paranoid_free(command);
+    mr_free(command);
 
     retval += res;
@@ -309 +307 @@
 
     if (!does_file_exist(filelist)) {
-        mr_asprintf(tmp, "(archive_this_fileset) - filelist %s does not exist",
-                filelist);
-        log_to_screen(tmp);
-        paranoid_free(tmp);
+        log_to_screen("(archive_this_fileset) - filelist %s does not exist", filelist);
         return (1);
     }
     mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         fatal_error("Unable to write tarball to scratchdir");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
 
@@ -326 +321 @@
         mr_asprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
         //       -b %ld, TAPE_BLOCK_SIZE
-        mr_asprintf(zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe,
-                bkpinfo->compression_level);
+        mr_asprintf(zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe, bkpinfo->compression_level);
         if (does_file_exist(tmp)) {
             mr_strcat(zipparams, " -E %s",tmp);
@@ -333 +327 @@
             log_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else {
         mr_asprintf(zipparams, "");
@@ -346 +340 @@
         fatal_error("scratchdir not found");
     }
-    mr_asprintf(command, "rm -f %s %s. %s.gz %s.%s", fname, fname, fname,
-            fname, bkpinfo->zip_suffix);
+    mr_asprintf(command, "rm -f %s %s. %s.gz %s.%s", fname, fname, fname, fname, bkpinfo->zip_suffix);
     paranoid_system(command);
-    paranoid_free(command);
+    mr_free(command);
 
     mr_asprintf(command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s", TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
-    paranoid_free(zipparams);
+    mr_free(zipparams);
 
     mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         fatal_error("Unable to write tarball to scratchdir");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     for (res = 99, tries = 0; tries < 3 && res != 0; tries++) {
@@ -545 +538 @@
         mr_free(tmp);
 
-        mr_asprintf(tmp, "devs_to_exclude = '%s'", devs_to_exclude);
-        log_msg(2, tmp);
-        mr_free(tmp);
+        log_msg(2, "devs_to_exclude = '%s'", devs_to_exclude);
     }
 
@@ -557 +548 @@
         mr_asprintf(tmp, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
         if (!does_file_exist(tmp)) {
-            fatal_error
-                ("Cannot find filelist.full, so I cannot count its lines");
+            mr_free(tmp);
+            fatal_error ("Cannot find filelist.full, so I cannot count its lines");
         }
     }
@@ -623 +614 @@
 
 #ifdef __FreeBSD__
-        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-               ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
+        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
         if (!bootdev[0]) {
             mr_free(bootdev);
-            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-                   ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
+            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
         }
 #else
         /* Linux */
 #ifdef __IA64__
-        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-               ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
 #else
-        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-               ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
 #endif
         if (strstr(bootdev, "/dev/cciss/")) {
             mr_free(bootdev);
 #ifdef __IA64__
-            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-                   ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
 #else
-            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-                   ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
 #endif
         }
         if (!bootdev[0]) {
             mr_free(bootdev);
-            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-                   ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
             if (strstr(bootdev, "/dev/cciss/")) {
                 mr_free(bootdev);
-                mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
-                       ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+                mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
             }
         }
@@ -666 +649 @@
             ch = 'U';
         if (bkpinfo->boot_loader != '\0') {
-            mr_asprintf(tmp, "User specified boot loader. It is '%c'.", bkpinfo->boot_loader);
-            log_msg(2, tmp);
-            mr_free(tmp);
+            log_msg(2, "User specified boot loader. It is '%c'.", bkpinfo->boot_loader);
         } else {
             bkpinfo->boot_loader = ch;
         }
         if (bkpinfo->boot_device[0] != '\0') {
-            mr_asprintf(tmp, "User specified boot device. It is '%s'.", bkpinfo->boot_device);
-            log_msg(2, tmp);
-            mr_free(tmp);
+            log_msg(2, "User specified boot device. It is '%s'.", bkpinfo->boot_device);
         } else {
             strcpy(bkpinfo->boot_device, bootdev);
@@ -698 +677 @@
         mr_asprintf(bootldr_str, "LILO");
         if (!does_file_exist("/etc/lilo.conf")) {
-            fatal_error
-                ("The de facto standard location for your boot loader's config file is /etc/lilo.conf but I cannot find it there. What is wrong with your Linux distribution?");
+            fatal_error("The de facto standard location for your boot loader's config file is /etc/lilo.conf but I cannot find it there. What is wrong with your Linux distribution?");
         }
     } else if (bkpinfo->boot_loader == 'G') {
         mr_asprintf(bootldr_str, "GRUB");
-        if (!does_file_exist("/boot/grub/menu.lst")
-            && does_file_exist("/boot/grub/grub.conf")) {
-            run_program_and_log_output
-                ("ln -sf /boot/grub/grub.conf /boot/grub/menu.lst", 5);
+        if (!does_file_exist("/boot/grub/menu.lst") && does_file_exist("/boot/grub/grub.conf")) {
+            run_program_and_log_output("ln -sf /boot/grub/grub.conf /boot/grub/menu.lst", 5);
         }
         if (!does_file_exist("/boot/grub/menu.lst")) {
-            fatal_error
-                ("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst but I cannot find it there. What is wrong with your Linux distribution?");
+            fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst but I cannot find it there. What is wrong with your Linux distribution?");
         }
     } else if (bkpinfo->boot_loader == 'E') {
         mr_asprintf(bootldr_str, "ELILO");
         /* BCO: fix it for Debian, Mandrake, ... */
-        if (!does_file_exist("/etc/elilo.conf")
-            && does_file_exist("/boot/efi/efi/redhat/elilo.conf")) {
-            run_program_and_log_output
-                ("ln -sf /boot/efi/efi/redhat/elilo.conf /etc/elilo.conf",
-                 5);
-        }
-        if (!does_file_exist("/etc/elilo.conf")
-            && does_file_exist("/boot/efi/efi/SuSE/elilo.conf")) {
-            run_program_and_log_output
-                ("ln -sf /boot/efi/efi/SuSE/elilo.conf /etc/elilo.conf",
-                 5);
-        }
-        if (!does_file_exist("/etc/elilo.conf")
-            && does_file_exist("/boot/efi/efi/debian/elilo.conf")) {
-            run_program_and_log_output
-                ("ln -sf /boot/efi/efi/debian/elilo.conf /etc/elilo.conf",
-                 5);
-        }
-        if (!does_file_exist("/etc/elilo.conf")
-            && does_file_exist("/boot/efi/debian/elilo.conf")) {
-            run_program_and_log_output
-                ("ln -sf /boot/efi/debian/elilo.conf /etc/elilo.conf",
-                 5);
+        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/redhat/elilo.conf")) {
+            run_program_and_log_output("ln -sf /boot/efi/efi/redhat/elilo.conf /etc/elilo.conf", 5);
+        }
+        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/SuSE/elilo.conf")) {
+            run_program_and_log_output("ln -sf /boot/efi/efi/SuSE/elilo.conf /etc/elilo.conf", 5);
+        }
+        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/debian/elilo.conf")) {
+            run_program_and_log_output ("ln -sf /boot/efi/efi/debian/elilo.conf /etc/elilo.conf", 5);
+        }
+        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/debian/elilo.conf")) {
+            run_program_and_log_output ("ln -sf /boot/efi/debian/elilo.conf /etc/elilo.conf", 5);
         }
         if (!does_file_exist("/etc/elilo.conf")) {
-            fatal_error
-                ("The de facto mondo standard location for your boot loader's config file is /etc/elilo.conf but I cannot find it there. What is wrong with your Linux distribution? Try finding it under /boot/efi and do 'ln -s /boot/efi/..../elilo.conf /etc/elilo.conf'");
+            fatal_error("The de facto mondo standard location for your boot loader's config file is /etc/elilo.conf but I cannot find it there. What is wrong with your Linux distribution? Try finding it under /boot/efi and do 'ln -s /boot/efi/..../elilo.conf /etc/elilo.conf'");
         }
     } else if (bkpinfo->boot_loader == 'R') {
@@ -758 +720 @@
         mr_asprintf(bootldr_str, "unknown");
     }
-    mr_asprintf(tmp, "Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
-    log_to_screen(tmp);
-    mr_free(tmp);
+    log_to_screen("Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
 
     mr_asprintf(tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir);
@@ -808 +768 @@
     if (write_one_liner_data_file(tmp, value)) {
         res++;
-        log_msg(1, "%ld: Unable to write one-liner backup-media-type",
-                __LINE__);
+        log_msg(1, "%ld: Unable to write one-liner backup-media-type", __LINE__);
     }
     mr_free(value);
@@ -817 +776 @@
     if (write_one_liner_data_file(tmp, bootldr_str)) {
         res++;
-        log_msg(1, "%ld: Unable to write one-liner bootloader.name",
-                __LINE__);
+        log_msg(1, "%ld: Unable to write one-liner bootloader.name", __LINE__);
     }
     mr_free(bootldr_str);
@@ -837 +795 @@
                 __LINE__);
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
     }
     if (g_getfacl) {
         mr_asprintf(tmp1, "%s/ACL", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
-            log_msg(1, "%ld: Unable to write one-liner ACL",
-                __LINE__);
-        }
-        paranoid_free(tmp1);
+            log_msg(1, "%ld: Unable to write one-liner ACL", __LINE__);
+        }
+        mr_free(tmp1);
     }
     if (bkpinfo->use_obdr) {
         mr_asprintf(tmp1, "%s/OBDR", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
-            log_msg(1, "%ld: Unable to write one-liner OBDR",
-                __LINE__);
-        }
-        paranoid_free(tmp1);
+            log_msg(1, "%ld: Unable to write one-liner OBDR", __LINE__);
+        }
+        mr_free(tmp1);
     }
 
     estimated_total_noof_slices =
         size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
-    /* add nfs stuff here? */
+    /* BERLIOS: add nfs stuff here? */
     mr_asprintf(command, "mkdir -p %s/images", bkpinfo->scratchdir);
     if (system(command)) {
@@ -867 +823 @@
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
 
-    mr_asprintf(command,
 /*     "mindi --custom 2=%s 3=%s/images 4=\"%s\" 5=\"%s\" \
 6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
 11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
-    mr_asprintf(&command, "mindi %s --custom %s %s/images '%s' '%s' \
-'%s' %ld '%s' '%s' '%s' \
+    mr_asprintf(command, "mindi %s --custom %s %s/images '%s' '%s' '%s' %ld '%s' '%s' '%s' \
 '%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", tmp2, bkpinfo->tmpdir,    // parameter #2
             bkpinfo->scratchdir,    // parameter #3
@@ -923 +877 @@
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
-        paranoid_free(command);
+        mr_free(command);
 
         if (bkpinfo->nonbootable_backup) {
             mr_asprintf(command, "cp -f %s/all.tar.gz %s/images", bkpinfo->tmpdir, bkpinfo->scratchdir);
             if (system(command)) {
-                paranoid_free(command);
+                mr_free(command);
                 fatal_error("Unable to create temporary all tarball");
             }
-            paranoid_free(command);
+            mr_free(command);
         }
         /* For USB we already have everything on the key */
@@ -937 +891 @@
             mr_asprintf(command, "rm -rf %s/images", bkpinfo->scratchdir);
             run_program_and_log_output(command, FALSE);
-            paranoid_free(command);
+            mr_free(command);
         } else {
             mr_asprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir, bkpinfo->tmpdir);
             if (system(tmp)) {
+                mr_free(tmp);
                 fatal_error("Cannot find all.tar.gz in tmpdir");
             }
@@ -954 +909 @@
         mr_asprintf(command, "grep 'Fatal error' /var/log/mindi.log");
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
 
         if (strlen(tmp) > 1) {
@@ -1092 +1047 @@
 
         if (res) {
-            mr_asprintf(tmp, "Errors occurred while archiving set %ld. Please review logs.", archiving_set_no);
-            log_to_screen(tmp);
-            mr_free(tmp);
+            log_to_screen("Errors occurred while archiving set %ld. Please review logs.", archiving_set_no);
         }
         if (!semaphore_p()) {
@@ -1470 +1423 @@
                 mr_free(media_usage_comment);
                 if (res) {
-                    mr_asprintf(tmp, "Failed to add archive %ld's files to CD dir\n", storing_set_no);
-                    log_to_screen(tmp);
-                    paranoid_free(tmp);
-                    fatal_error
-                        ("Is your hard disk full? If not, please send the author the logfile.");
+                    log_to_screen("Failed to add archive %ld's files to CD dir\n", storing_set_no);
+                    fatal_error("Is your hard disk full? If not, please send the author the logfile.");
                 }
                 storing_set_no++;
@@ -1504 +1454 @@
     }
     log_to_screen(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     paranoid_free(transfer_block);
@@ -1558 +1508 @@
     mr_asprintf(tmp, "chmod 755 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_free(tmp);
     (void)chdir(bkpinfo->scratchdir);
 
@@ -1571 +1521 @@
         mr_asprintf(tmp, "umount %s", tmp1);
         run_program_and_log_output(tmp, FALSE);
-        paranoid_free(tmp);
-    }
-    paranoid_free(tmp);
+        mr_free(tmp);
+    }
+    mr_free(tmp1);
 
     log_msg(1, "Mounting USB device.");
@@ -1579 +1529 @@
     mr_asprintf(tmp, "mkdir -p %s", tmp1);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_free(tmp);
+
     /* Mindi always create one single parition on the USB dev */
     mr_asprintf(tmp, "mount %s1 %s", bkpinfo->media_device, tmp1);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (bkpinfo->nonbootable_backup) {
@@ -1599 +1550 @@
         }
         log_to_screen(result_sz);
-        paranoid_free(result_sz);
-        paranoid_free(tmp);
+        mr_free(result_sz);
+        mr_free(tmp);
         retval += res;
 
@@ -1606 +1557 @@
         mr_asprintf(tmp,"mkdir %s/archive", bkpinfo->scratchdir); 
         run_program_and_log_output(tmp, FALSE);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     paranoid_free(message_to_screen);
@@ -1614 +1565 @@
         mr_asprintf(tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, FALSE);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 
@@ -1695 +1646 @@
     if (bkpinfo->call_before_iso[0] != '\0') {
         mr_asprintf(message_to_screen, "Running pre-ISO call for CD#%d", g_current_media_number);
-        res =
-            eval_call_to_make_ISO(bkpinfo->call_before_iso,
-                                  destfile, g_current_media_number,
-                                  MONDO_LOGFILE, message_to_screen);
+        res = eval_call_to_make_ISO(bkpinfo->call_before_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
         if (res) {
             mr_strcat(message_to_screen, "...failed");
@@ -2015 +1963 @@
     log_to_screen(tmp);
     noof_biggie_files = count_lines_in_file(biggielist_fname);
-    open_progress_form("Backing up big files", tmp,
-                       "Please wait. This may take some time.", "",
-                       estimated_total_noof_slices);
-    paranoid_free(tmp);
+    open_progress_form("Backing up big files", tmp, "Please wait. This may take some time.", "", estimated_total_noof_slices);
+    mr_free(tmp);
 
     if (!(fin = fopen(biggielist_fname, "r"))) {
@@ -2127 +2073 @@
         }
 #endif
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     log_msg(1, "Finished backing up bigfiles");
@@ -2195 +2141 @@
         retval += res;
         if (res) {
-            mr_asprintf(tmp, "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?", curr_set_no);
-            log_to_screen(tmp);
-            mr_free(tmp);
+            log_to_screen("Errors occurred while archiving set %ld. Perhaps your live filesystem changed?", curr_set_no);
         }
 
@@ -2247 +2191 @@
 
         if (res) {
-            mr_asprintf(tmp, "Failed to add archive %ld's files to CD dir\n", curr_set_no);
-            log_to_screen(tmp);
-            mr_free(tmp);
-            fatal_error
-                ("Is your hard disk is full? If not, please send the author the logfile.");
+            log_to_screen("Failed to add archive %ld's files to CD dir\n", curr_set_no);
+            fatal_error("Is your hard disk is full? If not, please send the author the logfile.");
         }
         mr_free(curr_filelist_fname);
@@ -2682 +2623 @@
 
     mds = media_descriptor_string(g_backup_media_type);
-    mr_asprintf(tmp, "I am about to burn %s #%d", mds, g_current_media_number);
+    log_to_screen("I am about to burn %s #%d", mds, g_current_media_number);
     mr_free(mds);
-    log_to_screen(tmp);
-    mr_free(tmp);
     if (g_current_media_number < ask_for_one_if_more_than_this) {
         return;
@@ -2993 +2932 @@
     if (!(fin = fopen(file_to_openin, "r"))) {
         log_OS_error("Unable to openin biggie_filename");
-        mr_asprintf(tmp, "Cannot archive bigfile '%s': not found", biggie_filename);
-        log_to_screen(tmp);
-        paranoid_free(tmp);
+        log_to_screen("Cannot archive bigfile '%s': not found", biggie_filename);
 
         paranoid_free(checksum_line);
@@ -3115 +3052 @@
         retval += res;
         if (res) {
-            mr_asprintf(tmp, "Failed to add slice %ld of bigfile %ld to scratchdir", slice_num, biggie_file_number + 1);
-            log_to_screen(tmp);
-            paranoid_free(tmp);
-            fatal_error
-                ("Hard disk full. You should have bought a bigger one.");
+            log_to_screen("Failed to add slice %ld of bigfile %ld to scratchdir", slice_num, biggie_file_number + 1);
+            fatal_error("Hard disk full. You should have bought a bigger one.");
         }
     }
@@ -3132 +3066 @@
     }
     log_msg(1, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     paranoid_free(checksum_line);
@@ -3310 +3244 @@
     if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 >
         bkpinfo->media_size[g_current_media_number]) {
-        mr_asprintf(tmp1, "Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.", (long) space_occupied_by_cd(bkpinfo->scratchdir), (long) bkpinfo->media_size[g_current_media_number]);
-        log_to_screen(tmp1);
-        mr_free(tmp1);
+        log_to_screen("Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.", (long) space_occupied_by_cd(bkpinfo->scratchdir), (long) bkpinfo->media_size[g_current_media_number]);
     }
     mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
@@ -3377 +3309 @@
     mr_asprintf(tmp1, "rm -Rf %s/images/*gz %s/images/*data*img", bkpinfo->scratchdir, bkpinfo->scratchdir);
     if (system(tmp1)) {
-        log_msg
-            (2,
-             "Error occurred when I tried to delete the redundant IMGs and GZs");
+        log_msg(2, "Error occurred when I tried to delete the redundant IMGs and GZs");
     }
     mr_free(tmp1);
@@ -3455 +3385 @@
             if (res) {
                 mds = media_descriptor_string(bkpinfo->backup_media_type);
-                mr_asprintf(tmp, "Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
+                log_to_screen("Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
                 mr_free(mds);
-                log_to_screen(tmp);
-                mr_free(tmp);
 
             }

branches/2.2.10/mondo/src/common/libmondo-cli.c

@@ -111 +111 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            mr_asprintf(tmp, "-%c %s", i, flag_val[i]);
-            log_msg(3, tmp);
-            mr_free(tmp);
+            log_msg(3, "-%c %s", i, flag_val[i]);
         }
     }
@@ -150 +148 @@
     int j;
     char tmp[MAX_STR_LEN], *p; 
-    char *comment = NULL;
 
     assert(bkpinfo != NULL);
@@ -161 +158 @@
         *(strchr(tmp, ',')) = '\0';
         bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp);
-        mr_asprintf(comment, "media_size[%d] = %ld", j, bkpinfo->media_size[j]);
-        log_msg(3, comment);
-        mr_free(comment);
+        log_msg(3, "media_size[%d] = %ld", j, bkpinfo->media_size[j]);
     }
     for (; j <= MAX_NOOF_MEDIA; j++) {
@@ -837 +832 @@
         }
         bkpinfo->make_filelist = FALSE;
-        mr_asprintf(p, "%s", flag_val['J']);
-        mr_free(bkpinfo->include_paths);
-        bkpinfo->include_paths = p;
+        mr_asprintf(bkpinfo->include_paths, "%s", flag_val['J']);
     }
 
@@ -878 +871 @@
             log_msg(3, "flag_val['c'] = %s", flag_val['c']);
             log_msg(3, "flag_val['w'] = %s", flag_val['w']);
-//    log_msg(3, "flag_set['r'] = %i", flag_set['r'] );
+            // log_msg(3, "flag_set['r'] = %i", flag_set['r'] );
             if (flag_set['c']) {
                 bkpinfo->cdrw_speed = atoi(flag_val['c']);
@@ -902 +895 @@
         flag_set['d'] = TRUE;
         strcpy(flag_val['d'], p);
-        mr_free(p);
-        mr_asprintf(tmp1, "You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
-        log_to_screen(tmp1);
-        mr_free(tmp1);
+        log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
         percent = 0;
     }
@@ -1004 +994 @@
             p--;
             *p = '\0';
-            mr_asprintf(q,"%s",bkpinfo->nfs_mount);
-            bkpinfo->nfs_user = q;
+            mr_asprintf(bkpinfo->nfs_user,"%s",p);
             strcpy(bkpinfo->nfs_mount,tmp);
         }
         mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
         mr_free(bkpinfo->isodir);
-        mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
-        bkpinfo->isodir = tmp2;
+        mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(tmp1));
         mr_free(tmp1);
 
@@ -1025 +1013 @@
                 mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
                 mr_free(bkpinfo->isodir);
-                mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
-                bkpinfo->isodir = tmp2;
+                mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(tmp1));
                 mr_free(tmp1);
 
@@ -1213 +1200 @@
             && !does_file_exist(bkpinfo->kernel_path)) {
             retval++;
-            mr_asprintf(tmp1, "You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path);
-            log_to_screen(tmp1);
-            mr_free(tmp1);
+            log_to_screen("You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path);
         }
     }
@@ -1221 +1206 @@
     if (flag_set['p']) {
         mr_free(bkpinfo->prefix);
-        mr_asprintf(tmp1, "%s", flag_val['p']);
-        bkpinfo->prefix = tmp1;
+        mr_asprintf(bkpinfo->prefix, "%s", flag_val['p']);
         log_msg(1,"Prefix forced to %s",bkpinfo->prefix);
     }
@@ -1229 +1213 @@
         if (flag_set['i']) {
             mr_free(bkpinfo->isodir);
-            mr_asprintf(tmp2, "%s", flag_val['d']);
-            bkpinfo->isodir = tmp2;
+            mr_asprintf(bkpinfo->isodir, "%s", flag_val['d']);
             mr_asprintf(tmp1, "ls -l %s", bkpinfo->isodir);
             if (run_program_and_log_output(tmp1, 2)) {
@@ -1256 +1239 @@
         if (i) {
             retval++;
-            mr_asprintf(tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
-            log_to_screen(tmp2);
-            mr_free(tmp2);
+            log_to_screen(tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
         }
         unlink(tmp1);
@@ -1297 +1278 @@
 
     if (flag_set['S']) {
-        mr_asprintf(tmp1, "%s/mondo.scratch.%ld", flag_val['S'], random() % 32768);
-        mr_free(bkpinfo->scratchdir);
-        bkpinfo->scratchdir = tmp1;
+        mr_asprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'], random() % 32768);
     }
 
@@ -1510 +1489 @@
             if (flag_set[opt]) {
                 bad_switches = TRUE;
-                mr_asprintf(tmp, "Switch -%c previously defined as %s\n", opt, flag_val[opt]);
-                log_to_screen(tmp);
-                mr_free(tmp);
+                log_to_screen("Switch -%c previously defined as %s\n", opt, flag_val[opt]);
             } else {
                 flag_set[opt] = TRUE;
@@ -1526 +1503 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            mr_asprintf(tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
-                            log_to_screen(tmp);
-                            mr_free(tmp);
+                            log_to_screen("-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
                             bad_switches = TRUE;
                         }
@@ -1539 +1514 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        mr_asprintf(tmp, "Invalid arg -- %s\n", argv[i]);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("Invalid arg -- %s\n", argv[i]);
     }
     return (bad_switches);
@@ -1615 +1588 @@
     free_MR_global_filenames();
 
-    fatal_error
-        ("MondoRescue is terminating in response to a signal from the OS");
+    fatal_error("MondoRescue is terminating in response to a signal from the OS");
     finish(254);                // just in case
 }
@@ -1629 +1601 @@
 void set_signals(int on)
 {
-    int signals[] =
-        { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 };
+    int signals[] = { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 };
     int i;
 

branches/2.2.10/mondo/src/common/libmondo-devices.c

@@ -108 +108 @@
 {
     char *tmp = NULL;
-    char *comment = NULL;
     bool is_this_a_ramdisk = FALSE;
 
     mr_asprintf(tmp, "%s", where_is_root_mounted());
-    mr_asprintf(comment, "root is currently mounted at %s\n", tmp);
-    log_msg(0, comment);
-    mr_free(comment);
+    log_msg(0, "root is currently mounted at %s\n", tmp);
 
 #ifdef __FreeBSD__
@@ -221 +218 @@
         mr_asprintf(command, "cdcontrol -f %s eject", dev);
     } else {
-        mr_asprintf(command, "camcontrol eject `echo %s | sed 's|/dev/||'`",
-                dev);
+        mr_asprintf(command, "camcontrol eject `echo %s | sed 's|/dev/||'`", dev);
     }
 #else
@@ -500 +496 @@
 {
     /*@ buffers ************************ */
-    char *comment = NULL;
     char *tmp = NULL;
     char *cdr_exe = NULL;
@@ -532 +527 @@
     } else {
         strcpy(cdrw_device, tmp);
-        mr_asprintf(comment, "Found CDRW device - %s", cdrw_device);
-        log_it(comment);
+        log_it("Found CDRW device - %s", cdrw_device);
         strcpy(g_cdrw_drive_is_here, cdrw_device);
-        mr_free(comment);
         mr_free(tmp);
         mr_free(cdr_exe);
@@ -876 +869 @@
     }
 
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output
-            ("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
         );
     log_msg(5, "tmp = '%s'", tmp);
     if (!tmp[0])
         mr_free(tmp);
-        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output
-                ("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output ("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
             );
     if (tmp[0]) {
@@ -1090 +1081 @@
     malloc_string(incoming);
     assert(device_raw != NULL);
-//  assert_string_is_neither_NULL_nor_zerolength(device_raw);
     if (device_raw[0] != '/' && !strstr(device_raw, ":/")) {
         log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
@@ -1372 +1362 @@
                 log_msg(1, "FIXME - hacking bkpinfo->isodir from '%s' to %s/isodir", bkpinfo->isodir, bkpinfo->tmpdir);
                 mr_free(bkpinfo->isodir);
-                mr_asprintf(p, "%s/isodir", bkpinfo->tmpdir);
-                bkpinfo->isodir = p;
+                mr_asprintf(bkpinfo->isodir, "%s/isodir", bkpinfo->tmpdir);
             }
         }
@@ -1387 +1376 @@
                 cd_number_i_want);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        mr_asprintf(tmp, "Insisting on %s #%d", mds, cd_number_i_want);
+        log_msg(3, "Insisting on %s #%d", mds, cd_number_i_want);
         mr_asprintf(request, "Please insert %s #%d and press Enter.", mds, cd_number_i_want);
         mr_free(mds);
-        log_msg(3, tmp);
-        mr_free(tmp);
 
         while (what_number_cd_is_this() != cd_number_i_want) {
@@ -1731 +1718 @@
             mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", bkpinfo->nfs_mount);
             mr_free(bkpinfo->isodir);
-            mr_asprintf(p, "%s", call_program_and_get_last_line_of_output(command));
-            bkpinfo->isodir = p;
+            mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(command));
             mr_free(command);
 
@@ -1772 +1758 @@
         mr_free(bkpinfo->isodir);
         if (is_this_device_mounted(bkpinfo->nfs_mount)) {
-            mr_asprintf(p, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
-            bkpinfo->isodir = p;
+            mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
 
         } else {
-            mr_asprintf(p, "%s/nfsdir", bkpinfo->tmpdir);
-            bkpinfo->isodir = p;
+            mr_asprintf(bkpinfo->isodir, "%s/nfsdir", bkpinfo->tmpdir);
             mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
@@ -1790 +1774 @@
         }
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
-            popup_and_OK
-                ("Please mount that partition before you try to backup to or restore from it.");
+            popup_and_OK("Please mount that partition before you try to backup to or restore from it.");
             finish(1);
         }
@@ -2152 +2135 @@
         fatal_error("I couldn't figure out the scratchdir!");
     }
-    mr_asprintf(sz, "%s/mondo.scratch.%d", tmp, (int) (random() % 32768));
     mr_free(bkpinfo->scratchdir);
-    bkpinfo->scratchdir = sz;
+    mr_asprintf(bkpinfo->scratchdir , "%s/mondo.scratch.%d", tmp, (int) (random() % 32768));
     log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
 
@@ -2228 +2210 @@
 
     assert(bkpinfo != NULL);
-//  log_it("Asking what_number_cd_is_this");
+    //  log_it("Asking what_number_cd_is_this");
     if (g_ISO_restore_mode) {
         mr_asprintf(tmp, "mount | grep iso9660 | awk '{print $3;}'");
-
         mr_asprintf(mountdev, "%s%s", call_program_and_get_last_line_of_output(tmp), "/archives/THIS-CD-NUMBER");
         cd_number = atoi(last_line_of_file(mountdev));
-        paranoid_free(mountdev);
-        paranoid_free(tmp);
+        mr_free(mountdev);
+        mr_free(tmp);
 
         return (cd_number);
@@ -2242 +2223 @@
     mr_asprintf(mountdev, "%s", bkpinfo->media_device);
     if (!mountdev[0]) {
-        log_it
-            ("(what_number_cd_is_this) Warning - media_device unknown. Finding out...");
+        log_it("(what_number_cd_is_this) Warning - media_device unknown. Finding out...");
         find_cdrom_device(bkpinfo->media_device, FALSE);
     }
@@ -2253 +2233 @@
         }
     }
-    paranoid_free(mountdev);
+    mr_free(mountdev);
 
     cd_number = atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));

branches/2.2.10/mondo/src/common/libmondo-fifo.c

@@ -94 +94 @@
     if (!res) {
         bufsize++;
-        mr_asprintf(tmp, "Negotiated max buffer of %d MB ", bufsize);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen(tmp, "Negotiated max buffer of %d MB ", bufsize);
     } else {
         bufsize = 0;

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

@@ -159 +159 @@
 
     mr_asprintf(tmp_fname, "%s/sortfile", bkpinfo->tmpdir);
-
     mr_asprintf(command, "sort %s > %s 2>> %s", orig_fname, tmp_fname, MONDO_LOGFILE);
     retval = system(command);
@@ -334 +333 @@
 
     if (curr_set_no == 0) {
-        mr_asprintf(tmp, "Only one fileset. Fine.");
+        log_msg(1, "Only one fileset. Fine.");
     } else {
-        mr_asprintf(tmp, "Filelist divided into %ld sets", curr_set_no + 1);
-    }
-    log_msg(1, tmp);
-    mr_free(tmp);
+        log_msg(1, "Filelist divided into %ld sets", curr_set_no + 1);
+    }
     close_evalcall_form();
     /* This is to work around an obscure bug in Newt; open a form, close it,
@@ -474 +471 @@
         paranoid_free(tmp);
         mr_asprintf(syscall, "%s 2>> /dev/null", strtmp);   // " MONDO_LOGFILE);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         call_exe_and_pipe_output_to_fd(syscall, pout);
-        paranoid_free(syscall);
+        mr_free(syscall);
     }
     paranoid_fclose(fin);
@@ -1416 +1413 @@
                     mr_asprintf(tmp, "Reading %-68s", dir);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                 }
 #endif
@@ -1436 +1433 @@
         mr_asprintf(tmp,"opendir %s", dir);
         log_OS_error(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else if (strstr(skip_these, new_with_spaces)) {
         fprintf(fout, "%s\n", dir); // if excluded dir then print dir ONLY
@@ -1452 +1449 @@
             if (strstr(skip_these, new_with_spaces)) {
                 fprintf(fout, "%s\n", new);
-                paranoid_free(new_with_spaces);
+                mr_free(new_with_spaces);
             } else {
-                paranoid_free(new_with_spaces);
+                mr_free(new_with_spaces);
                 if (!lstat(new, &statbuf)) {
                     if (!S_ISLNK(statbuf.st_mode)
@@ -1471 +1468 @@
 #ifndef _XWIN
                                 if (!g_text_mode) {
-                                    newtDrawRootText(77, g_noof_rows - 3,
-                                                     tmp);
+                                    newtDrawRootText(77, g_noof_rows - 3, tmp);
                                     newtRefresh();
                                 }
 #endif
-                                paranoid_free(tmp);
+                                mr_free(tmp);
                             }
                         }
@@ -1565 +1561 @@
     mr_asprintf(sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
-        fatal_error
-            ("Please supply either include_paths or userdef_filelist");
+        fatal_error("Please supply either include_paths or userdef_filelist");
     }
     // make hole for filelist
@@ -1584 +1579 @@
         // backup last known good datefile just in case :)
         if (does_file_exist(sz_datefile)) {
-            mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile,
-                    sz_datefile);
+            mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile, sz_datefile);
             paranoid_system(command);
             mr_free(command);
@@ -1626 +1620 @@
             log_msg(2, "Found windows FS: %s",tmp2);
             mr_asprintf(tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
-            paranoid_free(tmp2);
+            mr_free(tmp2);
             mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
             log_msg(2, "Found windows files: %s",tmp2);

branches/2.2.10/mondo/src/common/libmondo-files.c

@@ -48 +48 @@
     static char output[MAX_STR_LEN];
     char *command = NULL;
-    char *tmp = NULL;
 
     /*@ pointers **************************************************** */
@@ -71 +70 @@
         mr_free(command);
     } else {
-        mr_asprintf(tmp, "File '%s' not found; cannot calc checksum", filename);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("File '%s' not found; cannot calc checksum", filename);
     }
     if (p) {
@@ -129 +126 @@
     char *command = NULL;
     char incoming[MAX_STR_LEN];
-    char *tmp = NULL;
 
     /*@ long ******************************************************** */
@@ -142 +138 @@
     assert_string_is_neither_NULL_nor_zerolength(filename);
     if (!does_file_exist(filename)) {
-        mr_asprintf(tmp, "%s does not exist, so I cannot found the number of lines in it", filename);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("%s does not exist, so I cannot found the number of lines in it", filename);
         return (0);
     }
@@ -251 +245 @@
             fprintf(fout, "%s\n", incoming);
         } else {
-            mr_asprintf(tmp, "Excluding '%s'-nonexistent\n", incoming);
-            log_it(tmp);
-            mr_free(tmp);
+            log_it("Excluding '%s'-nonexistent\n", incoming);
         }
     }
@@ -354 +346 @@
         }
         mr_asprintf(command, "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null", incoming);
-        strcpy(incoming,
-               call_program_and_get_last_line_of_output(command));
+        strcpy(incoming, call_program_and_get_last_line_of_output(command));
         mr_free(command);
     }
@@ -361 +352 @@
     {
         mr_asprintf(command, "dirname %s 2> /dev/null", incoming);
-        strcpy(incoming,
-               call_program_and_get_last_line_of_output(command));
+        strcpy(incoming, call_program_and_get_last_line_of_output(command));
         mr_free(command);
     }
@@ -453 +443 @@
     if (i < 0) {
         mr_asprintf(command, "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'", filename, '%');
-        strcpy(lastline,
-               call_program_and_get_last_line_of_output(command));
+        strcpy(lastline, call_program_and_get_last_line_of_output(command));
         mr_free(command);
         if (!lastline[0]) {
@@ -495 +484 @@
     static char output[MAX_STR_LEN];
     char *command = NULL;
-    char *tmp = NULL;
 
     /*@ pointers **************************************************** */
@@ -503 +491 @@
 
     if (!does_file_exist(filename)) {
-        mr_asprintf(tmp, "Tring to get last line of nonexistent file (%s)", filename);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("Tring to get last line of nonexistent file (%s)", filename);
         output[0] = '\0';
         return (output);
@@ -618 +604 @@
                 /*              printf("%0d%% done      \r",percentage); */
             } else {
-                time_remaining =
-                    time_taken * 100 / (long) (percentage) - time_taken;
-                mr_asprintf(tmp, "%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r", percentage, (int) (time_taken / 60), (int) (time_taken % 60), (int) (time_remaining / 60), (int) (time_remaining % 60), curr_fname);
-                log_to_screen(tmp);
-                mr_free(tmp);
+                time_remaining = time_taken * 100 / (long) (percentage) - time_taken;
+                log_to_screen("%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r", percentage, (int) (time_taken / 60), (int) (time_taken % 60), (int) (time_remaining / 60), (int) (time_remaining % 60), curr_fname);
             }
             sync();
@@ -820 +803 @@
                 log_msg(4, "%s --> %ld K", fname, file_len_K);
             }
-            mr_asprintf(comment, "After adding %s, scratchL+%ld now equals %ld", fname, file_len_K, scratchL);
-            log_msg(4, comment);
-            mr_free(comment);
+            log_msg(4, "After adding %s, scratchL+%ld now equals %ld", fname, file_len_K, scratchL);
             if (feof(fin)) {
                 break;
@@ -920 +901 @@
     /*@ buffers *** */
     char *command = NULL;
-    char *errorstr = NULL;
     int res = 0;
 
@@ -928 +908 @@
 
     if (res) {
-        mr_asprintf(errorstr, "Please install '%s'. I cannot find it on your system.", fname);
-        log_to_screen(errorstr);
-        mr_free(errorstr);
+        log_to_screen("Please install '%s'. I cannot find it on your system.", fname);
         log_to_screen("There may be hyperlink at http://www.mondorescue.com which");
         log_to_screen("will take you to the relevant (missing) package.");
@@ -1031 +1009 @@
     char *command = NULL;
     char tmp[MAX_STR_LEN];
-    char old_pwd[MAX_STR_LEN];
     int res = 0;
 
@@ -1124 +1101 @@
     p = strchr(tmp, ':');
     if (!p) {
-        fatal_error
-            ("NFS mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
+        fatal_error("NFS mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
     }
     *(p++) = '\0';
@@ -1229 +1205 @@
 
 
-
-
-
-
 /**
  * Determine the approximate number of media that the backup will take up,

branches/2.2.10/mondo/src/common/libmondo-fork.c

@@ -252 +252 @@
     /*@ int ********************************************************* */
     int res;
-    int i;
     bool log_if_failure = FALSE;
     bool log_if_success = FALSE;
@@ -354 +353 @@
 
     /*@ buffers **************************************************** */
-    char *tmp = NULL;
     char *command = NULL;
     char *lockfile = NULL;
@@ -367 +365 @@
     mr_asprintf(command, "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res", lockfile, basic_call, MONDO_LOGFILE, MONDO_LOGFILE, lockfile);
     open_evalcall_form(what_i_am_doing);
-    mr_asprintf(tmp, "Executing %s", basic_call);
-    log_msg(2, tmp);
-    mr_free(tmp);
+    log_msg(2, "Executing %s", basic_call);
 
     if (!(fin = popen(command, "r"))) {
         log_OS_error("Unable to popen-in command");
-        mr_asprintf(tmp, "Failed utterly to call '%s'", command);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("Failed utterly to call '%s'", command);
         mr_free(command);
         mr_free(lockfile);

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

@@ -341 +341 @@
     if (amount_allocated > physical_drive_size) // Used to be +1, but what if you're 1 MB too high?
     {
-        mr_asprintf(tmp, " %ld MB over-allocated on %s.",
-                amount_allocated - physical_drive_size, drive);
+        mr_asprintf(tmp, " %ld MB over-allocated on %s.", amount_allocated - physical_drive_size, drive);
         log_it(tmp);
         mr_strcat(flaws_str, "%s", tmp);
@@ -348 +347 @@
         res++;
     } else if (amount_allocated < physical_drive_size - 1) {    /* NOT AN ERROR, JUST A WARNING :-) */
-        mr_asprintf(tmp, " %ld MB unallocated on %s.",
-                physical_drive_size - amount_allocated, drive);
+        mr_asprintf(tmp, " %ld MB unallocated on %s.", physical_drive_size - amount_allocated, drive);
         log_it(tmp);
         mr_strcat(flaws_str, "%s", tmp);
@@ -403 +401 @@
         return(flaws_str);
     } else {
-        mr_asprintf(tmp, "%s is %ld MB", drive, physical_drive_size);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("%s is %ld MB", drive, physical_drive_size);
     }
 
@@ -424 +420 @@
             } else if (curr_part_no > 5
                        || (curr_part_no <= 4 && prev_part_no > 0)) {
-                mr_asprintf(tmp, " Gap on %s between %d and %d.", drive,
-                        prev_part_no, curr_part_no);
+                mr_asprintf(tmp, " Gap on %s between %d and %d.", drive, prev_part_no, curr_part_no);
                 log_it(tmp);
                 mr_strcat(flaws_str, "%s", tmp);
@@ -496 +491 @@
     /* Over-allocated the disk? Unallocated space on disk? */
     if (amount_allocated > physical_drive_size + 1) {
-        mr_asprintf(tmp, " %ld MB over-allocated on %s.",
-                amount_allocated - physical_drive_size, drive);
+        mr_asprintf(tmp, " %ld MB over-allocated on %s.", amount_allocated - physical_drive_size, drive);
         log_it(tmp);
         mr_strcat(flaws_str, "%s", tmp);
@@ -503 +497 @@
         res++;
     } else if (amount_allocated < physical_drive_size - 1) {    /* NOT AN ERROR, JUST A WARNING :-) */
-        mr_asprintf(tmp, " %ld MB unallocated on %s.",
-                physical_drive_size - amount_allocated, drive);
+        mr_asprintf(tmp, " %ld MB unallocated on %s.", physical_drive_size - amount_allocated, drive);
         log_it(tmp);
         mr_strcat(flaws_str, "%s", tmp);
@@ -561 +554 @@
             (drivelist->el[i].device,
              DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE)) {
-            mr_asprintf(tmp, " Not evaluating %s (I don't know how yet)", drivelist->el[i].device);
-            log_it(tmp);
-            paranoid_free(tmp);
+            log_it(" Not evaluating %s (I don't know how yet)", drivelist->el[i].device);
         } else {
             log_msg(8, "Evaluating drive #%d (%s) within mountlist", i, drivelist->el[i].device);
@@ -576 +567 @@
             log_msg(8,"Adding: %s to %s", tmp, flaws_str);
             mr_strcat(flaws_str, "%s", tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
     }
     res += look_for_duplicate_mountpoints(mountlist, flaws_str);
     res = spread_flaws_across_three_lines(flaws_str, flaws_str_A, flaws_str_B, flaws_str_C,res);
-    paranoid_free(flaws_str);
+    mr_free(flaws_str);
     return(res);
 }
@@ -654 +645 @@
             mr_strcat(flaws_str, "%s", tmp);
             log_it(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             res++;
         }
-        paranoid_free(curr_mountpoint);
+        mr_free(curr_mountpoint);
     }
     return (res);
@@ -693 +684 @@
         if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
             log_msg(8, "Not putting %s in list of drives: it's a virtual drive", drive);
-            paranoid_free(drive);
+            mr_free(drive);
             continue;
         }
@@ -700 +691 @@
         if (size == 0) {
             log_msg(8, "Not putting %s in list of drives: it has zero size (maybe an LVM volume)", drive);
-            paranoid_free(drive);
+            mr_free(drive);
             continue;
         }
@@ -708 +699 @@
         /* memory allocation */
         truncdrive = truncate_to_drive_name(drive);
-        paranoid_free(drive);
+        mr_free(drive);
 
         log_msg(8, "drive truncated to %s", truncdrive);
@@ -757 +748 @@
     int used_by = 0;
 
-    /*@ buffers ********************************************************* */
-    char *tmp = NULL;
-
     assert(output_list != NULL);
     assert(mountlist != NULL);
@@ -769 +757 @@
     for (i = 0; i < mountlist->entries; i++) {
         if (strstr(mountlist->el[i].mountpoint, "raid")) {
-            used_by =
-                which_raid_device_is_using_this_partition(raidlist,
+            used_by = which_raid_device_is_using_this_partition(raidlist,
                                                           mountlist->el[i].
                                                           device);
@@ -777 +764 @@
                        (void *) &mountlist->el[i],
                        sizeof(struct mountlist_line));
-                mr_asprintf(tmp, "%s is available; user may choose to add it to raid device", output_list->el[items - 1].device);
-                log_it(tmp);
-                paranoid_free(tmp);
+                log_it("%s is available; user may choose to add it to raid device", output_list->el[items - 1].device);
             }
         }
@@ -895 +880 @@
             if (j < items) {
                 strcat(mountlist->el[items].device, "_dup");
-                mr_asprintf(tmp, "Duplicate entry in mountlist - renaming to %s", mountlist->el[items].device);
-                log_it(tmp);
-                paranoid_free(tmp);
+                log_it("Duplicate entry in mountlist - renaming to %s", mountlist->el[items].device);
             }
             mr_asprintf(tmp, "%s", mountlist->el[items].device);
@@ -1065 +1048 @@
 
     mountlist->el[b].size = size;
-    paranoid_free(device);
-    paranoid_free(mountpoint);
-    paranoid_free(format);
+    mr_free(device);
+    mr_free(mountpoint);
+    mr_free(format);
 }
 

branches/2.2.10/mondo/src/common/libmondo-raid.c

@@ -471 +471 @@
 {
     FILE *fin;
-    char *tmp1 = NULL;
     int items;
 
@@ -585 +584 @@
     fclose(fin);
     log_it("Raidtab loaded successfully.");
-    mr_asprintf(tmp1, "%d RAID devices in raidtab", raidlist->entries);
-    log_it(tmp1);
-    mr_free(tmp1);
+    log_it("%d RAID devices in raidtab", raidlist->entries);
     return (0);
 }
@@ -687 +684 @@
 
     /*@ add mallocs * */
-    char *tmp = NULL;
     char *labelB;
     char *valueB;
@@ -744 +740 @@
         }
         if (!disklist) {
-            mr_asprintf(tmp, "Ignoring '%s %s' pair of disk %s", labelB, valueB, label);
-            log_it(tmp);
-            mr_free(tmp);
+            log_it("Ignoring '%s %s' pair of disk %s", labelB, valueB, label);
         } else {
             index = atoi(valueB);
@@ -1008 +1002 @@
     mr_asprintf(strtmp, "%s", pos);
     strcpy(string, strtmp);
-    paranoid_free(strtmp);
+    mr_free(strtmp);
     // if we have newline after only spaces, this is a blank line, update
     // counters, otherwise do normal parsing
@@ -1029 +1023 @@
     mr_asprintf(strtmp,"%s%s", device_prefix, token);
     strcpy(raidlist->el[raidlist->entries].raid_device, strtmp);
-    paranoid_free(strtmp);
+    mr_free(strtmp);
     mr_free(token);
     // skip ':' and status
@@ -1088 +1082 @@
         mr_asprintf(strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].data_disks.entries++;
         break;
@@ -1095 +1089 @@
         mr_asprintf(strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].spare_disks.entries++;
         break;
@@ -1102 +1096 @@
         mr_asprintf(strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].failed_disks.entries++;
         log_it("At least one failed disk found in RAID array.\n");

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

@@ -1012 +1012 @@
 {
     /*@ buffers ***************************************************** */
-    char *tmp = NULL;
     char *datablock;
     char *temp_fname;
     char *temp_cksum;
     char *actual_cksum = NULL;
-//  char *pA, *pB;
 
     /*@ int ********************************************************* */
@@ -1058 +1056 @@
     res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
     if (orig_size != temp_size && orig_size != -1) {
-        mr_asprintf(tmp, "output file's size should be %ld K but is apparently %ld K", (long) size >> 10, (long) temp_size >> 10);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("output file's size should be %ld K but is apparently %ld K", (long) size >> 10, (long) temp_size >> 10);
     }
     if (ctrl_chr != BLK_START_FILE) {
@@ -1131 +1127 @@
     }
     if (strcmp(temp_cksum, actual_cksum)) {
-        mr_asprintf(tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum, temp_cksum);
-        log_to_screen(tmp);
-        mr_free(tmp);
-
-        mr_asprintf(tmp, "%s (%ld K) is corrupt on tape", temp_fname, (long) orig_size >> 10);
-        log_to_screen(tmp);
-        mr_free(tmp);
-
+        log_to_screen("actual cksum=%s; recorded cksum=%s", actual_cksum, temp_cksum);
+        log_to_screen("%s (%ld K) is corrupt on tape", temp_fname, (long) orig_size >> 10);
         retval++;
     }
@@ -1573 +1563 @@
     /*@ pointers *************************************************** */
     FILE *fin;
-    char *tmp = NULL;
 
     /*@ long ******************************************************* */
@@ -1591 +1580 @@
     log_it("Data disks = %s", fname);
     if (!does_file_exist(fname)) {
-        mr_asprintf(tmp, "Cannot find %s", fname);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("Cannot find %s", fname);
         return (1);
     }
@@ -1636 +1623 @@
 {
     /*@ buffers **************************************************** */
-    char *tmp = NULL;
     char datablock[TAPE_BLOCK_SIZE];
     char *checksum = NULL;
@@ -1689 +1675 @@
         p++;
     }
-    mr_asprintf(tmp, "Writing file '%s' to tape (%ld KB)", p, (long) filesize >> 10);
-    log_it(tmp);
-    mr_free(tmp);
+    log_it("Writing file '%s' to tape (%ld KB)", p, (long) filesize >> 10);
     write_header_block_to_stream(filesize, infile_basename,
                                  BLK_START_FILE);
@@ -1761 +1745 @@
     /*@ buffers **************************************************** */
     char tempblock[TAPE_BLOCK_SIZE];
-    char *tmp = NULL;
     char *p;
 
@@ -1780 +1763 @@
     }
     if (!g_tape_stream) {
-        log_to_screen
-            ("You're not backing up to tape. Why write a tape header?");
+        log_to_screen("You're not backing up to tape. Why write a tape header?");
         return (1);
     }
@@ -1791 +1773 @@
     memcpy(tempblock + 7001, (char *) &olen, sizeof(off_t));
     strcpy(tempblock + 1000, filename);
-    g_tape_posK +=
-        fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
-               g_tape_stream) / 1024;
-    mr_asprintf(tmp, "%s (fname=%s, size=%ld K)", marker_to_string(control_char), p, (long) length_of_incoming_file >> 10);
-    log_msg(6, tmp);
-    mr_free(tmp);
+    g_tape_posK += fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream) / 1024;
+    log_msg(6, "%s (fname=%s, size=%ld K)", marker_to_string(control_char), p, (long) length_of_incoming_file >> 10);
     return (0);
 }
@@ -1816 +1794 @@
 void wrong_marker(int should_be, int it_is)
 {
-    /*@ buffer ***************************************************** */
-    char *tmp = NULL;
-
-
-    /*@ end vars *************************************************** */
-    mr_asprintf(tmp, "Wrong marker! (Should be %s, is actually %s)", marker_to_string(should_be), marker_to_string(it_is));
-    log_to_screen(tmp);
-    mr_free(tmp);
+    log_to_screen("Wrong marker! (Should be %s, is actually %s)", marker_to_string(should_be), marker_to_string(it_is));
 }
 

branches/2.2.10/mondo/src/common/libmondo-tools.c

@@ -828 +828 @@
     bkpinfo->disaster_recovery = (am_I_in_disaster_recovery_mode()? TRUE : FALSE);
     if (bkpinfo->disaster_recovery) {
-        mr_asprintf(p, "%s", "/");
+        mr_asprintf(bkpinfo->isodir, "%s", "/");
     } else {
-        mr_asprintf(p, "%s", MONDO_CACHE);
-    }
-    bkpinfo->isodir = p;
-    mr_asprintf(p, "%s", STD_PREFIX);
-    bkpinfo->prefix = p;
-    bkpinfo->scratchdir = NULL;
-    bkpinfo->tmpdir = NULL;
+        mr_asprintf(bkpinfo->isodir, "%s", MONDO_CACHE);
+    }
+    mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
+    bkpinfo->scratchdir = NULL;     // Really setup after
+    bkpinfo->tmpdir = NULL;         // Really setup after
     bkpinfo->optimal_set_size = 0;
     bkpinfo->backup_media_type = none;
@@ -889 +887 @@
     mr_free(command);
 
-    mr_asprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
-            partition);
+    mr_asprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4", partition);
     mr_asprintf(out_sz, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -941 +938 @@
     }
     if (atol(tmp) < 66000) {
-        log_to_screen
-            ("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
+        log_to_screen("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
     }
     mr_free(tmp);
@@ -1080 +1076 @@
     /*@ buffer ****************************************************** */
     char *command = NULL;
-    char *tmp = NULL;
 
     /*@ end vars *************************************************** */
@@ -1087 +1082 @@
     assert_string_is_neither_NULL_nor_zerolength(label);
     if (!does_file_exist(config_file)) {
-        mr_asprintf(tmp, "(read_cfg_var) Cannot find %s config file", config_file);
-        log_to_screen(tmp);
-        mr_free(tmp);
-
+        log_to_screen("(read_cfg_var) Cannot find %s config file", config_file);
         value[0] = '\0';
         return (1);
@@ -1252 +1244 @@
                     strcpy(g_boot_mountpt, tmp);
                     mr_free(tmp);
-                    mr_asprintf(tmp, "%s (your /boot partition) is not mounted. I'll mount it before backing up", g_boot_mountpt);
-                    log_it(tmp);
-                    mr_free(tmp);
+                    log_it("%s (your /boot partition) is not mounted. I'll mount it before backing up", g_boot_mountpt);
 
                     mr_asprintf(tmp, "mount %s", g_boot_mountpt);
@@ -1311 +1301 @@
     char *command = NULL;
     char *tempfile = NULL;
-    char *tmp = NULL;
 
 
@@ -1319 +1308 @@
     assert(value != NULL);
     if (!does_file_exist(config_file)) {
-        mr_asprintf(tmp, "(write_cfg_file) Cannot find %s config file", config_file);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("(write_cfg_file) Cannot find %s config file", config_file);
         return (1);
     }

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

@@ -167 +167 @@
         } else {
             retval++;
-            mr_asprintf(tmp, "Warning - missing set(s) between %d and %d\n", g_last_afioball_number, set_number - 1);
-            log_to_screen(tmp);
-            mr_free(tmp);
+            log_to_screen("Warning - missing set(s) between %d and %d\n", g_last_afioball_number, set_number - 1);
         }
     }
@@ -666 +664 @@
         if (strcmp(biggie_cksum, orig_cksum)) {
             log_msg(2, "orig cksum=%s; curr cksum=%s", biggie_cksum, orig_cksum);
-            mr_asprintf(tmp, "%s has changed on live filesystem", biggie_fname);
-            log_to_screen(tmp);
-            mr_free(tmp);
+            log_to_screen("%s has changed on live filesystem", biggie_fname);
 
             mr_asprintf(tmp, "echo \"%s\" >> %s/biggies.changed", biggie_fname, bkpinfo->tmpdir);
@@ -776 +772 @@
         res = verify_an_afioball_from_stream(fname, size);
         if (res) {
-            mr_asprintf(tmp, "Afioball %ld differs from live filesystem", current_afioball_number);
-            log_to_screen(tmp);
-            mr_free(tmp);
+            log_to_screen("Afioball %ld differs from live filesystem", current_afioball_number);
         }
         retval += res;
@@ -981 +975 @@
 #endif
     {
-        mr_asprintf(tmp, "%s failed; unable to unmount USB device\n", tmp1);
-        log_to_screen(tmp);
-        paranoid_free(tmp);
+        log_to_screen("%s failed; unable to unmount USB device\n", tmp1);
         retval++;
     } else {
         log_msg(2, "OK, I've unmounted the USB device\n");
     }
-    paranoid_free(tmp1);
-    paranoid_free(mountpoint);
+    mr_free(tmp1);
+    mr_free(mountpoint);
     return (retval);
 }
@@ -1053 +1045 @@
         mddevice = make_vn(fname);
         if (ret) {
-            mr_asprintf(tmp, "make_vn of %s failed; unable to verify ISO\n", fname);
-            log_to_screen(tmp);
-            mr_free(tmp);
+            log_to_screen("make_vn of %s failed; unable to verify ISO\n", fname);
             mr_free(mountpoint);
             mr_free(fname);
@@ -1065 +1055 @@
 #endif
         if (run_program_and_log_output(command, FALSE)) {
-            mr_asprintf(tmp, "%s failed; unable to mount ISO image\n", command);
-            log_to_screen(tmp);
-            mr_free(tmp);
+            log_to_screen("%s failed; unable to mount ISO image\n", command);
             mr_free(mountpoint);
             mr_free(command);
@@ -1099 +1087 @@
     ret += system(command);
     ret += kick_vn(mddevice);
-    if (ret)
+    if (ret) {
 #else
     mr_asprintf(command, "umount %s", mountpoint);
-    if (system(command))
+    if (system(command)) {
 #endif
-    {
-        mr_asprintf(tmp, "%s failed; unable to unmount ISO image\n", command);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("%s failed; unable to unmount ISO image\n", command);
 
         retval++;

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

@@ -1079 +1079 @@
         char *timeline_str = NULL;
         char *taskprogress = NULL;
-        char *tmp = NULL;
 
         if (!g_text_mode) {

branches/2.2.10/mondo/src/mondoarchive/mondoarchive.c

@@ -362 +362 @@
         res = verify_data();
         if (res < 0) {
-            mr_asprintf(tmp, "%d difference%c found.", -res,
-                    (-res != 1) ? 's' : ' ');
+            mr_asprintf(tmp, "%d difference%c found.", -res, (-res != 1) ? 's' : ' ');
             mr_asprintf(say_at_end, "%s", tmp);
             log_to_screen(tmp);

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

@@ -484 +484 @@
                  fgets(incoming, MAX_STR_LEN - 1, fin));
             if (!feof(fin)) {
-                mr_asprintf(tmp, "Investigating %s", old_mountlist->el[lino].device);
-                log_it(tmp);
-                mr_free(tmp);
+                log_it("Investigating %s", old_mountlist->el[lino].device);
 
                 for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin)
@@ -497 +495 @@
                         *p = '\0';
                         for (p--; p > incoming && *(p - 1) > 32; p--);
-                        mr_asprintf(tmp, "Extrapolating %s", p);
-                        log_it(tmp);
-                        mr_free(tmp);
+                        log_it("Extrapolating %s", p);
 
                         for (j = 0;
@@ -518 +514 @@
                             new_mountlist->entries++;
                         } else {
-                            mr_asprintf(tmp, "Not adding %s to mountlist: it's already there", p);
-                            log_it(tmp);
-                            mr_free(tmp);
+                            log_it("Not adding %s to mountlist: it's already there", p);
                         }
                     }
@@ -585 +579 @@
   for (j = 1; j < raidlist->el[i].data_disks.entries; j++) {
     mr_asprintf(strtmp, "%s", devices);
-    paranoid_free(devices);
-    mr_asprintf(devices, "%s %s", strtmp,
-         raidlist->el[i].data_disks.el[j].device);
-    paranoid_free(strtmp);
+    mr_free(devices);
+    mr_asprintf(devices, "%s %s", strtmp, raidlist->el[i].data_disks.el[j].device);
+    mr_free(strtmp);
   }
   for (j = 0; j < raidlist->el[i].spare_disks.entries; j++) {
     mr_asprintf(strtmp, "%s", devices);
-    paranoid_free(devices);
-    mr_asprintf(devices, "%s %s", strtmp,
-         raidlist->el[i].spare_disks.el[j].device);
-    paranoid_free(strtmp);
+    mr_free(devices);
+    mr_asprintf(devices, "%s %s", strtmp, raidlist->el[i].spare_disks.el[j].device);
+    mr_free(strtmp);
   }
   // translate RAID level
@@ -613 +605 @@
   if (raidlist->el[i].parity != -1) {
     mr_asprintf(strtmp, "%s", program);
-    paranoid_free(program);
+    mr_free(program);
     switch(raidlist->el[i].parity) {
     case 0:
@@ -635 +627 @@
   if (raidlist->el[i].chunk_size != -1) {
     mr_asprintf(strtmp, "%s", program);
-    paranoid_free(program);
+    mr_free(program);
     mr_asprintf(program, "%s --chunk=%d", strtmp, raidlist->el[i].chunk_size);
-    paranoid_free(strtmp);
+    mr_free(strtmp);
   }
   if (raidlist->el[i].spare_disks.entries > 0) {
     mr_asprintf(strtmp, "%s", program);
-    paranoid_free(program);
+    mr_free(program);
     mr_asprintf(program, "%s --spare-devices=%d", strtmp, raidlist->el[i].spare_disks.entries);
-    paranoid_free(strtmp);
+    mr_free(strtmp);
   }
   mr_asprintf(strtmp, "%s", program);
-  paranoid_free(program);
+  mr_free(program);
   mr_asprintf(program, "%s %s", strtmp, devices);
-  paranoid_free(strtmp);
+  mr_free(strtmp);
   res = run_program_and_log_output(program, 1);
-  // free memory
-  paranoid_free(devices);
-  paranoid_free(level);
-  paranoid_free(program);
-  // return to calling instance
+  mr_free(devices);
+  mr_free(level);
+  mr_free(program);
   return res;
 }
@@ -688 +678 @@
 
     if (strstr(format, "raid")) {   // do not form RAID disks; do it to /dev/md* instead
-        mr_asprintf(tmp, "Not formatting %s (it is a RAID disk)", device);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("Not formatting %s (it is a RAID disk)", device);
         return (0);
     }
@@ -700 +688 @@
 #endif
     if (strlen(format) <= 2) {
-        mr_asprintf(tmp, "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it", device, format);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it", device, format);
         return (0);
     }
     if (is_this_device_mounted(device)) {
-        mr_asprintf(tmp, "%s is mounted - cannot format it       ", device);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("%s is mounted - cannot format it       ", device);
         return (1);
     }
@@ -736 +720 @@
             char line[MAX_STR_LEN];
 
-            mr_asprintf(tmp, "Initializing Vinum device %s (this may take a *long* time)", device);
-            log_to_screen(tmp);
-            mr_free(tmp);
+            log_to_screen("Initializing Vinum device %s (this may take a *long* time)", device);
 
             /* format raid partition */
@@ -782 +764 @@
         }
 #else
-        mr_asprintf(tmp, "Initializing RAID device %s", device);
+        log_to_screen(tmp, "Initializing RAID device %s", device);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -989 +971 @@
         me = &mountlist->el[lino];  // the current mountlist entry
         if (!strcmp(me->mountpoint, "image")) {
-            mr_asprintf(tmp, "Not formatting %s - it's an image", me->device);
-            log_it(tmp);
-            mr_free(tmp);
+            log_it("Not formatting %s - it's an image", me->device);
         } else if (!strcmp(me->format, "raid")) {
-            mr_asprintf(tmp, "Not formatting %s - it's a raid-let", me->device);
-            log_it(tmp);
-            mr_free(tmp);
+            log_it("Not formatting %s - it's a raid-let", me->device);
             continue;
         } else if (!strcmp(me->format, "lvm")) {
-            mr_asprintf(tmp, "Not formatting %s - it's an LVM", me->device);
-            log_it(tmp);
-            mr_free(tmp);
+            log_it("Not formatting %s - it's an LVM", me->device);
             continue;
         } else if (!strncmp(me->device, "/dev/md", 7)) {
-            mr_asprintf(tmp, "Already formatted %s - it's a soft-RAID dev", me->device);
-            log_it(tmp);
-            mr_free(tmp);
+            log_it("Already formatted %s - it's a soft-RAID dev", me->device);
             continue;
         } else if (!does_file_exist(me->device)
                    && strncmp(me->device, "/dev/hd", 7)
                    && strncmp(me->device, "/dev/sd", 7)) {
-            mr_asprintf(tmp, "Not formatting %s yet - doesn't exist - probably an LVM", me->device);
-            log_it(tmp);
-            mr_free(tmp);
+            log_it("Not formatting %s yet - doesn't exist - probably an LVM", me->device);
             continue;
         } else {
@@ -1048 +1020 @@
     }
 
-    mr_asprintf(tmp, "format_everything () - %s", (retval) ? "failed!" : "finished successfully");
-    log_it(tmp);
-    mr_free(tmp);
+    log_it("format_everything () - %s", (retval) ? "failed!" : "finished successfully");
 
     if (g_partition_table_locked_up > 0) {
@@ -1103 +1073 @@
     int res;
 
-    /** buffers **********************************************************/
-    char *tmp = NULL;
-
     /** end **************************************************************/
 
@@ -1111 +1078 @@
 
     if (devno_we_must_allow_for >= 5) {
-        mr_asprintf(tmp, "Making dummy primary 1 on %s", drivename);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("Making dummy primary 1 on %s", drivename);
 
         g_maximum_progress++;
@@ -1127 +1092 @@
     }
     for (; current_devno < devno_we_must_allow_for; current_devno++) {
-        mr_asprintf(tmp, "Creating dummy partition %d on %s", current_devno, drivename);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("Creating dummy partition %d on %s", current_devno, drivename);
         g_maximum_progress++;
         res =
@@ -1468 +1431 @@
     malloc_string(format);
 
-    mr_asprintf(tmp, "Partitioning drive %s", drivename);
-    log_it(tmp);
-    mr_free(tmp);
+    log_it("Partitioning drive %s", drivename);
 
 #if __FreeBSD__
@@ -1565 +1526 @@
             file = open(drivename, O_WRONLY);
             if (file != -1) {
-                mr_asprintf(tmp, "Warning - unable to open %s for wiping it's partition table", drivename);
-                log_to_screen(tmp);
-                mr_free(tmp);
+                log_to_screen("Warning - unable to open %s for wiping it's partition table", drivename);
             }
 
             for (i = 0; i < 512; i++) {
                 if (!write(file, "\0", 1)) {
-                    mr_asprintf(tmp, "Warning - unable to write to %s", drivename);
-                    log_to_screen(tmp);
-                    mr_free(tmp);
+                    log_to_screen("Warning - unable to write to %s", drivename);
                 }
             }
@@ -1633 +1590 @@
 
     if (pout_to_fdisk) {
-// mark relevant partition as bootable
+        // mark relevant partition as bootable
         mr_asprintf(tmp, "a\n%s\n", call_program_and_get_last_line_of_output ("make-me-bootable /tmp/mountlist.txt dummy"));
         fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
         mr_free(tmp);
 
-// close fdisk
+        // close fdisk
         fput_string_one_char_at_a_time(pout_to_fdisk, "w\n");
         system("sync");
@@ -1708 +1665 @@
 
     if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
-        mr_asprintf(tmp, "Not partitioning %s - it is a virtual drive", drive);
-        log_it(tmp);
-        mr_free(tmp);
-
+        log_it("Not partitioning %s - it is a virtual drive", drive);
         return (0);
     }
@@ -1725 +1679 @@
 
     if (is_this_device_mounted(partition_name)) {
-        mr_asprintf(tmp, "%s is mounted, and should not be partitioned", partition_name);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("%s is mounted, and should not be partitioned", partition_name);
         mr_free(partition_name);
         return (1);
@@ -1769 +1721 @@
     }
     mr_strcat(output, "\n");
-    mr_asprintf(tmp,"PARTSIZE = +%ld",(long)partsize);
-    log_it(tmp);
-    mr_free(tmp);
+    log_it("PARTSIZE = +%ld",(long)partsize);
 
     log_it("---fdisk command---");
@@ -1826 +1776 @@
                                  format, -1);
             if (res) {
-                mr_asprintf(tmp, "Failed to vacuum-pack %s", partition_name);
-                log_it(tmp);
-                mr_free(tmp);
+                log_it("Failed to vacuum-pack %s", partition_name);
 
                 retval++;
@@ -1840 +1788 @@
                                    partsize);
             if (retval) {
-                mr_asprintf(tmp, "Partitioned %s but failed to set its type", partition_name);
-                log_it(tmp);
-                mr_free(tmp);
+                log_it("Partitioned %s but failed to set its type", partition_name);
             } else {
                 if (partsize > 0) {
-                    mr_asprintf(tmp, "Partition %s created+configured OK", partition_name);
-                    log_to_screen(tmp);
-                    mr_free(tmp);
+                    log_to_screen("Partition %s created+configured OK", partition_name);
                 } else {
                     log_it("Returning from a successful vacuum-pack");
@@ -2425 +2369 @@
         return;
     }
-    mr_asprintf(tmp, "Expanding entries to suit drive %s (%ld MB)", drive_name, current_size_of_drive);
-    log_to_screen(tmp);
-    mr_free(tmp);
+    log_to_screen("Expanding entries to suit drive %s (%ld MB)", drive_name, current_size_of_drive);
 
     drivemntlist = malloc(sizeof(struct mountlist_reference));
@@ -2445 +2387 @@
 
     if (original_size_of_drive <= 0) {
-        mr_asprintf(tmp, "Cannot resize %s's entries. Drive not found.", drive_name);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("Cannot resize %s's entries. Drive not found.", drive_name);
         return;
     }
     factor = (float) (current_size_of_drive) / (float) (original_size_of_drive);
-    mr_asprintf(tmp, "Disk %s was %ld MB; is now %ld MB; factor = %f", drive_name, original_size_of_drive, current_size_of_drive, factor);
-    log_to_screen(tmp);
-    mr_free(tmp);
+    log_to_screen("Disk %s was %ld MB; is now %ld MB; factor = %f", drive_name, original_size_of_drive, current_size_of_drive, factor);
 
     lastpart = drivemntlist->entries - 1;
@@ -2478 +2416 @@
         }
 
-        mr_asprintf(tmp, "Changing %s from %lld KB to %ld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size, newsizL);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("Changing %s from %lld KB to %ld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size, newsizL);
         drivemntlist->el[partno]->size = newsizL;
     }
     final_size = get_phys_size_of_drive(drive_name);
-    mr_asprintf(tmp, "final_size = %ld MB", final_size);
-    log_to_screen(tmp);
-    mr_free(tmp);
+    log_to_screen("final_size = %ld MB", final_size);
 }
 

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

@@ -79 +79 @@
             insist_on_this_cd_number((++g_current_media_number));
         } else {
-            mr_asprintf(tmp_ptr, "No CD's left. No biggiefiles left. No prob, Bob.");
-            log_msg(2, tmp_ptr);
-            paranoid_free(tmp_ptr);
+            log_msg(2, "No CD's left. No biggiefiles left. No prob, Bob.");
             return (0);
         }
     }
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
-        mr_asprintf(tmp_ptr, "Cannot open bigfile %ld (%s)'s info file", bigfileno + 1, bigfile_fname_ptr);
-        log_to_screen(tmp_ptr);
-        paranoid_free(tmp_ptr);
+        log_to_screen("Cannot open bigfile %ld (%s)'s info file", bigfileno + 1, bigfile_fname_ptr);
         return (1);
     }

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

@@ -272 +272 @@
     if (!bkpinfo->isodir[0]) {
         mr_free(bkpinfo->isodir);
-        mr_asprintf(p, "/tmp/isodir");
-        bkpinfo->isodir = p;
+        mr_asprintf(bkpinfo->isodir, "/tmp/isodir");
     }
     /* End patch */
@@ -498 +497 @@
                 "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
-            mr_asprintf(tmp, "%s is already mounted", mountlist->el[lino].device);
-            log_to_screen(tmp);
-            mr_free(tmp);
+            log_to_screen("%s is already mounted", mountlist->el[lino].device);
         } else if (strcmp(mountlist->el[lino].mountpoint, "none")
            && strcmp(mountlist->el[lino].mountpoint, "lvm")
@@ -595 +592 @@
         if (!strcmp(bkpinfo->isodir, "/") && am_I_in_disaster_recovery_mode()) {
             mr_free(bkpinfo->isodir);
-            mr_asprintf(p, "/tmp/isodir");
-            bkpinfo->isodir = p;
+            mr_asprintf(bkpinfo->isodir, "/tmp/isodir");
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
@@ -772 +768 @@
     mr_free(bkpinfo->prefix);
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-        mr_asprintf(tmp1, "%s", value);
-    } else {
-        mr_asprintf(tmp1, "%s", STD_PREFIX);
-    }
-    bkpinfo->prefix = tmp1;
+        mr_asprintf(bkpinfo->prefix, "%s", value);
+    } else {
+        mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
+    }
 } else if (!strcmp(value, "nfs")) {
     bkpinfo->backup_media_type = nfs;
@@ -782 +777 @@
     mr_free(bkpinfo->prefix);
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-        mr_asprintf(tmp1, "%s", value);
-    } else {
-        mr_asprintf(tmp1, "%s", STD_PREFIX);
-    }
-    bkpinfo->prefix = tmp1;
+        mr_asprintf(bkpinfo->prefix, "%s", value);
+    } else {
+        mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
+    }
 
     if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) {
@@ -796 +790 @@
         }
         mr_free(bkpinfo->prefix);
-        mr_asprintf(tmp1, "%s", envtmp1);
-        bkpinfo->prefix = tmp1;
+        mr_asprintf(bkpinfo->prefix, "%s", envtmp1);
     }
 
@@ -970 +963 @@
     read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
     mr_free(bkpinfo->isodir);
-    mr_asprintf(tmp1, "%s%s", iso_mnt, iso_path);
-    bkpinfo->isodir = tmp1;
+    mr_asprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
     if (!bkpinfo->isodir[0]) {
         mr_free(bkpinfo->isodir);
@@ -2012 +2004 @@
         }
         mr_asprintf(tmp, "Unmounting device %s  ", mountlist->el[lino].device);
-
         update_progress_form(tmp);
 
@@ -2194 +2185 @@
             }
             mr_asprintf(tmp, "%s", bkpinfo->media_device);
-            if (extract_cfg_file_and_mountlist_from_tape_dev
-                (bkpinfo->media_device)) {
+            if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
                 strcpy(bkpinfo->media_device, "/dev/st0");
-                if (extract_cfg_file_and_mountlist_from_tape_dev
-                    (bkpinfo->media_device)) {
+                if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
                     strcpy(bkpinfo->media_device, "/dev/osst0");
-                    if (extract_cfg_file_and_mountlist_from_tape_dev
-                        (bkpinfo->media_device)) {
+                    if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
                         strcpy(bkpinfo->media_device, "/dev/ht0");
-                        if (extract_cfg_file_and_mountlist_from_tape_dev
-                            (bkpinfo->media_device)) {
-                            log_msg(3,
-                                    "I tried lots of devices but none worked.");
+                        if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
+                            log_msg(3, "I tried lots of devices but none worked.");
                             strcpy(bkpinfo->media_device, tmp);
                         }
@@ -2343 +2329 @@
 /* @} - end restoreUtilityGroup */
 
-
-/***************************************************************************
- * F@                                                                      *
- * () -- Hugo Rabson                                  *
- *                                                                         *
- * Purpose:                                                                *
- *                                                                         *
- * Called by:                                                              *
- * Params:    -                      -                                     *
- * Returns:   0=success; nonzero=failure                                   *
- ***************************************************************************/
-
-
-
 void wait_until_software_raids_are_prepped(char *mdstat_file,
                                            int wait_for_percentage)

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -918 +918 @@
         popup_and_OK(tmp);
         mr_free(tmp);
-        log_to_screen
-          ("Mondo has restored your system. Please wait for the command prompt.");
-        log_to_screen
-            ("Then remove the backup media and reboot.");
-        log_to_screen
-            ("Please visit our website at http://www.mondorescue.org for more information.");
+        log_to_screen("Mondo has restored your system. Please wait for the command prompt.");
+        log_to_screen("Then remove the backup media and reboot.");
+        log_to_screen("Please visit our website at http://www.mondorescue.org for more information.");
     }
     g_I_have_just_nuked = TRUE;
@@ -1159 +1156 @@
         use_ntfsprog_hack = TRUE;
         log_msg(2, "Calling ntfsclone in background because %s is an NTFS /dev entry", outfile_fname);
-        mr_asprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768),
-                (int) (random() % 32768));
+        mr_asprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768), (int) (random() % 32768));
         mkfifo(sz_devfile, 0x770);
         strcpy(ntfsprog_fifo, sz_devfile);
@@ -1232 +1228 @@
             mr_free(mds);
 
-            mr_asprintf(tmp, "Restoring from %s #%d", mds, g_current_media_number);
-            log_to_screen(tmp);
-            mr_free(tmp);
+            log_to_screen("Restoring from %s #%d", mds, g_current_media_number);
 
             insist_on_this_cd_number(g_current_media_number);
@@ -1279 +1273 @@
             mr_free(tmp);
             if (bzip2_command != NULL) {
-                mr_strcat(bzip2_command, " -dc %s 2>> %s",
-                        slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
+                mr_strcat(bzip2_command, " -dc %s 2>> %s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
             } else {
-                mr_asprintf(bzip2_command, "cat %s 2>> %s",
-                        slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
+                mr_asprintf(bzip2_command, "cat %s 2>> %s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
             }
             mds = media_descriptor_string(bkpinfo->backup_media_type);
@@ -1627 +1619 @@
     char *executable = NULL;
     char *temp_log = NULL;
-    char *screen_message = NULL;
     long matches = 0;
     bool use_star;
@@ -1654 +1645 @@
         log_msg(3, "length_of_file(%s) = %llu", tarball_fname, length_of_file(tarball_fname));
         log_msg(3, "count_lines_in_file(%s) = %llu", tarball_fname, count_lines_in_file(tarball_fname));
-        mr_asprintf(tmp, "Unable to restore fileset #%ld (CD I/O error)", current_tarball_number);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("Unable to restore fileset #%ld (CD I/O error)", current_tarball_number);
         mr_free(filelist_name);
         log_msg(5, "Leaving");
@@ -1672 +1661 @@
             log_msg(3, "Saved fileset %ld's subset to %s", current_tarball_number, filelist_subset_fname);
         }
-        mr_asprintf(screen_message, "Tarball #%ld --- %ld matches", current_tarball_number, matches);
-        log_to_screen(screen_message);
-        mr_free(screen_message);
+        log_to_screen("Tarball #%ld --- %ld matches", current_tarball_number, matches);
     }
     mr_free(filelist_name);
@@ -2066 +2053 @@
             } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
                 insist_on_this_cd_number(++g_current_media_number);
-                mr_asprintf(tmp1, "Restoring from %s #%d", mds, g_current_media_number);
-                log_to_screen(tmp1);
-                mr_free(tmp1);
+                log_to_screen("Restoring from %s #%d", mds, g_current_media_number);
                 just_changed_cds = TRUE;
             } else {
@@ -2228 +2213 @@
         } else {
             mr_asprintf(progress_str, "Restoring from fileset #%ld on %s #%d", current_tarball_number, mds, g_current_media_number);
-            for (res = 999, attempts = 0; attempts < 3 && res != 0;
-                 attempts++) {
-                res =
-                    restore_a_tarball_from_CD(tarball_fname,
-                                              current_tarball_number,
-                                              filelist);
+            for (res = 999, attempts = 0; attempts < 3 && res != 0; attempts++) {
+                res = restore_a_tarball_from_CD(tarball_fname, current_tarball_number, filelist);
             }
             mr_asprintf(tmp1, "%s #%d, fileset #%ld - restore ", mds, g_current_media_number, current_tarball_number);
@@ -2247 +2228 @@
             }
             strcpy(comment, tmp1);
-            paranoid_free(tmp1);
+            mr_free(tmp1);
             if (attempts > 1) {
                 log_to_screen(comment);
@@ -2519 +2500 @@
         retval += res;
         if (res) {
-            mr_asprintf(tmp, "Fileset %ld - errors occurred", current_afioball_number);
-            log_to_screen(tmp);
-            mr_free(tmp);
+            log_to_screen("Fileset %ld - errors occurred", current_afioball_number);
         }
         res =
@@ -2958 +2937 @@
                 log_msg(1, "Mounting nfs dir");
                 mr_free(bkpinfo->isodir);
-                mr_asprintf(tmp, "/tmp/isodir");
-                bkpinfo->isodir = tmp;
+                mr_asprintf(bkpinfo->isodir, "/tmp/isodir");
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
                 mr_asprintf(tmp, "mount %s -t nfs -o nolock,ro /tmp/isodir", bkpinfo->nfs_mount);
@@ -2968 +2946 @@
 
         if (retval) {
-            log_to_screen
-                ("Warning - load_raidtab_into_raidlist returned an error");
+            log_to_screen("Warning - load_raidtab_into_raidlist returned an error");
         }
 
@@ -3079 +3056 @@
     set_signals(FALSE);
     log_to_screen("Restore log (%s) copied to /var/log on your hard disk", MONDO_LOGFILE);
-    mr_asprintf(tmp, "Mondo-restore is exiting (retval=%d)                                      ", retval);
-    log_to_screen(tmp);
-    mr_free(tmp);
+    log_to_screen("Mondo-restore is exiting (retval=%d)                                      ", retval);
 
     mr_asprintf(tmp, "umount %s", bkpinfo->isodir);