Changeset 3611 in MondoRescue for branches/3.2/mondo/src/common/libmondo-string.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/common/libmondo-string.c (modified) (12 diffs)

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

@@ -147 +147 @@
 
 /**
- * Add commas every third place in @p input.
- * @param input The string to commarize.
- * @return The string with commas.
- * @note The returned string points to static storage that will be overwritten with each call.
- */
-char *commarize(char *input)
-{
-    char pos_w_commas[MAX_STR_LEN];
-    static char output[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
-    int j;
-
-    assert(input != NULL);
-
-    strcpy(tmp, input);
-    if (strlen(tmp) > 6) {
-        strcpy(pos_w_commas, tmp);
-        j = (int) strlen(pos_w_commas);
-        tmp[j - 6] = ',';
-        strcpy(tmp + j - 5, pos_w_commas + j - 6);
-        strcpy(pos_w_commas, tmp);
-    }
-    if (strlen(tmp) > 3) {
-        j = (int) strlen(tmp);
-        strcpy(pos_w_commas, tmp);
-        pos_w_commas[j - 3] = ',';
-        strcpy(pos_w_commas + j - 2, tmp + j - 3);
-    } else {
-        strcpy(pos_w_commas, tmp);
-    }
-    strcpy(output, pos_w_commas);
-    return (output);
-}
-
-
-/**
  * Turn an entry from the RAID editor's disklist into a GUI-friendly string.
  * The format is: the device left-aligned and padded to 24 places, followed by a space and the
@@ -190 +154 @@
  * @param lino The line number from @p disklist to convert to a string.
  * @return The string form of the disklist entry.
- * @note The returned string points to static storage and will be overwritten with each call.
+ * @note The returned string points to storage that needs to be freed by
+ * caller
  */
 char *disklist_entry_to_string(struct list_of_disks *disklist, int lino)
@@ -196 +161 @@
 
     /*@ buffers ********************************************************** */
-    static char output[MAX_STR_LEN];
+    char *output = NULL;
 
     assert(disklist != NULL);
 
-    sprintf(output, "%-24s %8d", disklist->el[lino].device,
-            disklist->el[lino].index);
-    return (output);
+    mr_asprintf(output, "%-24s %8d", disklist->el[lino].device, disklist->el[lino].index);
+    return(output);
 }
 
@@ -301 +265 @@
  * @param marker The marker byte to stringify.
  * @return @p marker as a string.
