Changeset 2323 in MondoRescue for branches/2.2.10/mondo/src/common/newt-specific.c

Timestamp:

Aug 18, 2009, 3:05:43 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3334@localhost: bruno | 2009-08-08 12:17:37 +0200

• Change mr_asprintf interface to pass only the char * (makes bkpinfo usage more easy)

File:

• branches/2.2.10/mondo/src/common/newt-specific.c (modified) (17 diffs)

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

@@ -276 +276 @@
 char *tmp1 = NULL;
 
-    mr_asprintf(&tmp,"ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"", ps_options, str , ps_proc_id);
+    mr_asprintf(tmp,"ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"", ps_options, str , ps_proc_id);
     run_program_and_log_output(tmp, TRUE);
     if (strlen(tmp) > 0) {
-        mr_asprintf(&tmp1,"kill `%s`", tmp);
+        mr_asprintf(tmp1,"kill `%s`", tmp);
         run_program_and_log_output(tmp1, TRUE);
         mr_free(tmp1);
@@ -334 +334 @@
         chdir("/");
         if (g_selfmounted_isodir) {
-            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
             mr_free(command);
-            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+            mr_asprintf(command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
             mr_free(command);
@@ -386 +386 @@
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
         if (g_selfmounted_isodir) {
-            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             mr_free(command);
 
-            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+            mr_asprintf(command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             mr_free(command);
@@ -409 +409 @@
             if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) {
                 log_msg(8,"erasing tempdir");
-                mr_asprintf(&command, "rm -Rf %s", bkpinfo->tmpdir);
+                mr_asprintf(command, "rm -Rf %s", bkpinfo->tmpdir);
                 system(command);
                 mr_free(command);
@@ -418 +418 @@
             if (strstr(bkpinfo->scratchdir ,"mondo.scratch.") != NULL) {
                 log_msg(8,"erasing scratchdir");
-                mr_asprintf(&command, "rm -Rf %s", bkpinfo->scratchdir);
+                mr_asprintf(command, "rm -Rf %s", bkpinfo->scratchdir);
                 system(command);
                 mr_free(command);
@@ -754 +754 @@
                 /* take default if ENTER was typed */
                 mr_free(output);
-                mr_asprintf(&output, "%s", input);
+                mr_asprintf(output, "%s", input);
             }
             if (output[strlen(output) - 1] == '\n')
@@ -761 +761 @@
         }
 
-        mr_asprintf(&blurb, "%s", b);
+        mr_asprintf(blurb, "%s", b);
         text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
         type_here =
@@ -782 +782 @@
 
         if (b_res == b_1) {
-            mr_asprintf(&output, "%s", newtEntryGetValue(type_here));
+            mr_asprintf(output, "%s", newtEntryGetValue(type_here));
         }
         newtPopHelpLine();
@@ -982 +982 @@
             || 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");
+                mr_asprintf(pcline_str, " Working");
                 for (j = 0; j < g_mysterious_dot_counter; j++) {
                     mr_strcat(pcline_str, ".");
@@ -993 +993 @@
                 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) {
-                mr_asprintf(&taskprogress, "TASK:  [");
+                mr_asprintf(taskprogress, "TASK:  [");
                 for (i = 0; i < percentage; i += 5) {
                     mr_strcat(taskprogress, "*");
@@ -1117 +1117 @@
             printf("---progress-form---3--- %s\n", blurb3);
             printf("---progress-form---E---\n");
-            mr_asprintf(&taskprogress, "TASK:  [");
+            mr_asprintf(taskprogress, "TASK:  [");
             for (i = 0; i < percentage; i += 5) {
                 mr_strcat(taskprogress, "*");
@@ -1131 +1131 @@
             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(&percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - 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(percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
 
             center_string(blurb1, 54);
@@ -1359 +1359 @@
         }
 
-        mr_asprintf(&tmp1,"%s/icantfindthesefiles.txt",bkpinfo->tmpdir);
+        mr_asprintf(tmp1,"%s/icantfindthesefiles.txt",bkpinfo->tmpdir);
         if (!(fout = fopen(tmp1, "a"))) {
             log_msg(2, "Can't write to %s", tmp1);
@@ -1453 +1453 @@
         assert(flentry != NULL);
         if (flentry->severity == 0) {
-            mr_asprintf(&tmp, "0   ");
+            mr_asprintf(tmp, "0   ");
         } else if (flentry->severity == 1) {
-            mr_asprintf(&tmp, "low ");
+            mr_asprintf(tmp, "low ");
         } else if (flentry->severity == 2) {
-            mr_asprintf(&tmp, "med ");
-        } else {
-            mr_asprintf(&tmp, "high");
+            mr_asprintf(tmp, "med ");
+        } else {
+            mr_asprintf(tmp, "high");
         }
         mr_strcat(tmp, "  ");
@@ -1540 +1540 @@
                                    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);
@@ -1546 +1546 @@
         bClose = newtCompactButton(10, 15, " Close  ");
         bSelect = newtCompactButton(30, 15, " Select ");
-        mr_asprintf(&tmp, "%-10s               %-20s", "Priority", "Filename");
+        mr_asprintf(tmp, "%-10s               %-20s", "Priority", "Filename");
         headerMsg = newtLabel(2, 1, tmp);
         mr_free(tmp);
@@ -1571 +1571 @@
                     if (filelist->entries > 0) {
                         severity_of_difference(filelist->el[currline].  filename, reason);
-                        mr_asprintf(&tmp, "%s --- %s", filelist->el[currline].filename, reason);
+                        mr_asprintf(tmp, "%s --- %s", filelist->el[currline].filename, reason);
 
                         popup_and_OK(tmp);