From bdea0b3bf6991d1f14d0e2b47061f20400760fba Mon Sep 17 00:00:00 2001 From: hniksic Date: Sun, 10 Dec 2000 18:17:44 -0800 Subject: [PATCH] [svn] Made xfree alias to free if memory debugging is not used. From . --- src/ChangeLog | 7 +++++++ src/utils.c | 10 ++-------- src/wget.h | 3 +-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 71b318e8..d61b223d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2000-12-11 Hrvoje Niksic + + * utils.c (xfree_real): Removed. + (xfree_debug): Just call free(). + + * wget.h (xfree): Make it an alias for free. + 2000-12-11 Hrvoje Niksic * http.c (http_loop): Furthermore, touch output_document only if diff --git a/src/utils.c b/src/utils.c index b59125aa..fe62f1b2 100644 --- a/src/utils.c +++ b/src/utils.c @@ -102,9 +102,9 @@ memfatal (const char *what) If memory debugging is not turned on, wget.h defines these: #define xmalloc xmalloc_real - #define xfree xfree_real #define xrealloc xrealloc_real #define xstrdup xstrdup_real + #define xfree free In case of memory debugging, the definitions are a bit more complex, because we want to provide more information, *and* we want @@ -134,12 +134,6 @@ xmalloc_real (size_t size) return ptr; } -STATIC_IF_DEBUG void -xfree_real (void *ptr) -{ - free (ptr); -} - STATIC_IF_DEBUG void * xrealloc_real (void *ptr, size_t newsize) { @@ -279,7 +273,7 @@ xfree_debug (void *ptr, const char *source_file, int source_line) assert (ptr != NULL); ++free_count; unregister_ptr (ptr); - xfree_real (ptr); + free (ptr); } void * diff --git a/src/wget.h b/src/wget.h index 4bb92f04..a97bb5a2 100644 --- a/src/wget.h +++ b/src/wget.h @@ -101,12 +101,11 @@ void logputs PARAMS ((enum log_options, const char *)); #ifndef DEBUG_MALLOC #define xmalloc xmalloc_real -#define xfree xfree_real #define xrealloc xrealloc_real #define xstrdup xstrdup_real +#define xfree free void *xmalloc_real PARAMS ((size_t)); -void xfree_real PARAMS ((void *)); void *xrealloc_real PARAMS ((void *, size_t)); char *xstrdup_real PARAMS ((const char *));