2001-11-01 Marcus Brinkmann <marcus@g10code.de>

	* 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 <jsogo@debian.org>.

diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index 92ce65a75a8ac9183c53e3db38c8495c6b5a4b22..1d750bfaec92170146fe21fee0910d0eb257b144 100644 (file)
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-01  Marcus Brinkmann  <marcus@g10code.de>
+
+       * 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 <jsogo@debian.org>.
+
 2001-08-30  Werner Koch  <wk@gnupg.org>
 
        * logging.c (log_printf): Don't pass NULL instead of arg_ptr.

diff --git a/jnlib/logging.c b/jnlib/logging.c
index dc439ff83feca9f58f9e45c43249f40fa428b818..69b94b1b42203f37360e6e988303b035905e6e5f 100644 (file)
--- 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);
 }