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

Timestamp:

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

Author:

Bruno Cornec

Message:

• Improve again memory management: remove some strcat calls change function percent_media_full_comment to return a dynamically allocated string

File:

• branches/3.2/mondo/src/common/libmondo-string.c (modified) (4 diffs)

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

@@ -472 +472 @@
  * @param value The value to replace @p token.
  */
+
+/* TODO: consider mr_strtok */
 void resolve_naff_tokens(char *output, char *ip, char *value, char *token)
 {
@@ -1020 +1022 @@
     /*@ int *********************************************** */
     int percentage;
-    int j;
 
     /*@ buffers ******************************************* */
-    static char outstr[MAX_STR_LEN];
+    char * outstr = NULL;
     char *pos_w_commas = NULL;
     char *mds = NULL;
@@ -1034 +1035 @@
         mr_asprintf(pos_w_commas, "%s", commarize(tmp));
         mr_free(tmp);
-        sprintf(outstr, "Volume %d: %s kilobytes archived so far", g_current_media_number, pos_w_commas);
+        mr_asprintf(outstr, "Volume %d: %s kilobytes archived so far", g_current_media_number, pos_w_commas);
         mr_free(pos_w_commas);
         return (outstr);
@@ -1045 +1046 @@
             percentage = 100;
         }
-        sprintf(outstr, "Volume %d: [", g_current_media_number);
+        mr_asprintf(outstr, "Volume %d: [", g_current_media_number);
     } else {
         percentage = (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 / bkpinfo->media_size);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        sprintf(outstr, "%s %d: [", mds, g_current_media_number);
+        mr_asprintf(outstr, "%s %d: [", mds, g_current_media_number);
         mr_free(mds);
     }
     for (j = 0; j < percentage; j += 5) {
-        strcat(outstr, "*");
+        mr_strcat(outstr, "*");
     }
     for (; j < 100; j += 5) {
-        strcat(outstr, ".");
-    }
-    j = (int) strlen(outstr);
-    sprintf(outstr + j, "] %d%% used", percentage);
+        mr_strcat(outstr, ".");
+    }
+    mr_strcat(outstr, "] %d%% used", percentage);
     return (outstr);
 }
+
 
 /**