Changeset 2296 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondorestore.c

Timestamp:

Jul 23, 2009, 2:53:30 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Replace sprintf by mr_asprintf in mondo-rstr-compare.c
• All mr_asprintf call should be on one line (for quality script) and use a string as second param
• Improve quality script

File:

• branches/2.2.10/mondo/src/mondorestore/mondorestore.c (modified) (10 diffs)

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

@@ -668 +668 @@
             strcpy(fstab_fname, "/tmp/fstab");
         }
-        mr_asprintf(&tmp1,
-                "label-partitions-as-necessary %s < %s >> %s 2>> %s",
-                g_mountlist_fname, fstab_fname, MONDO_LOGFILE,
-                MONDO_LOGFILE);
+        mr_asprintf(&tmp1, "label-partitions-as-necessary %s < %s >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
         res = system(tmp1);
         mr_free(tmp1);
@@ -811 +808 @@
     }
     if (!evaluate_mountlist(mountlist, tmpA, tmpB, tmpC)) {
-        mr_asprintf(&tmp,
-                "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?",
-                tmpA, tmpB, tmpC);
+        mr_asprintf(&tmp, "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?", tmpA, tmpB, tmpC);
         res = ask_me_yes_or_no(tmp);
         mr_free(tmp);
@@ -1293 +1288 @@
             }
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            mr_asprintf(&tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds,
-                    g_current_media_number, bigfileno + 1, sliceno);
+            mr_asprintf(&tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds, g_current_media_number, bigfileno + 1, sliceno);
             mr_free(mds);
             log_msg(2, tmp);
@@ -1329 +1323 @@
     if (use_ntfsprog_hack) {
         log_msg(3, "Waiting for ntfsclone to finish");
-        mr_asprintf(&tmp,
-                " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        mr_asprintf(&tmp, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
         while (system(tmp) == 0) {
             sleep(1);
@@ -1464 +1457 @@
         use_ntfsprog_hack = TRUE;
         log_msg(2, "Calling ntfsclone in background because %s is a /dev entry", outfile_fname);
-        mr_asprintf(&sz_devfile, "%s/%d.%d.000", 
-                bkpinfo->tmpdir,
-                (int) (random() % 32768),
-                (int) (random() % 32768));
+        mr_asprintf(&sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir, (int) (random() % 32768), (int) (random() % 32768));
         mkfifo(sz_devfile, 0x770);
         strcpy(ntfsprog_fifo, sz_devfile);
@@ -1684 +1674 @@
             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);
+        mr_asprintf(&screen_message, "Tarball #%ld --- %ld matches", current_tarball_number, matches);
         log_to_screen(screen_message);
         mr_free(screen_message);
@@ -2237 +2226 @@
             }
             g_current_media_number++;
-            mr_asprintf(&progress_str, "Restoring from %s #%d",
-                    media_descriptor_string(bkpinfo->backup_media_type),
-                    g_current_media_number);
+            mr_asprintf(&progress_str, "Restoring from %s #%d", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);
             log_to_screen(progress_str);
         } else {
-            mr_asprintf(&progress_str, "Restoring from fileset #%ld on %s #%d",
-                    current_tarball_number, mds, g_current_media_number);
+            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++) {
@@ -2251 +2237 @@
                                               filelist);
             }
-            mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ",
-                    mds, g_current_media_number, current_tarball_number);
+            mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ", mds, g_current_media_number, current_tarball_number);
             if (res) {
                 mr_strcat(tmp1, "reported errors");
@@ -2381 +2366 @@
             p++;
         }
-        mr_asprintf(&tmp1, "Restoring big file %ld (%lld K)",
-                current_bigfile_number + 1, biggie_size / 1024);
+        mr_asprintf(&tmp1, "Restoring big file %ld (%lld K)", current_bigfile_number + 1, biggie_size / 1024);
         update_progress_form(tmp1);
         mr_free(tmp1);
@@ -2519 +2503 @@
         update_progress_form(progress_str);
         if (g_getfattr) {
-            mr_asprintf(&xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir,
-                current_afioball_number);
+            mr_asprintf(&xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
             unlink(xattr_fname);
         }