- * @note The returned string points to static storage that will be overwritten with each call.
+ * @note The returned string points to storage that needs to be freed by
+ * caller
  */
 char *marker_to_string(int marker)
 {
     /*@ buffer ****************************************************** */
-    static char outstr[MAX_STR_LEN];
+    char *outstr = NULL;
 
 
@@ -313 +278 @@
     switch (marker) {
     case BLK_START_OF_BACKUP:
-        strcpy(outstr, "BLK_START_OF_BACKUP");
+        mr_asprintf(outstr, "BLK_START_OF_BACKUP");
         break;
     case BLK_START_OF_TAPE:
-        strcpy(outstr, "BLK_START_OF_TAPE");
+        mr_asprintf(outstr, "BLK_START_OF_TAPE");
         break;
     case BLK_START_AN_AFIO_OR_SLICE:
-        strcpy(outstr, "BLK_START_AN_AFIO_OR_SLICE");
+        mr_asprintf(outstr, "BLK_START_AN_AFIO_OR_SLICE");
         break;
     case BLK_STOP_AN_AFIO_OR_SLICE:
-        strcpy(outstr, "BLK_STOP_AN_AFIO_OR_SLICE");
+        mr_asprintf(outstr, "BLK_STOP_AN_AFIO_OR_SLICE");
         break;
     case BLK_START_AFIOBALLS:
-        strcpy(outstr, "BLK_START_AFIOBALLS");
+        mr_asprintf(outstr, "BLK_START_AFIOBALLS");
         break;
     case BLK_STOP_AFIOBALLS:
-        strcpy(outstr, "BLK_STOP_AFIOBALLS");
+        mr_asprintf(outstr, "BLK_STOP_AFIOBALLS");
         break;
     case BLK_STOP_BIGGIEFILES:
-        strcpy(outstr, "BLK_STOP_BIGGIEFILES");
+        mr_asprintf(outstr, "BLK_STOP_BIGGIEFILES");
         break;
     case BLK_START_A_NORMBIGGIE:
-        strcpy(outstr, "BLK_START_A_NORMBIGGIE");
+        mr_asprintf(outstr, "BLK_START_A_NORMBIGGIE");
         break;
     case BLK_START_A_PIHBIGGIE:
-        strcpy(outstr, "BLK_START_A_PIHBIGGIE");
+        mr_asprintf(outstr, "BLK_START_A_PIHBIGGIE");
         break;
     case BLK_START_EXTENDED_ATTRIBUTES:
-        strcpy(outstr, "BLK_START_EXTENDED_ATTRIBUTES");
+        mr_asprintf(outstr, "BLK_START_EXTENDED_ATTRIBUTES");
         break;
     case BLK_STOP_EXTENDED_ATTRIBUTES:
-        strcpy(outstr, "BLK_STOP_EXTENDED_ATTRIBUTES");
+        mr_asprintf(outstr, "BLK_STOP_EXTENDED_ATTRIBUTES");
         break;
     case BLK_START_EXAT_FILE:
-        strcpy(outstr, "BLK_START_EXAT_FILE");
+        mr_asprintf(outstr, "BLK_START_EXAT_FILE");
         break;
     case BLK_STOP_EXAT_FILE:
-        strcpy(outstr, "BLK_STOP_EXAT_FILE");
+        mr_asprintf(outstr, "BLK_STOP_EXAT_FILE");
         break;
     case BLK_START_BIGGIEFILES:
-        strcpy(outstr, "BLK_START_BIGGIEFILES");
+        mr_asprintf(outstr, "BLK_START_BIGGIEFILES");
         break;
     case BLK_STOP_A_BIGGIE:
-        strcpy(outstr, "BLK_STOP_A_BIGGIE");
+        mr_asprintf(outstr, "BLK_STOP_A_BIGGIE");
         break;
     case BLK_END_OF_TAPE:
-        strcpy(outstr, "BLK_END_OF_TAPE");
+        mr_asprintf(outstr, "BLK_END_OF_TAPE");
         break;
     case BLK_END_OF_BACKUP:
-        strcpy(outstr, "BLK_END_OF_BACKUP");
+        mr_asprintf(outstr, "BLK_END_OF_BACKUP");
         break;
     case BLK_ABORTED_BACKUP:
-        strcpy(outstr, "BLK_ABORTED_BACKUP");
+        mr_asprintf(outstr, "BLK_ABORTED_BACKUP");
         break;
     case BLK_START_FILE:
-        strcpy(outstr, "BLK_START_FILE");
+        mr_asprintf(outstr, "BLK_START_FILE");
         break;
     case BLK_STOP_FILE:
-        strcpy(outstr, "BLK_STOP_FILE");
+        mr_asprintf(outstr, "BLK_STOP_FILE");
         break;
     default:
-        sprintf(outstr, "BLK_UNKNOWN (%d)", marker);
+        mr_asprintf(outstr, "BLK_UNKNOWN (%d)", marker);
         break;
     }
     return (outstr);
 }
-
-
 
 
@@ -391 +354 @@
  * @param lino The line number in @p mountlist to stringify.
  * @return The string form of <tt>mountlist</tt>-\>el[<tt>lino</tt>].
