Changeset 3289 in MondoRescue

Timestamp:

May 6, 2014, 10:24:14 AM (11 years ago)

Author:

Bruno Cornec

Message:

• change function number_of_disks_as_string into one returning a dynamically allocates tring

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-string.c (modified) (1 diff)
• mondorestore/mondo-rstr-newt.c (modified) (1 diff)

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

@@ -381 +381 @@
  * there will be a weird double space in the middle, so pass *something*.
  * @return The string containing "X blah blah disk(s)".
- * @note The returned string points to static storage and will be overwritten with each call.
+ * @note The returned string is dynamically allocated and should be freed by caller
  */
 char *number_of_disks_as_string(int noof_disks, char *label)
 {
 
-    /*@ buffers ********************************************************* */
-    static char output[MAX_STR_LEN];
-
-    /*@ char     ******************************************************** */
-    char p;
-
-    assert(label != NULL);
-
-    if (noof_disks > 1) {
-        p = 's';
-    } else {
-        p = ' ';
-    }
-    sprintf(output, "%d %s disk%c", noof_disks, label, p);
-    while (strlen(output) < 14) {
-        strcat(output, " ");
-    }
-    return (output);
+/*@ buffers ********************************************************* */
+char *output = NULL;
+
+/*@ char     ******************************************************** */
+char p;
+
+assert(label != NULL);
+
+if (noof_disks > 1) {
+    p = 's';
+} else {
+    p = ' ';
+}
+mr_asprintf(output, "%d %s disk%c", noof_disks, label, p);
+/* Useful ??
+while (strlen(output) < 14) {
+    strcat(output, " ");
+}
+*/
+return (output);
 }
 

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

@@ -1581 +1581 @@
         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));
-        mr_asprintf(sz_data_disks, "%s", number_of_disks_as_string(raidrec->data_disks.entries, "data"));
-        mr_asprintf(sz_spare_disks, "%s", number_of_disks_as_string(raidrec->spare_disks.entries, "spare"));
-        mr_asprintf(sz_parity_disks, "%s", number_of_disks_as_string(raidrec->parity_disks.entries, "parity"));
-        mr_asprintf(sz_failed_disks, "%s", number_of_disks_as_string(raidrec->failed_disks.entries, "failed"));
+        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);