diff options
| author | Michael Adam <obnox@samba.org> | 2008-01-23 00:30:28 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-01-23 08:16:37 +0100 |
| commit | a60b913a37d577d6bb52fbdb0987eb7c9ea9edcc (patch) | |
| tree | 59893063dadf9f32d549b922e1472d0d69f50257 | |
| parent | 39d172bf34d0cbb3bf3e3a04d534876097cdccb5 (diff) | |
| download | samba-a60b913a37d577d6bb52fbdb0987eb7c9ea9edcc.tar.gz samba-a60b913a37d577d6bb52fbdb0987eb7c9ea9edcc.tar.bz2 samba-a60b913a37d577d6bb52fbdb0987eb7c9ea9edcc.zip | |
Fix tab_depth: it should not create an extra debug header.
In pstring removal 4ae4b23586, the behaviour of tab_depth was
changed to create an extra debug header (by using the DEBUGLVL
macro).
This extracts the debug level check from DEBUGLVL into
a macro CHECK_DEBUGLVL without the debug header creation
and uses this instead of DEBUGLVL in tab_depth.
Michael
(This used to be commit cbc7d921fa696e6c3c5197ad9f87442ba679df82)
| -rw-r--r-- | source3/include/debug.h | 7 | ||||
| -rw-r--r-- | source3/lib/util.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source3/include/debug.h b/source3/include/debug.h index 284671c730..d8dafcbd45 100644 --- a/source3/include/debug.h +++ b/source3/include/debug.h @@ -176,11 +176,14 @@ extern bool *DEBUGLEVEL_CLASS_ISSET; #define unlikely(x) (x) #endif -#define DEBUGLVL( level ) \ +#define CHECK_DEBUGLVL( level ) \ ( ((level) <= MAX_DEBUG_LEVEL) && \ unlikely((DEBUGLEVEL_CLASS[ DBGC_CLASS ] >= (level))|| \ (!DEBUGLEVEL_CLASS_ISSET[ DBGC_CLASS ] && \ - DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \ + DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) ) + +#define DEBUGLVL( level ) \ + ( CHECK_DEBUGLVL(level) \ && dbghdr( level, DBGC_CLASS, __FILE__, FUNCTION_MACRO, (__LINE__) ) ) diff --git a/source3/lib/util.c b/source3/lib/util.c index 11f3660df8..e5ac3752f5 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -2182,7 +2182,7 @@ void dump_data_pw(const char *msg, const uchar * data, size_t len) const char *tab_depth(int level, int depth) { - if( DEBUGLVL(level) ) { + if( CHECK_DEBUGLVL(level) ) { dbgtext("%*s", depth*4, ""); } return ""; |