diff options
author | Andrew Tridgell <tridge@samba.org> | 2001-04-28 13:49:34 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2001-04-28 13:49:34 +0000 |
commit | d095b5249cf9e1496ad5a3d6b5acb77af2c587a7 (patch) | |
tree | cc944131907e5244c9f72c80adb6e478ed36bbb8 /source3/lib/debug.c | |
parent | 944aeb7de472e0654561f7d8f37a5703487a973e (diff) | |
download | samba-d095b5249cf9e1496ad5a3d6b5acb77af2c587a7.tar.gz samba-d095b5249cf9e1496ad5a3d6b5acb77af2c587a7.tar.bz2 samba-d095b5249cf9e1496ad5a3d6b5acb77af2c587a7.zip |
- added test for vasprintf
- cleaned up GNUC printf attribute macros
- added enum handling in mkproto
- removed non-vararg code
- made slprintf and vslprintf just macros for snprintf and vsnprintf
- don't need slprintf code any more
(This used to be commit c7aeb2254dfc3cd0aa0b6c0bdd426f9323be0ddf)
Diffstat (limited to 'source3/lib/debug.c')
-rw-r--r-- | source3/lib/debug.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/source3/lib/debug.c b/source3/lib/debug.c index dc846f1b6f..f7ad324e39 100644 --- a/source3/lib/debug.c +++ b/source3/lib/debug.c @@ -450,26 +450,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 +512,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 +527,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 +718,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 +732,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 /* ************************************************************************** */ |