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

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -472 +472 @@
     char *prompt = NULL;
 
-    mr_asprintf(&prompt, "Please enter the RAID level you want. (concat, striped, raid5)");
+    mr_asprintf(prompt, "Please enter the RAID level you want. (concat, striped, raid5)");
     if (raidrec->raidlevel == -1) {
-        mr_asprintf(&tmp, "concat");
+        mr_asprintf(tmp, "concat");
     } else if (raidrec->raidlevel == 0) {
-        mr_asprintf(&tmp, "striped");
+        mr_asprintf(tmp, "striped");
     } else {
-        mr_asprintf(&tmp, "raid%i", raidrec->raidlevel);
+        mr_asprintf(tmp, "raid%i", raidrec->raidlevel);
     }
     for (out = 999; out == 999;) {
@@ -538 +538 @@
 
     system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
-    mr_asprintf(&personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
-    mr_asprintf(&prompt, "Please enter the RAID level you want. %s", personalities);
+    mr_asprintf(personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
+    mr_asprintf(prompt, "Please enter the RAID level you want. %s", personalities);
     mr_free(personalities);
 
     if (raidrec->raid_level == -1) {
-        mr_asprintf(&tmp, "linear");
+        mr_asprintf(tmp, "linear");
     } else {
-        mr_asprintf(&tmp, "%d", raidrec->raid_level);
+        mr_asprintf(tmp, "%d", raidrec->raid_level);
     }
     for (out = 999;
@@ -1850 +1850 @@
             char *tmp = NULL;
 
-            mr_asprintf(&tmp, "%i", raidrec->stripesize);
+            mr_asprintf(tmp, "%i", raidrec->stripesize);
             p = popup_and_get_string("Stripe size", "Please enter the stripe size in kilobytes.", tmp);
             mr_free(tmp);
@@ -1899 +1899 @@
     assert(lino >= 0);
 
-    mr_asprintf(&sz_out, "%s", raidrec->additional_vars.el[lino].value);
-    mr_asprintf(&header, "Edit %s", raidrec->additional_vars.el[lino].label);
-    mr_asprintf(&comment, "Please set %s's value (currently '%s')", raidrec->additional_vars.el[lino].label, sz_out);
+    mr_asprintf(sz_out, "%s", raidrec->additional_vars.el[lino].value);
+    mr_asprintf(header, "Edit %s", raidrec->additional_vars.el[lino].label);
+    mr_asprintf(comment, "Please set %s's value (currently '%s')", raidrec->additional_vars.el[lino].label, sz_out);
     p = popup_and_get_string(header, comment, sz_out);
     if (p != NULL) {
@@ -1957 +1957 @@
     assert(raidlist != NULL);
 
-    mr_asprintf(&flaws_str_A, "%s", "         ");
-    mr_asprintf(&flaws_str_B, "%s", "         ");
-    mr_asprintf(&flaws_str_C, "%s", "         ");
+    mr_asprintf(flaws_str_A, "%s", "         ");
+    mr_asprintf(flaws_str_B, "%s", "         ");
+    mr_asprintf(flaws_str_C, "%s", "         ");
     if (mountlist->entries > ARBITRARY_MAXIMUM) {
         log_to_screen("Arbitrary limits suck, man!");
@@ -2283 +2283 @@
     log_it("isodir_path = %s", isodir_path);
     if (isodir_device[0] == '\0') {
-        mr_asprintf(&idev, "/dev/");
+        mr_asprintf(idev, "/dev/");
     } else {
-        mr_asprintf(&idev, "%s", isodir_device);
-    }
-
-    if (isodir_path[0] == '\0') {
-        strcpy(isodir_path, "/");
-    }
+        mr_asprintf(idev, "%s", isodir_device);
+    }
+
     if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
         mr_free(idev);
-        mr_asprintf(&idev, "%s", last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
-        mr_asprintf(&isodir_format, "nfs");
-        strcpy(isodir_path, last_line_of_file("/tmp/NFS-SERVER-PATH"));
+        mr_asprintf(idev, "%s", last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
+        mr_asprintf(isodir_format, "nfs");
+        mr_free(isodir_path);
+        mr_asprintf(isodir_path, "%s", last_line_of_file("/tmp/NFS-SERVER-PATH"));
     }
 
@@ -2319 +2317 @@
                     /* modify for the caller */
                     strcpy(isodir_device, p);
-                    strcpy(isodir_path, r);
+                    mr_free(isodir_path);
+                    isodir_path = r;
                     log_it("isodir_device = %s - isodir_format = %s - isodir_path = %s", isodir_device, isodir_format, isodir_path);
-                    mr_free(r);
     
                     ret = TRUE;
@@ -2770 +2768 @@
 
     log_it("Post-malloc");
-    mr_asprintf(&help_text, "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
-    mr_asprintf(&header_text, "%-24s    %s", "Device", "Index");
-    mr_asprintf(&title_of_window, "%s contains...", raidrec->raid_device);
+    mr_asprintf(help_text, "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
+    mr_asprintf(header_text, "%-24s    %s", "Device", "Index");
+    mr_asprintf(title_of_window, "%s contains...", raidrec->raid_device);
     newtPushHelpLine(help_text);
     for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;) {
@@ -2827 +2825 @@
                     redraw_disklist(disklist, keylist, partitionsListbox);
                 } else {
-                    mr_asprintf(&tmp, "%s's index is %d. What should it be?", raidrec->raid_device, disklist->el[currline].index);
-                    mr_asprintf(&sz_res, "%d", disklist->el[currline].index);
+                    mr_asprintf(tmp, "%s's index is %d. What should it be?", raidrec->raid_device, disklist->el[currline].index);
+                    mr_asprintf(sz_res, "%d", disklist->el[currline].index);
                     p = popup_and_get_string("Set index", tmp, sz_res);
                     mr_free(tmp);