Use stdarg.h instead of varargs.h. Bug-Debian: http://bugs.debian.org/195439 --- a/ifcico/respfreq.c +++ b/ifcico/respfreq.c @@ -18,7 +18,7 @@ int re_exec(char*); #include "lutil.h" #include "config.h" #ifndef NOFREQREPORT -#include +#include #include "ftnmsg.h" #endif #include "version.h" @@ -44,7 +44,7 @@ static file_list *resplist(char*); #ifndef NOFREQREPORT static void attach_report(file_list**); -static void add_report(); +static void add_report(char*,...); static char *report_text=NULL; static unsigned long report_total=0L; #endif @@ -612,15 +612,12 @@ file_list **fl; report_text=NULL; } -static void add_report(va_alist) -va_dcl +static void add_report(char *fmt, ...) { va_list args; - char *fmt; char buf[1024]; - va_start(args); - fmt=va_arg(args,char*); + va_start(args,fmt); if (report_text == NULL) { @@ -641,6 +638,7 @@ va_dcl vsprintf(buf,fmt,args); strcat(buf,"\r\n"); report_text=xstrcat(report_text,buf); + va_end(args); } #endif --- a/iflib/lutil.c +++ b/iflib/lutil.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #ifdef HAS_SYSLOG @@ -13,6 +13,8 @@ #define LOG_USER 0 #endif +#include "xutil.h" + #ifdef HAS_SYSLOG static int syslog_opened=0; #else @@ -143,20 +145,20 @@ char c; syslog(level,"\terrno=%d : %s",\ errno,strerror(errno)); -void loginf(va_alist) -va_dcl +void loginf(char *fmt,...) { va_list args; - char *fmt; #ifndef HAS_SYSLOG int oldmask; #endif - va_start(args); - fmt=va_arg(args, char*); + va_start(args,fmt); if (verbose) { - PRINT_DEBUG(fmt,args); + va_list args2; + va_copy(args2, args); + PRINT_DEBUG(fmt,args2); + va_end(args2); } #ifdef HAS_SYSLOG if (!syslog_opened) @@ -183,20 +185,20 @@ va_dcl return; } -void logerr(va_alist) -va_dcl +void logerr(char *fmt,...) { va_list args; - char *fmt; #ifndef HAS_SYSLOG int oldmask; #endif - va_start(args); - fmt=va_arg(args, char*); + va_start(args,fmt); if (verbose) { - PRINT_DEBUG(fmt,args); + va_list args2; + va_copy(args2, args); + PRINT_DEBUG(fmt,args2); + va_end(args2); } #ifdef HAS_SYSLOG if (!syslog_opened) @@ -223,16 +225,11 @@ va_dcl return; } -void debug(va_alist) -va_dcl +void debug(unsigned long level, char *fmt,...) { va_list args; - unsigned long level; - char *fmt; - va_start(args); - level=va_arg(args, unsigned long); - fmt=va_arg(args, char*); + va_start(args,fmt); if ((verbose && (level == 0)) || (verbose & (1 << (level-1)))) {