Changeset 1106 in MondoRescue for trunk/mondo/src/include/mr_mem.h

Timestamp:

Feb 7, 2007, 11:55:11 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1082:1105 $SVN_M/branches/stable

File:

• trunk/mondo/src/include/mr_mem.h (modified) (1 diff)

trunk/mondo/src/include/mr_mem.h

@@ -13 +13 @@
 #endif
 #include <stdarg.h>
+#include <stdio.h>
 
 /* functions (public methods) */
 
-extern inline void mr_free(char *allocated);
-extern inline void mr_allocstr(char *alloc, const char *orig);
-extern inline void mr_asprintf(char **alloc, const char *fmt, ...);
-extern inline void mr_getline(char **lineptr, size_t *n, FILE *stream);
-extern inline void *mr_malloc(size_t size);
+#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(x,__LINE__,__FILE__, y, ## args)
+#define mr_getline(x,y,z) mr_getline_int(x, y,z,__LINE__,__FILE__)
+#define mr_malloc(x) mr_malloc_int((size_t)x,__LINE__,__FILE__)
+
+/* Internal function bringing debuging info 
+ * called indirectly through macros */
+extern inline void mr_free_int(void **allocated, int line, char *file);
+extern inline void mr_allocstr_int(char *alloc, const char *orig, int line, char *file);
+extern inline void mr_asprintf_int(char **alloc, int line, char *file, const char *fmt, ...);
+extern inline void mr_getline_int(char **lineptr, size_t *n, FILE *stream, int line, char *file);
+extern inline void *mr_malloc_int(size_t size, int line, char *file);
 
 #endif                          /* MR_MEM_H */