From 70796385a6b2cf374bdf0d0c99bd2c09f9b711ed Mon Sep 17 00:00:00 2001 From: Steven Schubiger Date: Thu, 20 Mar 2014 17:14:35 +0100 Subject: Rearrange debugging macros --- colorize.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/colorize.c b/colorize.c index 8eccfc9..c12ce44 100644 --- a/colorize.c +++ b/colorize.c @@ -44,14 +44,14 @@ #define streq(s1, s2) (strcmp (s1, s2) == 0) -#if DEBUG -# define xmalloc(size) malloc_wrap_debug(size, __FILE__, __LINE__) -# define xcalloc(nmemb, size) calloc_wrap_debug(nmemb, size, __FILE__, __LINE__) -# define xrealloc(ptr, size) realloc_wrap_debug(ptr, size, __FILE__, __LINE__) -#else +#if !DEBUG # define xmalloc(size) malloc_wrap(size) # define xcalloc(nmemb, size) calloc_wrap(nmemb, size) # define xrealloc(ptr, size) realloc_wrap(ptr, size) +#else +# define xmalloc(size) malloc_wrap_debug(size, __FILE__, __LINE__) +# define xcalloc(nmemb, size) calloc_wrap_debug(nmemb, size, __FILE__, __LINE__) +# define xrealloc(ptr, size) realloc_wrap_debug(ptr, size, __FILE__, __LINE__) #endif #define free_null(ptr) free_wrap((void **)&ptr) @@ -79,16 +79,16 @@ release_var (vars_list, stacked_vars, (void **)&ptr); \ } while (false) -#if DEBUG -# define MEM_ALLOC_FAIL_DEBUG(file, line) do { \ - fprintf (stderr, "Memory allocation failure in source file %s, line %u\n", file, line); \ - exit (2); \ -} while (false) -#else +#if !DEBUG # define MEM_ALLOC_FAIL() do { \ fprintf (stderr, "%s: memory allocation failure\n", program_name); \ exit (2); \ } while (false) +#else +# define MEM_ALLOC_FAIL_DEBUG(file, line) do { \ + fprintf (stderr, "Memory allocation failure in source file %s, line %u\n", file, line); \ + exit (2); \ +} while (false) #endif #define ABORT_TRACE() \ -- cgit v1.2.3