Changeset 1196 in MondoRescue for branches/stable/mondo/src/lib

Timestamp:

Feb 21, 2007, 2:40:49 AM (17 years ago)

Author:

Bruno Cornec

Message:

ChangeLog for mindi UTF-8
mr_strcat much more powerful as taking a vararg (+ tests).
improved text output to log file for mondo
merge from trunk memory management for mondorestore (begining)

File:

• branches/stable/mondo/src/lib/mr_mem.c (modified) (1 diff)

branches/stable/mondo/src/lib/mr_mem.c

@@ -114 +114 @@
  * Equivalent function of strcat but safe 
  * from memory allocation point of view
+ * and richer from an interface point of view
  */
-void mr_strcat_int(char **in, const char *add, int line, char *file) {
-    char *p =NULL;
+void mr_strcat_int(char **in, int line, const char *file, const char *fmt, ...) {
+    char *p = NULL;
+    char *fmt2 = NULL;
+    va_list args;
+    int res = 0;
     
-    if (add == NULL) {
+    if (fmt == NULL) {
         return;
     }
     if (in == NULL) {
-        mr_msg_int(1,line,file,"Unable to add %s to NULL pointer\nExiting...", add);
+        mr_msg_int(1,line,file,"Unable to add to NULL pointer\nExiting...");
         mr_exit(-1, "Unable to add to a NULL pointer");
     }
+    va_start(args,fmt);
     if (*in == NULL) {
-        mr_asprintf_int(&p,line,file,add);
+        res = vasprintf(in, fmt, args);
+        if (res == -1) {
+            mr_msg_int(1,line,file,"Unable to alloc memory in mr_strcat\nExiting...");
+            mr_exit(-1,"Unable to alloc memory in mr_strcat");
+        }
     } else {
-        mr_asprintf_int(&p,line,file,"%s%s",*in,add);
+        mr_asprintf_int(&fmt2, line, file, "%s%s", *in, fmt);
+        res = vasprintf(&p, fmt2, args);
+        mr_free_int((void **)&fmt2,line,file);
         mr_free_int((void **)in,line,file);
+        *in = p;
     }
-    *in = p;
+    va_end(args);
 }
+
+