===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdist/message.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/rdist/message.c	2014/07/05 05:05:51	1.20
--- src/usr.bin/rdist/message.c	2014/07/05 06:18:58	1.21
***************
*** 1,4 ****
! /*	$OpenBSD: message.c,v 1.20 2014/07/05 05:05:51 guenther Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: message.c,v 1.21 2014/07/05 06:18:58 guenther Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
***************
*** 552,586 ****
  							      mbuf);
  }
  
- #if	defined(ARG_TYPE) && ARG_TYPE == ARG_VARARGS
  /*
!  * Varargs front-end to _message()
   */
  void
- message(va_alist)
- 	va_dcl
- {
- 	static char buf[MSGBUFSIZ];
- 	va_list args;
- 	char *fmt;
- 	int lvl;
- 
- 	va_start(args);
- 	lvl = (int) va_arg(args, int);
- 	fmt = (char *) va_arg(args, char *);
- 	va_end(args);
- 
- 	(void) vsnprintf(buf, sizeof(buf), fmt, args);
- 
- 	_message(lvl, buf);
- }
- #endif	/* ARG_VARARGS */
- 
- #if	defined(ARG_TYPE) && ARG_TYPE == ARG_STDARG
- /*
-  * Stdarg front-end to _message()
-  */
- void
  message(int lvl, const char *fmt, ...)
  {
  	static char buf[MSGBUFSIZ];
--- 552,561 ----
  							      mbuf);
  }
  
  /*
!  * Front-end to _message()
   */
  void
  message(int lvl, const char *fmt, ...)
  {
  	static char buf[MSGBUFSIZ];
***************
*** 592,598 ****
  
  	_message(lvl, buf);
  }
- #endif	/* ARG_STDARG */
  
  /*
   * Display a debugging message
--- 567,572 ----
***************
*** 604,638 ****
  		_message(MT_DEBUG, buf);
  }
  
- #if	defined(ARG_TYPE) && ARG_TYPE == ARG_VARARGS
  /*
!  * Varargs front-end to _debugmsg()
   */
  void
- debugmsg(va_alist)
- 	va_dcl
- {
- 	static char buf[MSGBUFSIZ];
- 	va_list args;
- 	char *fmt;
- 	int lvl;
- 
- 	va_start(args);
- 	lvl = (int) va_arg(args, int);
- 	fmt = (char *) va_arg(args, char *);
- 	va_end(args);
- 
- 	(void) vsnprintf(buf, sizeof(buf), fmt, args);
- 
- 	_debugmsg(lvl, buf);
- }
- #endif	/* ARG_VARARGS */
- 
- #if	defined(ARG_TYPE) && ARG_TYPE == ARG_STDARG
- /*
-  * Stdarg front-end to _debugmsg()
-  */
- void
  debugmsg(int lvl, const char *fmt, ...)
  {
  	static char buf[MSGBUFSIZ];
--- 578,587 ----
  		_message(MT_DEBUG, buf);
  }
  
  /*
!  * Front-end to _debugmsg()
   */
  void
  debugmsg(int lvl, const char *fmt, ...)
  {
  	static char buf[MSGBUFSIZ];
***************
*** 644,650 ****
  
  	_debugmsg(lvl, buf);
  }
- #endif	/* ARG_STDARG */
  
  /*
   * Print an error message
--- 593,598 ----
***************
*** 669,702 ****
  	_message(MT_NERROR, (buf[0]) ? buf : NULL);
  }
  
- #if	defined(ARG_TYPE) && ARG_TYPE == ARG_VARARGS
  /*
!  * Varargs frontend to _error()
   */
  void
- error(va_alist)
- 	va_dcl
- {
- 	static char buf[MSGBUFSIZ];
- 	va_list args;
- 	char *fmt;
- 
- 	buf[0] = CNULL;
- 	va_start(args);
- 	fmt = (char *) va_arg(args, char *);
- 	if (fmt)
- 		(void) vsnprintf(buf, sizeof(buf), fmt, args);
- 	va_end(args);
- 
- 	_error((buf[0]) ? buf : NULL);
- }
- #endif	/* ARG_VARARGS */
- 
- #if	defined(ARG_TYPE) && ARG_TYPE == ARG_STDARG
- /*
-  * Stdarg frontend to _error()
-  */
- void
  error(const char *fmt, ...)
  {
  	static char buf[MSGBUFSIZ];
--- 617,626 ----
  	_message(MT_NERROR, (buf[0]) ? buf : NULL);
  }
  
  /*
!  * Frontend to _error()
   */
  void
  error(const char *fmt, ...)
  {
  	static char buf[MSGBUFSIZ];
***************
*** 710,716 ****
  
  	_error((buf[0]) ? buf : NULL);
  }
- #endif	/* ARG_STDARG */
  
  /*
   * Display a fatal message
--- 634,639 ----
***************
*** 732,763 ****
  	exit(nerrs);
  }
  
- #if	defined(ARG_TYPE) && ARG_TYPE == ARG_VARARGS
  /*
!  * Varargs front-end to _fatalerr()
   */
  void
- fatalerr(va_alist)
- 	va_dcl
- {
- 	static char buf[MSGBUFSIZ];
- 	va_list args;
- 	char *fmt;
- 
- 	va_start(args);
- 	fmt = (char *) va_arg(args, char *);
- 	(void) vsnprintf(buf, sizeof(buf), fmt, args);
- 	va_end(args);
- 
- 	_fatalerr(buf);
- }
- #endif	/* ARG_VARARGS */
- 
- #if	defined(ARG_TYPE) && ARG_TYPE == ARG_STDARG
- /*
-  * Stdarg front-end to _fatalerr()
-  */
- void
  fatalerr(const char *fmt, ...)
  {
  	static char buf[MSGBUFSIZ];
--- 655,664 ----
  	exit(nerrs);
  }
  
  /*
!  * Front-end to _fatalerr()
   */
  void
  fatalerr(const char *fmt, ...)
  {
  	static char buf[MSGBUFSIZ];
***************
*** 769,775 ****
  
  	_fatalerr(buf);
  }
- #endif	/* ARG_STDARG */
  
  /*
   * Get the name of the file used for notify.
--- 670,675 ----