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

Timestamp:

Nov 10, 2016, 9:09:54 PM (7 years ago)

Author:

Bruno Cornec

Message:

Remove more static allocation

File:

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

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

@@ -1296 +1296 @@
     }
     mr_free(size_str);
-    newtListboxSetEntry(listbox, (long) keylist[currline],
-                        mountlist_entry_to_string(mountlist, currline));
+
+    tmp = mountlist_entry_to_string(mountlist, currline);
+    newtListboxSetEntry(listbox, (long) keylist[currline], tmp);
+    mr_free(tmp);
+
     /* if new /dev/md RAID device then do funky stuff */
     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
@@ -1580 +1583 @@
         mr_free(title_of_editraidForm_window);
         mr_asprintf(title_of_editraidForm_window, "Edit %s", raidrec->raid_device);
-        mr_asprintf(sz_raid_level, "%s", turn_raid_level_number_to_string(raidrec->raid_level));
+        sz_raid_level = turn_raid_level_number_to_string(raidrec->raid_level);
         sz_data_disks = number_of_disks_as_string(raidrec->data_disks.entries, "data");
         sz_spare_disks = number_of_disks_as_string(raidrec->spare_disks.entries, "spare");
@@ -2335 +2338 @@
     /** long **************************************************************/
     long i = 0;
+    char *tmp = NULL;
 
     assert(disklist != NULL);
@@ -2346 +2350 @@
     }
     for (i = 0; i < disklist->entries; i++) {
-        newtListboxAppendEntry(listbox,
-                               disklist_entry_to_string(disklist, i),
-                               keylist[i]);
+        tmp = disklist_entry_to_string(disklist, i);
+        newtListboxAppendEntry(listbox, tmp, keylist[i]);
+        mr_free(tmp);
     }
 }
@@ -2367 +2371 @@
     /** long **************************************************************/
     long i = 0;
+    char * tmp = NULL;
 
     assert(mountlist != NULL);
@@ -2378 +2383 @@
     }
     for (i = 0; i < mountlist->entries; i++) {
-        newtListboxAppendEntry(listbox,
-                               mountlist_entry_to_string(mountlist, i),
-                               keylist[i]);
+        tmp = mountlist_entry_to_string(mountlist, i);
+        newtListboxAppendEntry(listbox, tmp, keylist[i]);
+        mr_free(tmp);
     }
 }