Changeset 3611 in MondoRescue for branches/3.2/mondo/src/mondorestore

Timestamp:

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

Author:

Bruno Cornec

Message:

Remove more static allocation

Location:

branches/3.2/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (2 diffs)
• mondo-rstr-mountlist.c (modified) (8 diffs)
• mondo-rstr-newt.c (modified) (6 diffs)

branches/3.2/mondo/src/mondorestore/mondo-prep.c

@@ -1839 +1839 @@
     mr_asprintf(partcode, "");
 } else if (strlen(format) >= 1 && strlen(format) <= 2) {
-    mr_asprintf(partcode, format);
+    mr_asprintf(partcode, "%s", format);
 } else {
     /* probably an image */
@@ -1847 +1847 @@
 
 #ifdef __FreeBSD__
-    mr_asprintf(partcode, format);  // was a5
+    mr_asprintf(partcode, "%s", format);    // was a5
 #else
-    mr_asprintf(partcode, format);  // was 83
+    mr_asprintf(partcode, "%s", format);    // was 83
 #endif
 }

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

@@ -55 +55 @@
     /*@ buffers ******************************************************** */
     char tmp = NULL;
+    char tmp1 = NULL;
     char device[MAX_STR_LEN];
 
@@ -112 +113 @@
             }
             if (device_copies > 1) {
-                mr_asprintf(tmp, " %s %s's.", number_to_text(device_copies), device);
+                tmp1 = number_to_text(device_copies);
+                mr_asprintf(tmp, " %s %s's.", tmp1, device);
+                mr_free(tmp1);
                 if (!strstr(flaws_str, tmp)) {
                     log_it(tmp);
@@ -209 +212 @@
             }
             if (device_copies > 1) {
-                mr_asprintf(tmp, " %s %s's.", number_to_text(device_copies), device);
+                tmp1 = number_to_text(device_copies);
+                mr_asprintf(tmp, " %s %s's.", tmp1, device);
+                mr_free(tmp1);
                 if (!strstr(flaws_str, "%s", tmp)) {
                     log_it(tmp);
@@ -271 +276 @@
                 }
                 if (device_copies > 1) {
-                    mr_asprintf(tmp, " %s %s's.", number_to_text(device_copies), device);
+                    tmp1 = number_to_text(device_copies);
+                    mr_asprintf(tmp, " %s %s's.", tmp1, device);
+                    mr_free(tmp1);
                     if (!strstr(flaws_str, tmp)) {
                         log_it(tmp);
@@ -374 +381 @@
     /*@ buffers ******************************************************** */
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *device = NULL;
     char *flaws_str = NULL;
@@ -452 +460 @@
         }
         if (device_copies > 1) {
-            mr_asprintf(tmp, " %s %s's.", number_to_text(device_copies), device);
+            tmp1 = number_to_text(device_copies);
+            mr_asprintf(tmp, " %s %s's.", tmp1, device);
+            mr_free(tmp1);
             if (!strstr(flaws_str, tmp)) {
                 log_it(tmp);
@@ -536 +546 @@
     struct list_of_disks *drivelist;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *flaws_str = NULL;
 
@@ -589 +600 @@
         }
         if (copies > 1 && last_copy == currline && strcmp(curr_mountpoint, "raid")) {
-            mr_asprintf(tmp, " %s %s's.", number_to_text(copies), curr_mountpoint);
+            tmp1 = number_to_text(copies);
+            mr_asprintf(tmp, " %s %s's.", tmp1, curr_mountpoint);
+            mr_free(tmp1);
             log_msg(8,"Adding: %s to flaws_str", tmp);
             if (flaws_str != NULL) {

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);
     }
 }