$NetBSD: patch-ae,v 1.2 2003/10/18 13:20:32 cjep Exp $ --- utils.c.orig 2003-10-08 16:18:08.000000000 +1000 +++ utils.c 2003-10-08 16:18:18.000000000 +1000 @@ -20,7 +20,7 @@ * These notices must be retained in any copies of any part of this software. ******************************************************************************/ #include -#include +#include #include #include #ifdef __NetBSD__ @@ -40,14 +40,12 @@ /*----------------------------------------------------------------------------*/ -void warn( va_alist ) -va_dcl +void +warn(const char *fmt, ...) { va_list args; - char *fmt; - va_start( args ); - fmt = va_arg( args, char * ); + va_start(args, fmt); fprintf( stderr, "Warning: " ); vfprintf( stderr, fmt, args ); va_end( args ); @@ -55,14 +53,12 @@ /*----------------------------------------------------------------------------*/ -void die( va_alist ) -va_dcl +void +die(const char *fmt, ...) { va_list args; - char *fmt; - va_start( args ); - fmt = va_arg( args, char * ); + va_start(args, fmt); fprintf( stderr, "Error: " ); vfprintf( stderr, fmt, args ); exit( 1 ); @@ -70,14 +66,12 @@ /*----------------------------------------------------------------------------*/ -void fatal( va_alist ) -va_dcl +void +fatal(const char *fmt, ...) { va_list args; - char *fmt; - va_start( args ); - fmt = va_arg( args, char * ); + va_start(args, fmt); fprintf( stderr, "Internal Error: " ); vfprintf( stderr, fmt, args ); exit( 2 ); @@ -142,18 +136,16 @@ /*----------------------------------------------------------------------------*/ -void mailmessage( va_alist ) -va_dcl +void +mailmessage(const char *fmt, ...) { va_list args; - char *fmt; FILE *popen(), *fp; char cmdline[80]; if (whome == NULL) whome = getlogin(); sprintf(cmdline,"%s %s",mailprog,whome); fp = popen(cmdline,"w"); - va_start( args ); - fmt = va_arg( args, char * ); + va_start(args, fmt); fprintf( fp, "MNM Warning: " ); vfprintf( fp, fmt, args ); va_end( args );