move DEBUG* macros to one place

metze

diff --git a/include/includes.h b/include/includes.h
index b7e2105dd6a80f46435cbb947e549f3078780240..deab199ff5036fe37019db98970adbeedb6c297a 100644 (file)
--- a/include/includes.h
+++ b/include/includes.h
@@ -28,7 +28,9 @@ enum debug_level {
        DEBUG_DEBUG   =  4,
 };
 
+#define DEBUGLVL(lvl) ((lvl) <= LogLevel)
 #define DEBUG(lvl, x) do { this_log_level = (lvl); if ((lvl) < DEBUG_DEBUG) { log_ringbuffer x; } if ((lvl) <= LogLevel) { do_debug x; }} while (0)
+#define DEBUGADD(lvl, x) do { if ((lvl) <= LogLevel) { this_log_level = (lvl); do_debug_add x; }} while (0)
 
 #define _PUBLIC_
 

diff --git a/lib/util/debug.c b/lib/util/debug.c
index d4d3bd643e54835c64e38b87a2bc717658184828..1cbaa230f147866f58599464eccac496c7c9fde4 100644 (file)
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -89,10 +89,6 @@ void do_debug_add(const char *format, ...)
        va_end(ap);
 }
 
-#define DEBUGLVL(lvl) ((lvl) <= LogLevel)
-#define DEBUG(lvl, x) do { this_log_level = (lvl); if ((lvl) < DEBUG_DEBUG) { log_ringbuffer x; } if ((lvl) <= LogLevel) { do_debug x; }} while (0)
-#define DEBUGADD(lvl, x) do { if ((lvl) <= LogLevel) { this_log_level = (lvl); do_debug_add x; }} while (0)
-
 static void print_asc(int level, const uint8_t *buf, size_t len)
 {
        int i;

diff --git a/lib/util/debug.h b/lib/util/debug.h
index d91f43b4b42d0b26bd8a93842746499f3d307fd7..11ecb19786f9907d0644bce7bb3cee28dd5ee760 100644 (file)
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -21,4 +21,6 @@ void (*do_debug_v)(const char *, va_list ap);
 void (*do_debug_add_v)(const char *, va_list ap);
 void log_ringbuffer(const char *format, ...);
 void do_debug(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
+void do_debug_add(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
 void dump_data(int level, const uint8_t *buf1, size_t len);
+