diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-12-19 11:40:06 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-01-20 09:44:36 +0100 |
| commit | a309287947f49dc06beeaea0300e1a41ab3d4ba7 (patch) | |
| tree | 63e88932798a3981571c6720c5b88a4b7b36eb51 | |
| parent | a23c409e73d0e6632a62a81e4b7a17bf831231a0 (diff) | |
| download | samba-a309287947f49dc06beeaea0300e1a41ab3d4ba7.tar.gz samba-a309287947f49dc06beeaea0300e1a41ab3d4ba7.tar.xz samba-a309287947f49dc06beeaea0300e1a41ab3d4ba7.zip | |
move DEBUG* macros to one place
metze
(This used to be ctdb commit 4b4dd5d7f81bf226e05c7f3d40087043da1517a2)
| -rw-r--r-- | ctdb/include/includes.h | 2 | ||||
| -rw-r--r-- | ctdb/lib/util/debug.c | 4 | ||||
| -rw-r--r-- | ctdb/lib/util/debug.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/include/includes.h b/ctdb/include/includes.h index b7e2105dd6..deab199ff5 100644 --- a/ctdb/include/includes.h +++ b/ctdb/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/ctdb/lib/util/debug.c b/ctdb/lib/util/debug.c index d4d3bd643e..1cbaa230f1 100644 --- a/ctdb/lib/util/debug.c +++ b/ctdb/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/ctdb/lib/util/debug.h b/ctdb/lib/util/debug.h index d91f43b4b4..11ecb19786 100644 --- a/ctdb/lib/util/debug.h +++ b/ctdb/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); + |