From 7e53360206097d14a330835b894b156cfff60d92 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Fri, 2 Nov 2001 15:23:40 +0000 Subject: [PATCH] 2001-11-01 Marcus Brinkmann * logging.c (log_printf): Do not initialize ARG_PTR with 0, we don't know the correct type. Instead, run va_start and va_end unconditionally. Reported by Jose Carlos Garcia Sogo . --- jnlib/ChangeLog | 7 +++++++ jnlib/logging.c | 15 +++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog index 92ce65a7..1d750bfa 100644 --- a/jnlib/ChangeLog +++ b/jnlib/ChangeLog @@ -1,3 +1,10 @@ +2001-11-01 Marcus Brinkmann + + * logging.c (log_printf): Do not initialize ARG_PTR with 0, we + don't know the correct type. Instead, run va_start and va_end + unconditionally. + Reported by Jose Carlos Garcia Sogo . + 2001-08-30 Werner Koch * logging.c (log_printf): Don't pass NULL instead of arg_ptr. diff --git a/jnlib/logging.c b/jnlib/logging.c index dc439ff8..69b94b1b 100644 --- a/jnlib/logging.c +++ b/jnlib/logging.c @@ -222,18 +222,13 @@ log_debug( const char *fmt, ... ) void -log_printf( const char *fmt, ... ) +log_printf (const char *fmt, ...) { - va_list arg_ptr = 0; + va_list arg_ptr; - if( !fmt ) { - do_logv( MY_LOG_BEGIN, NULL, arg_ptr ); - } - else { - va_start( arg_ptr, fmt ) ; - do_logv( MY_LOG_CONT, fmt, arg_ptr ); - va_end(arg_ptr); - } + va_start (arg_ptr, fmt); + do_logv (fmt ? MY_LOG_CONT : MY_LOG_BEGIN, fmt, arg_ptr); + va_end (arg_ptr); }