Libucw: remove dmalloc support

diff --git a/ucw/alloc.c b/ucw/alloc.c
index bed8c51f104a0d78dbe3e90023ea346fd4fb2320..4f531366ec6eedaa6643732b3cc670a39ee40cb0 100644 (file)
--- a/ucw/alloc.c
+++ b/ucw/alloc.c
@@ -12,8 +12,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef DEBUG_DMALLOC
-
 void *
 xmalloc(uns size)
 {
@@ -23,8 +21,6 @@ xmalloc(uns size)
   return x;
 }
 
-#endif
-
 void *
 xmalloc_zero(uns size)
 {

diff --git a/ucw/autoconf.cfg b/ucw/autoconf.cfg
index 83743a576b069c8c4db0161cdb8daa6814520e69..8d295d7a19dde81095ba84ca09951a8c79b72f0f 100644 (file)
--- a/ucw/autoconf.cfg
+++ b/ucw/autoconf.cfg
@@ -299,8 +299,6 @@ if (Get("CPU_ARCH") eq "default" || Get("CPU_ARCH") =~ /^i[345]86$/) {
 
 # If debugging memory allocations:
 #LIBS+=-lefence
-#CDEBUG+=-DDEBUG_DMALLOC
-#LIBS+=-ldmalloc
 
 # Remember PKG_CONFIG_PATH used for building, so that it will be propagated to
 # pkg-config's run locally in the makefiles.

diff --git a/ucw/lib.h b/ucw/lib.h
index 624da3ca694397ef9930fba3b200cca461c08287..904cadeee5a4b01e681a8f3367bb380f4bc6e4b1 100644 (file)
--- a/ucw/lib.h
+++ b/ucw/lib.h
@@ -136,18 +136,6 @@ void assert_failed_noinfo(void) NONRET;
 #define xrealloc sh_xrealloc
 #define xfree sh_xfree
 
-#ifdef DEBUG_DMALLOC
-/*
- * The standard dmalloc macros tend to produce lots of namespace
- * conflicts and we use only xmalloc and xfree, so we can define
- * the stubs ourselves.
- */
-#define DMALLOC_DISABLE
-#include <dmalloc.h>
-#define sh_xmalloc(size) _xmalloc_leap(__FILE__, __LINE__, size)
-#define sh_xrealloc(ptr,size) _xrealloc_leap(__FILE__, __LINE__, ptr, size)
-#define sh_xfree(ptr) _xfree_leap(__FILE__, __LINE__, ptr)
-#else
 /*
  * Unfortunately, several libraries we might want to link to define
  * their own xmalloc and we don't want to interfere with them, hence
@@ -156,7 +144,6 @@ void assert_failed_noinfo(void) NONRET;
 void *xmalloc(uns) LIKE_MALLOC;
 void *xrealloc(void *, uns);
 void xfree(void *);
-#endif
 
 void *xmalloc_zero(uns) LIKE_MALLOC;
 char *xstrdup(const char *) LIKE_MALLOC;

diff --git a/ucw/realloc.c b/ucw/realloc.c
index ed3f1a43cec61c75288b0bfe34ddf98e1dcbec5f..51b50dec52f3ecb693f93eb8757e796c324bf687 100644 (file)
--- a/ucw/realloc.c
+++ b/ucw/realloc.c
@@ -11,8 +11,6 @@
 
 #include <stdlib.h>
 
-#ifndef DEBUG_DMALLOC
-
 void *
 xrealloc(void *old, uns size)
 {
@@ -22,5 +20,3 @@ xrealloc(void *old, uns size)
     die("Cannot reallocate %d bytes of memory", size);
   return x;
 }
-
-#endif