Changeset 3611 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondo-rstr-mountlist.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-mountlist.c (modified) (8 diffs)

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) {