Add file & line to dm_strdup_aux().

diff --git a/WHATS_NEW b/WHATS_NEW
index a1695b2f38371f0df05630e12229005d543c413f..ca9c6237d30b5e596b203b1c8a65dc842fbdc8a2 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 1.02.04 - 
 ============================
+  Add file & line to dm_strdup_aux().
   Add setgeometry.
 
 Version 1.02.03 - 7 Feb 2006

diff --git a/lib/libdevmapper.h b/lib/libdevmapper.h
index 68359a4fe20ade94ab443ee7b125857b648e5ca0..9b6d3fa1348a289054ebd9f149daaa27ca91dfc8 100644 (file)
--- a/lib/libdevmapper.h
+++ b/lib/libdevmapper.h
@@ -372,7 +372,7 @@ int dm_tree_node_add_target_area(struct dm_tree_node *node,
 
 void *dm_malloc_aux(size_t s, const char *file, int line);
 void *dm_malloc_aux_debug(size_t s, const char *file, int line);
-char *dm_strdup_aux(const char *str);
+char *dm_strdup_aux(const char *str, const char *file, int line);
 void dm_free_aux(void *p);
 void *dm_realloc_aux(void *p, unsigned int s, const char *file, int line);
 int dm_dump_memory_debug(void);
@@ -381,7 +381,7 @@ void dm_bounds_check_debug(void);
 #ifdef DEBUG_MEM
 
 #  define dm_malloc(s) dm_malloc_aux_debug((s), __FILE__, __LINE__)
-#  define dm_strdup(s) dm_strdup_aux(s)
+#  define dm_strdup(s) dm_strdup_aux((s), __FILE__, __LINE__)
 #  define dm_free(p) dm_free_aux(p)
 #  define dm_realloc(p, s) dm_realloc_aux(p, s, __FILE__, __LINE__)
 #  define dm_dump_memory() dm_dump_memory_debug()

diff --git a/lib/mm/dbg_malloc.c b/lib/mm/dbg_malloc.c
index ee8e1afe9637be491a7ee2aa93aa754350662fe7..348644448fdc4391e7d0bffee1b728ac759621d3 100644 (file)
--- a/lib/mm/dbg_malloc.c
+++ b/lib/mm/dbg_malloc.c
@@ -18,9 +18,9 @@
 #include <assert.h>
 #include <stdarg.h>
 
-char *dm_strdup_aux(const char *str)
+char *dm_strdup_aux(const char *str, const char *file, int line)
 {
-       char *ret = dm_malloc(strlen(str) + 1);
+       char *ret = dm_malloc_aux_debug(strlen(str) + 1, file, line);
 
        if (ret)
                strcpy(ret, str);