- * @note The returned string points to static storage and will be overwritten with each call.
- */
-char *mountlist_entry_to_string(struct mountlist_itself *mountlist,
-                                int lino)
-{
+ * @note The returned string points to storage that needs to be freed by
+ * caller
+ */
+char *mountlist_entry_to_string(struct mountlist_itself *mountlist, int lino) {
 
     /*@ buffer *********************************************************** */
-    static char output[MAX_STR_LEN];
+    char *output = NULL;
 
     assert(mountlist != NULL);
 
-    sprintf(output, "%-24s %-24s %-10s %8lld", mountlist->el[lino].device,
-            mountlist->el[lino].mountpoint, mountlist->el[lino].format,
-            mountlist->el[lino].size / 1024L);
-    return (output);
+    mr_asprintf(output, "%-24s %-24s %-10s %8lld", mountlist->el[lino].device, mountlist->el[lino].mountpoint, mountlist->el[lino].format, mountlist->el[lino].size / 1024L);
+    return(output);
 }
 
@@ -453 +413 @@
  * @param i The number to stringify.
  * @return The string form of @p i.
- * @note The returned value points to static strorage that will be overwritten with each call.
+ * @note The returned value points to strorage that needs to be freed by
+ * caller
  */
 char *number_to_text(int i)
@@ -459 +420 @@
 
     /*@ buffers ***************************************************** */
-    static char output[MAX_STR_LEN];
+    char *output = NULL;
 
 
@@ -466 +427 @@
     switch (i) {
     case 0:
-        strcpy(output, "zero");
+        mr_asprintf(output, "zero");
         break;
     case 1:
-        strcpy(output, "one");
+        mr_asprintf(output, "one");
         break;
     case 2:
-        strcpy(output, "two");
+        mr_asprintf(output, "two");
         break;
     case 3:
-        strcpy(output, "three");
+        mr_asprintf(output, "three");
         break;
     case 4:
-        strcpy(output, "four");
+        mr_asprintf(output, "four");
         break;
     case 5:
-        strcpy(output, "five");
+        mr_asprintf(output, "five");
         break;
     case 6:
-        strcpy(output, "six");
+        mr_asprintf(output, "six");
         break;
     case 7:
-        strcpy(output, "seven");
+        mr_asprintf(output, "seven");
         break;
     case 8:
-        strcpy(output, "eight");
+        mr_asprintf(output, "eight");
         break;
     case 9:
-        strcpy(output, "nine");
+        mr_asprintf(output, "nine");
     case 10:
-        strcpy(output, "ten");
+        mr_asprintf(output, "ten");
     default:
-        sprintf(output, "%d", i);
+        mr_asprintf(output, "%d", i);
     }
     return (output);
@@ -875 +836 @@
  * @param raid_level The RAID level to stringify.
  * @return The string form of @p raid_level.
- * @note The returned value points to static storage that will be overwritten with each call.
+ * @note The returned value points to storage that needs to be freed by caller
  */
 char *turn_raid_level_number_to_string(int raid_level)
@@ -881 +842 @@
 
     /*@ buffer ********************************************************** */
-    static char output[MAX_STR_LEN];
+    char *output = NULL;
 
 
 
     if (raid_level >= 0) {
-        sprintf(output, " RAID %-2d ", raid_level);
+        mr_asprintf(output, " RAID %-2d ", raid_level);
     } else {
-        sprintf(output, "Linear RAID");
-    }
-    return (output);
+        mr_asprintf(output, "Linear RAID");
+    }
+    return(output);
 }
 
@@ -1068 +1029 @@
     char *pos_w_commas = NULL;
     char *mds = NULL;
-    char *tmp = NULL;
 
     assert(bkpinfo != NULL);
 
     if (bkpinfo->media_size <= 0) {
-        mr_asprintf(tmp, "%lld", g_tape_posK);
-        mr_asprintf(pos_w_commas, "%s", commarize(tmp));
-        mr_free(tmp);
+        mr_asprintf(pos_w_commas, "%lld", g_tape_posK);
         mr_asprintf(outstr, "Volume %d: %s kilobytes archived so far", g_current_media_number, pos_w_commas);
         mr_free(pos_w_commas);