diff options
Diffstat (limited to 'source/lib/debug.c')
| -rw-r--r-- | source/lib/debug.c | 59 |
1 files changed, 5 insertions, 54 deletions
diff --git a/source/lib/debug.c b/source/lib/debug.c index 9c97385db33..4ec70bd118a 100644 --- a/source/lib/debug.c +++ b/source/lib/debug.c @@ -180,7 +180,7 @@ BOOL debug_parse_params(char **params, int *debuglevel_class) /* Allow DBGC_ALL to be specifies w/o requiring its class name e.g."10" * v.s. "all:10", this is the traditional way to set DEBUGLEVEL */ - if (isdigit(params[0][0])) { + if (isdigit((int)params[0][0])) { debuglevel_class[DBGC_ALL] = atoi(params[0]); i = 1; /* start processing at the next params */ } @@ -242,9 +242,9 @@ void debug_message(int msg_type, pid_t src, void *buf, size_t len) /* Set the new DEBUGLEVEL_CLASS array from the pased array */ memcpy(DEBUGLEVEL_CLASS, buf, sizeof(DEBUGLEVEL_CLASS)); - DEBUG(1,("INFO: Debug class %s level = %d (pid %d from pid %d)\n", + DEBUG(1,("INFO: Debug class %s level = %d (pid %u from pid %u)\n", classname_table[DBGC_ALL], - DEBUGLEVEL_CLASS[DBGC_ALL], getpid(), (int)src)); + DEBUGLEVEL_CLASS[DBGC_ALL], (unsigned int)getpid(), (unsigned int)src)); for (i=1; i<DBGC_LAST; i++) { if (DEBUGLEVEL_CLASS[i]) @@ -310,21 +310,14 @@ BOOL reopen_logs( void ) FILE *new_dbf = NULL; BOOL ret = True; - if (DEBUGLEVEL_CLASS[ DBGC_ALL ] <= 0) { - if (dbf) { - (void)fclose(dbf); - dbf = NULL; - } - return True; - } - oldumask = umask( 022 ); pstrcpy(fname, debugf ); if (lp_loaded() && (*lp_logfile())) pstrcpy(fname, lp_logfile()); - pstrcpy( debugf, fname ); + pstrcpy(debugf, fname); + if (append_log) new_dbf = sys_fopen( debugf, "a" ); else @@ -450,26 +443,14 @@ void check_log_size( void ) * This is called by dbghdr() and format_debug_text(). * ************************************************************************** ** */ -#ifdef HAVE_STDARG_H int Debug1( char *format_str, ... ) { -#else - int Debug1(va_alist) -va_dcl -{ - char *format_str; -#endif va_list ap; int old_errno = errno; if( stdout_logging ) { -#ifdef HAVE_STDARG_H va_start( ap, format_str ); -#else - va_start( ap ); - format_str = va_arg( ap, char * ); -#endif if(dbf) (void)vfprintf( dbf, format_str, ap ); va_end( ap ); @@ -524,12 +505,7 @@ va_dcl else priority = priority_map[syslog_level]; -#ifdef HAVE_STDARG_H va_start( ap, format_str ); -#else - va_start( ap ); - format_str = va_arg( ap, char * ); -#endif vslprintf( msgbuf, sizeof(msgbuf)-1, format_str, ap ); va_end( ap ); @@ -544,12 +520,7 @@ va_dcl if( !lp_syslog_only() ) #endif { -#ifdef HAVE_STDARG_H va_start( ap, format_str ); -#else - va_start( ap ); - format_str = va_arg( ap, char * ); -#endif if(dbf) (void)vfprintf( dbf, format_str, ap ); va_end( ap ); @@ -740,7 +711,6 @@ BOOL dbghdr( int level, char *file, char *func, int line ) * * ************************************************************************** ** */ -#ifdef HAVE_STDARG_H BOOL dbgtext( char *format_str, ... ) { va_list ap; @@ -755,24 +725,5 @@ BOOL dbghdr( int level, char *file, char *func, int line ) return( True ); } /* dbgtext */ -#else - BOOL dbgtext( va_alist ) - va_dcl - { - char *format_str; - va_list ap; - pstring msgbuf; - - va_start( ap ); - format_str = va_arg( ap, char * ); - vslprintf( msgbuf, sizeof(msgbuf)-1, format_str, ap ); - va_end( ap ); - - format_debug_text( msgbuf ); - - return( True ); - } /* dbgtext */ - -#endif /* ************************************************************************** */ |