Fix dm_strdup debug definition.

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 6e74c4e83a800b42b1f900b9931dff8af40d8648..7eb35d52dde875b4c33886429975bfa104e9b945 100644 (file)
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
 Version 1.02.03 - 
 ============================
+  Fix dm_strdup debug definition.
   Fix hash function to avoid using a negative array offset.
   Don't inline _find in hash.c and tidy signed/unsigned etc.
   Fix libdevmapper.h #endif.

diff --git a/libdm/.exported_symbols b/libdm/.exported_symbols
index 337b96d6102bb14b356854dae13d6e9925106724..0d798cd23a7665e50349da58bfdad8b0949c7cb9 100644 (file)
--- a/libdm/.exported_symbols
+++ b/libdm/.exported_symbols
@@ -64,7 +64,7 @@ dm_is_dm_major
 dm_mknodes
 dm_malloc_aux
 dm_malloc_aux_debug
-dm_strdup
+dm_strdup_aux
 dm_free_aux
 dm_realloc_aux
 dm_dump_memory_debug

diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index 74b3a4211b201a6a225642a0fe421df9099a82e7..535e4a098ae77838eddc91eeaf425c7b762b6881 100644 (file)
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -356,10 +356,9 @@ int dm_tree_node_add_target_area(struct dm_tree_node *node,
  * Memory management
  *******************/
 
-char *dm_strdup(const char *str);
-
 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);
 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);
@@ -368,6 +367,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_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()
@@ -376,6 +376,7 @@ void dm_bounds_check_debug(void);
 #else
 
 #  define dm_malloc(s) dm_malloc_aux((s), __FILE__, __LINE__)
+#  define dm_strdup(s) strdup(s)
 #  define dm_free(p) free(p)
 #  define dm_realloc(p, s) realloc(p, s)
 #  define dm_dump_memory() {}