Changeset 2296 in MondoRescue for branches/2.2.10/mondo/src/common/newt-specific.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/common/newt-specific.c (modified) (5 diffs)

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

@@ -1026 +1026 @@
             || percentage > g_isoform_old_progress) {
             g_isoform_old_progress = percentage;
-            mr_asprintf(&timeline_str, "%2ld:%02ld taken            %2ld:%02ld remaining", (long) time_taken / 60, (long) time_taken % 60, 
-                            (long) time_remaining / 60, (long) time_remaining % 60);
+            mr_asprintf(&timeline_str, "%2ld:%02ld taken            %2ld:%02ld remaining", (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
             if (percentage < 3) {
                 mr_asprintf(&pcline_str, " Working");
@@ -1038 +1037 @@
                 mr_strcat(pcline_str, " %c", special_dot_char(g_mysterious_dot_counter));
             } else {
-                mr_asprintf(&pcline_str, " %3d%% done              %3d%% to go",
-                        percentage, 100 - percentage);
+                mr_asprintf(&pcline_str, " %3d%% done              %3d%% to go", percentage, 100 - percentage);
             }
             if (g_text_mode) {
@@ -1143 +1141 @@
         } else {
             if (g_current_progress > g_maximum_progress) {
-                mr_asprintf(&tmp,
-                        "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld",
-                        blurb1, blurb2, blurb3, g_current_progress,
-                        g_maximum_progress);
-                log_msg(0, tmp);
-                mr_free(tmp);
+                log_msg(0, "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld", blurb1, blurb2, blurb3, g_current_progress, g_maximum_progress);
                 g_current_progress = g_maximum_progress;
             }
@@ -1185 +1178 @@
             paranoid_free(taskprogress);
         } else {
-            mr_asprintf(&timeline_str, "%2ld:%02ld taken               %2ld:%02ld remaining  ",
-                (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
+            mr_asprintf(&timeline_str, "%2ld:%02ld taken               %2ld:%02ld remaining  ", (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
             mr_asprintf(percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
 
@@ -1608 +1600 @@
                                    keylist[i]);
         }
-        mr_asprintf(&differ_sz,
-                "  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
-                i);
+        mr_asprintf(&differ_sz, "  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.", i);
         newtPushHelpLine(differ_sz);
         mr_free(differ_sz);