Changeset 3614 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Nov 18, 2016, 5:31:43 PM (7 years ago)

Author:

Bruno Cornec

Message:

mr_strip_spaces now returns a dynamically allocated string

File:

• branches/3.2/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (3 diffs)

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

@@ -198 +198 @@
         b_res = newtRunForm(myForm);
         mr_free(device_str);
-        mr_asprintf(device_str, "%s", device_here);
+        device_str = mr_strip_spaces(device_here);
 
         mr_free(mountpoint_str);
-        mr_asprintf(mountpoint_str, "%s", mountpoint_here);
-        mr_strip_spaces(mountpoint_str);
+        mountpoint_str = mr_strip_spaces(mountpoint_here);
 
         mr_free(format_str);
-        mr_asprintf(format_str, "%s", format_here);
-        mr_strip_spaces(format_str);
+        format_str = mr_strip_spaces(format_here);
 
         mr_free(size_str);
-        mr_asprintf(size_str, "%s", size_here);
-        mr_strip_spaces(size_str);
-
-        mr_strip_spaces(device_str);
+        size_str = mr_strip_spaces(size_here);
+
         if (b_res == bOK) {
             if (device_str[strlen(device_str) - 1] == '/') {
@@ -1208 +1204 @@
         b_res = newtRunForm(myForm);
         mr_free(device_str);
-        mr_asprintf(device_str, "%s", device_here);
-        mr_strip_spaces(device_str);
+        device_str = mr_strip_spaces(device_here);
 
         mr_free(mountpoint_str);
-        mr_asprintf(mountpoint_str, "%s", mountpoint_here);
-        mr_strip_spaces(mountpoint_str);
+        mountpoint_str = mr_strip_spaces(mountpoint_here);
 
         mr_free(format_str);
-        mr_asprintf(format_str, "%s", format_here);
-        mr_strip_spaces(format_str);
+        format_str = mr_strip_spaces(format_here);
 
         if (b_res == bOK && strstr(device_str, RAID_DEVICE_STUB)
@@ -1234 +1227 @@
             && strcmp(mountlist->el[currline].mountpoint, "image")) {
             mr_free(size_str);
-            mr_asprintf(size_str, "%s", size_here);
-            mr_strip_spaces(size_str);
+            size_str = mr_strip_spaces(size_here);
         } else {
             mr_asprintf(size_str, "%ld", calculate_raid_device_size(mountlist, raidlist, mountlist->el[currline].device) / 1024);