[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1615-gcbc7d92

[Günther Deschner]

The branch, v3-2-test has been updated
       via  cbc7d921fa696e6c3c5197ad9f87442ba679df82 (commit)
      from  bc2973df8504850a40cb0a1172689dc0bdafa323 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit cbc7d921fa696e6c3c5197ad9f87442ba679df82
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 23 00:30:28 2008 +0100

    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

-----------------------------------------------------------------------

Summary of changes:
 source/include/debug.h |    7 +++++--
 source/lib/util.c      |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/debug.h b/source/include/debug.h
index 284671c..d8dafcb 100644
--- a/source/include/debug.h
+++ b/source/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/source/lib/util.c b/source/lib/util.c
index 11f3660..e5ac375 100644
--- a/source/lib/util.c
+++ b/source/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 "";


-- 
Samba Shared Repository