Changeset 2324 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

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

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (42 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);
 
             }