4, even though the macros are still different.
This makes it possible to use object code compiled with one DEBUG()
macro from the other sourceX directory.
int Debug1( const char *, ... ) PRINTF_ATTRIBUTE(1,2);
/* PRINTFLIKE1 */
bool dbgtext( const char *, ... ) PRINTF_ATTRIBUTE(1,2);
-bool dbghdr( int level, int cls, const char *file, const char *func, int line );
+bool dbghdrclass( int level, int cls, const char *location, const char *func);
+bool dbghdr( int level, const char *location, const char *func);
#if defined(sgi) && (_COMPILER_VERSION >= 730)
#pragma mips_frequency_hint NEVER Debug1
#pragma mips_frequency_hint NEVER dbgtext
+#pragma mips_frequency_hint NEVER dbghdrclass
#pragma mips_frequency_hint NEVER dbghdr
#endif
#define DEBUGLVL( level ) \
( CHECK_DEBUGLVL(level) \
- && dbghdr( level, DBGC_CLASS, __FILE__, FUNCTION_MACRO, (__LINE__) ) )
+ && dbghdrclass( level, DBGC_CLASS, __location__, FUNCTION_MACRO ) )
#define DEBUGLVLC( dbgc_class, level ) \
unlikely((DEBUGLEVEL_CLASS[ dbgc_class ] >= (level))|| \
(!DEBUGLEVEL_CLASS_ISSET[ dbgc_class ] && \
DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \
- && dbghdr( level, DBGC_CLASS, __FILE__, FUNCTION_MACRO, (__LINE__) ) )
+ && dbghdrclass( level, DBGC_CLASS, __location__, FUNCTION_MACRO) )
#define DEBUG( level, body ) \
unlikely((DEBUGLEVEL_CLASS[ DBGC_CLASS ] >= (level))|| \
(!DEBUGLEVEL_CLASS_ISSET[ DBGC_CLASS ] && \
DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \
- && (dbghdr( level, DBGC_CLASS, __FILE__, FUNCTION_MACRO, (__LINE__) )) \
+ && (dbghdrclass( level, DBGC_CLASS, __location__, FUNCTION_MACRO )) \
&& (dbgtext body) )
#define DEBUGC( dbgc_class, level, body ) \
unlikely((DEBUGLEVEL_CLASS[ dbgc_class ] >= (level))|| \
(!DEBUGLEVEL_CLASS_ISSET[ dbgc_class ] && \
DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \
- && (dbghdr( level, DBGC_CLASS, __FILE__, FUNCTION_MACRO, (__LINE__) )) \
+ && (dbghdrclass( level, DBGC_CLASS, __location__, FUNCTION_MACRO)) \
&& (dbgtext body) )
#define DEBUGADD( level, body ) \
bool need_to_check_log_size( void );
void check_log_size( void );
void dbgflush( void );
-bool dbghdr(int level, int cls, const char *file, const char *func, int line);
+bool dbghdrclass(int level, int cls, const char *location, const char *func);
+bool dbghdr(int level, const char *location, const char *func);
TALLOC_CTX *debug_ctx(void);
/* The following definitions come from lib/display_sec.c */
****************************************************************************/
-bool dbghdr(int level, int cls, const char *file, const char *func, int line)
+bool dbghdrclass(int level, int cls, const char *location, const char *func)
{
/* Ensure we don't lose any real errno value. */
int old_errno = errno;
lp_debug_hires_timestamp()),
level, header_str);
} else {
- (void)Debug1( "[%s, %2d%s] %s:%s(%d)\n",
+ (void)Debug1( "[%s, %2d%s] %s(%s)\n",
current_timestring(debug_ctx(),
lp_debug_hires_timestamp()),
- level, header_str, file, func, line );
+ level, header_str, location, func );
}
}
return( True );
}
+bool dbghdr(int level, const char *location, const char *func)
+{
+ /* For compatibility with Samba 4, which doesn't have debug classes */
+ return dbghdrclass(level, 0, location, func);
+}
+
/***************************************************************************
Add text to the body of the "current" debug message via the format buffer.
int sasl_log_level,
const char *message)
{
- int debug_level;
+ int dl;
switch (sasl_log_level) {
case SASL_LOG_NONE:
- debug_level = 0;
+ dl = 0;
break;
case SASL_LOG_ERR:
- debug_level = 1;
+ dl = 1;
break;
case SASL_LOG_FAIL:
- debug_level = 2;
+ dl = 2;
break;
case SASL_LOG_WARN:
- debug_level = 3;
+ dl = 3;
break;
case SASL_LOG_NOTE:
- debug_level = 5;
+ dl = 5;
break;
case SASL_LOG_DEBUG:
- debug_level = 10;
+ dl = 10;
break;
case SASL_LOG_TRACE:
- debug_level = 11;
+ dl = 11;
break;
#if DEBUG_PASSWORD
case SASL_LOG_PASS:
- debug_level = 100;
+ dl = 100;
break;
#endif
default:
- debug_level = 0;
+ dl = 0;
break;
}
- DEBUG(debug_level, ("gensec_sasl: %s\n", message));
+ DEBUG(dl, ("gensec_sasl: %s\n", message));
return SASL_OK;
}
int fd = STDIN_FILENO;
char *ret;
- do_debug("%s", prompt);
+ printf("%s", prompt);
line = (char *)malloc(BUFSIZ);
if (!line) {
{
va_list ap;
char *ptr = NULL;
- int debug_level;
+ int dl;
va_start(ap, format);
vasprintf(&ptr, format, ap);
switch (level) {
case TDB_DEBUG_FATAL:
- debug_level = 0;
+ dl = 0;
break;
case TDB_DEBUG_ERROR:
- debug_level = 1;
+ dl = 1;
break;
case TDB_DEBUG_WARNING:
- debug_level = 2;
+ dl = 2;
break;
case TDB_DEBUG_TRACE:
- debug_level = 5;
+ dl = 5;
break;
default:
- debug_level = 0;
+ dl = 0;
}
if (ptr != NULL) {
const char *name = tdb_name(tdb);
- DEBUG(debug_level, ("tdb(%s): %s", name ? name : "unnamed", ptr));
+ DEBUG(dl, ("tdb(%s): %s", name ? name : "unnamed", ptr));
free(ptr);
}
}
/**
* this global variable determines what messages are printed
*/
-_PUBLIC_ int DEBUGLEVEL;
+int _debug_level = 0;
+_PUBLIC_ int *debug_level = &_debug_level;
+int *DEBUGLEVEL_CLASS = NULL; /* For samba 3 */
/* the registered mutex handlers */
static struct {
the backend for debug messages. Note that the DEBUG() macro has already
ensured that the log level has been met before this is called
*/
-_PUBLIC_ void do_debug_header(int level, const char *location, const char *func)
+_PUBLIC_ void dbghdr(int level, const char *location, const char *func)
{
log_timestring(level, location, func);
log_task_id();
}
+
+_PUBLIC_ void dbghdrclass(int level, int class, const char *location, const char *func)
+{
+ /* Simple wrapper, Samba 4 doesn't do debug classes */
+ dbghdr(level, location, func);
+}
+
/**
the backend for debug messages. Note that the DEBUG() macro has already
ensured that the log level has been met before this is called
@note You should never have to call this function directly. Call the DEBUG()
macro instead.
*/
-_PUBLIC_ void do_debug(const char *format, ...)
+_PUBLIC_ void dbgtext(const char *format, ...)
{
va_list ap;
char *s = NULL;
void (*log_task_id)(int fd);
};
+#define DEBUGLEVEL *debug_level
extern int DEBUGLEVEL;
#define debug_ctx() (_debug_ctx?_debug_ctx:(_debug_ctx=talloc_new(NULL)))
if (DEBUGLVL(level)) { \
void* _debug_ctx=NULL; \
if (header) { \
- do_debug_header(level, __location__, __FUNCTION__); \
+ dbghdr(level, __location__, __FUNCTION__); \
} \
- do_debug body; \
+ dbgtext body; \
talloc_free(_debug_ctx); \
} \
} while (0)
the backend for debug messages. Note that the DEBUG() macro has already
ensured that the log level has been met before this is called
*/
-_PUBLIC_ void do_debug_header(int level, const char *location, const char *func);
+_PUBLIC_ void dbghdr(int level, const char *location, const char *func);
/**
reopen the log file (usually called because the log file name might have changed)
@note You should never have to call this function directly. Call the DEBUG()
macro instead.
*/
-_PUBLIC_ void do_debug(const char *format, ...) PRINTF_ATTRIBUTE(1,2);
+_PUBLIC_ void dbgtext(const char *format, ...) PRINTF_ATTRIBUTE(1,2);