Changeset 3289 in MondoRescue for branches/3.2/mondo/src/common/libmondo-string.c

Timestamp:

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

Author:

Bruno Cornec

Message:

• change function number_of_disks_as_string into one returning a dynamically allocates tring

File:

• branches/3.2/mondo/src/common/libmondo-string.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);
 }