Changeset 3837 in MondoRescue for branches/3.3/mondo/src/lib

Timestamp:

Mar 5, 2024, 2:51:50 AM (3 months ago)

Author:

Bruno Cornec

Message:

integrates mr_allocstr_int functions not used yet into mr_asprintf_int

File:

• branches/3.3/mondo/src/lib/mr_mem.c (modified) (2 diffs)

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

@@ -53 +53 @@
 }
 
-/* encapsulation function for asprintf */
+/*
+ * Function that properly allocates a string from a format and params by encapsulating asprintf
+ * freeing it before in any case
+ */
 void mr_asprintf_int(char **strp, int line, const char *file, const char *fmt, ...) {
 
     int res = 0;
     va_list args;
+
+    if ((strp != NULL) && (*strp != NULL)) {
+        mr_free_int((void **)strp, line, file); 
+    }
 
     va_start(args,fmt);
@@ -89 +96 @@
         mr_asprintf_int(lineptr,line,file,"");
     }
-}
-
-/*
- * Function that properly allocates a string from another one
- * freeing it before in any case
- */
-void mr_allocstr_int(char *alloc, const char *orig, int line, const char *file) {
-
-    if (alloc != NULL) {
-        mr_free_int((void **)&alloc, line, file); 
-    }
-    mr_asprintf_int(&alloc, line, file, orig);
 }