From 7d09b9b167dcb28d9d2c447baceb2f218c0c007a Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers3@gmail.com>
Date: Thu, 21 Mar 2013 00:03:08 -0500
Subject: [PATCH] Fix when debugging enabled but error messages are not

---
 src/hardlink.c |  2 +-
 src/util.c     |  2 +-
 src/util.h     | 18 +++++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/hardlink.c b/src/hardlink.c
index da91ac43..479b1266 100644
--- a/src/hardlink.c
+++ b/src/hardlink.c
@@ -150,7 +150,7 @@ inode_table_insert(struct wim_dentry *dentry, void *_table)
 	return 0;
 }
 
-#ifdef ENABLE_ERROR_MESSAGES
+#if defined(ENABLE_ERROR_MESSAGES) || defined(ENABLE_DEBUG)
 static void
 print_inode_dentries(const struct wim_inode *inode)
 {
diff --git a/src/util.c b/src/util.c
index c0244ba2..0c00b2a6 100644
--- a/src/util.c
+++ b/src/util.c
@@ -213,7 +213,7 @@ wimlib_warning_with_errno(const char *format, ...)
 
 #endif
 
-#ifdef ENABLE_DEBUG
+#if defined(ENABLE_DEBUG) || defined(ENABLE_MORE_DEBUG)
 void wimlib_debug(const char *file, int line, const char *func,
 		  const char *format, ...)
 {
diff --git a/src/util.h b/src/util.h
index 28f9655f..77c4b352 100644
--- a/src/util.h
+++ b/src/util.h
@@ -173,7 +173,15 @@ wimlib_warning_with_errno(const char *format, ...) FORMAT(printf, 1, 2) COLD;
 #  define WARNING_WITH_ERRNO(format, ...)	dummy_printf(format, ## __VA_ARGS__)
 #endif /* !ENABLE_ERROR_MESSAGES */
 
-#if defined(ENABLE_DEBUG) || defined(ENABLE_MORE_DEBUG)
+#if defined(ENABLE_MORE_DEBUG) && !defined(ENABLE_DEBUG)
+#  define ENABLE_DEBUG 1
+#endif
+
+#if defined(ENABLE_MORE_ASSERTIONS) && !defined(ENABLE_ASSERTIONS)
+#  define ENABLE_ASSERTIONS 1
+#endif
+
+#ifdef ENABLE_DEBUG
 extern void
 wimlib_debug(const char *file, int line, const char *func,
 	     const char *format, ...);
@@ -182,26 +190,26 @@ wimlib_debug(const char *file, int line, const char *func,
 
 #else
 #  define DEBUG(format, ...) dummy_printf(format, ## __VA_ARGS__)
-#endif /* ENABLE_DEBUG || ENABLE_MORE_DEBUG */
+#endif /* !ENABLE_DEBUG */
 
 #ifdef ENABLE_MORE_DEBUG
 #  define DEBUG2(format, ...) DEBUG(format, ## __VA_ARGS__)
 #else
 #  define DEBUG2(format, ...) dummy_printf(format, ## __VA_ARGS__)
-#endif /* ENABLE_DEBUG */
+#endif /* !ENABLE_MORE_DEBUG */
 
 #ifdef ENABLE_ASSERTIONS
 #include <assert.h>
 #  define wimlib_assert(expr) assert(expr)
 #else
 #  define wimlib_assert(expr)
-#endif
+#endif /* !ENABLE_ASSERTIONS */
 
 #ifdef ENABLE_MORE_ASSERTIONS
 #  define wimlib_assert2(expr) wimlib_assert(expr)
 #else
 #  define wimlib_assert2(expr)
-#endif
+#endif /* !ENABLE_MORE_ASSERTIONS */
 
 #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
 
-- 
2.43.0