Changeset 2314 in MondoRescue

Timestamp:

Aug 18, 2009, 2:29:14 PM (16 years ago)

Author:

Bruno Cornec

Message:

r3325@localhost: bruno | 2009-08-01 22:25:29 +0200
number_of_disks_as_string now alloctes memory

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-string.c (modified) (2 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (5 diffs)

branches/2.2.10/mondo/src/common/libmondo-string.c

@@ -421 +421 @@
 
     /*@ buffers ********************************************************* */
-    static char output[MAX_STR_LEN];
+    char *output = NULL;
 
     /*@ char     ******************************************************** */
@@ -433 +433 @@
         p = ' ';
     }
-    sprintf(output, "%d %s disk%c", noof_disks, label, p);
+    mr_asprintf(&output, "%d %s disk%c", noof_disks, label, p);
     while (strlen(output) < 14) {
-        strcat(output, " ");
+        mr_strcat(output, " ");
     }
     return (output);

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

@@ -1561 +1561 @@
     char *title_of_editraidForm_window;
     char *sz_raid_level;
-    char *sz_data_disks;
-    char *sz_spare_disks;
-    char *sz_parity_disks;
-    char *sz_failed_disks;
+    char *sz_data_disks = NULL;
+    char *sz_spare_disks = NULL;
+    char *sz_parity_disks = NULL;
+    char *sz_failed_disks = NULL;
 
     /** newt **************************************************************/
@@ -1584 +1584 @@
     malloc_string(title_of_editraidForm_window);
     malloc_string(sz_raid_level);
-    malloc_string(sz_data_disks);
-    malloc_string(sz_spare_disks);
-    malloc_string(sz_parity_disks);
-    malloc_string(sz_failed_disks);
 
     bkp_raidrec = mr_malloc(sizeof(struct raid_device_record));
@@ -1602 +1598 @@
         strcpy(sz_raid_level,
                turn_raid_level_number_to_string(raidrec->raid_level));
-        strcpy(sz_data_disks,
-               number_of_disks_as_string(raidrec->data_disks.entries,
-                                         "data"));
-        strcpy(sz_spare_disks,
-               number_of_disks_as_string(raidrec->spare_disks.entries,
-                                         "spare"));
-        strcpy(sz_parity_disks,
-               number_of_disks_as_string(raidrec->parity_disks.entries,
-                                         "parity"));
-        strcpy(sz_failed_disks,
-               number_of_disks_as_string(raidrec->failed_disks.entries,
-                                         "failed"));
+        /* Those 4 strings are allocated by the function  */
+        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");
+        sz_parity_disks = number_of_disks_as_string(raidrec->parity_disks.entries, "parity");
+        sz_failed_disks = number_of_disks_as_string(raidrec->failed_disks.entries, "failed");
         bSelectData = newtButton(1, 1, sz_data_disks);
         bSelectSpare = newtButton(20, 1, sz_spare_disks);
@@ -1648 +1637 @@
             break;
         }
+        mr_free(sz_data_disks);
+        mr_free(sz_spare_disks);
+        mr_free(sz_parity_disks);
+        mr_free(sz_failed_disks);
     }
     if (b_res == bCancel) {
@@ -1657 +1650 @@
     paranoid_free(title_of_editraidForm_window);
     paranoid_free(sz_raid_level);
-    paranoid_free(sz_data_disks);
-    paranoid_free(sz_spare_disks);
-    paranoid_free(sz_parity_disks);
-    paranoid_free(sz_failed_disks);
     paranoid_free(bkp_raidrec);
 #endif