Changeset 2324 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondorestore.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/mondorestore/mondorestore.c (modified) (14 diffs)

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);