Changeset 3837 in MondoRescue for branches

Timestamp:

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

Author:

Bruno Cornec

Message:

integrates mr_allocstr_int functions not used yet into mr_asprintf_int

Location:

branches/3.3/mondo/src

Files:

• include/mr_mem.h (modified) (2 diffs)
• lib/mr_mem.c (modified) (2 diffs)

branches/3.3/mondo/src/include/mr_mem.h

@@ -19 +19 @@
 
 #define mr_free(x) mr_free_int((void **)&x,__LINE__,__FILE__)
-#define mr_allocstr(x,y) mr_allocstr_int(x,y,__LINE__,__FILE__)
 #define mr_asprintf(x,y,args...) mr_asprintf_int((char **)&x,__LINE__,__FILE__,y,## args)
 #define mr_getline(x,y) mr_getline_int((char **)&x,y,__LINE__,__FILE__)
@@ -29 +28 @@
  * called indirectly through macros */
 MR_EXTERN void mr_free_int(void **allocated, int line, char *file);
-MR_EXTERN void mr_allocstr_int(char *alloc, const char *orig, int line, char *file);
 MR_EXTERN void mr_asprintf_int(char **alloc, int line, char *file, const char *fmt, ...);
 MR_EXTERN void mr_getline_int(char **lineptr, FILE *stream, int line, char *file);

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);
 }