Kill #if __STDC__ used to do K&R vs. ANSI varargs/stdarg; just do things

the ANSI way.

1 files changed, 1 insertions, 67 deletions

diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 008902126c9..b15cb472739 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_prf.c,v 1.39 2002/03/14 01:27:04 millert Exp $	*/
+/*	$OpenBSD: subr_prf.c,v 1.40 2002/03/15 18:19:52 millert Exp $	*/
 /*	$NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $	*/
 
 /*-
@@ -178,13 +178,7 @@ tablefull(tab)
  */
 
 void
-#ifdef __STDC__
 panic(const char *fmt, ...)
-#else
-panic(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	static char panicbuf[512];
 	int bootopt;
@@ -236,14 +230,7 @@ panic(fmt, va_alist)
  */
 
 void
-#ifdef __STDC__
 log(int level, const char *fmt, ...)
-#else
-log(level, fmt, va_alist)
-	int level;
-	char *fmt;
-	va_dcl
-#endif
 {
 	register int s;
 	va_list ap;
@@ -285,13 +272,7 @@ logpri(level)
  */
 
 int
-#ifdef __STDC__
 addlog(const char *fmt, ...)
-#else
-addlog(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	register int s;
 	va_list ap;
@@ -369,13 +350,7 @@ putchar(c, flags, tp)
  */
 
 void
-#ifdef __STDC__
 uprintf(const char *fmt, ...)
-#else
-uprintf(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	register struct proc *p = curproc;
 	va_list ap;
@@ -434,14 +409,7 @@ tprintf_close(sess)
  * => also sends message to /dev/klog
  */
 void
-#ifdef __STDC__
 tprintf(tpr_t tpr, const char *fmt, ...)
-#else
-tprintf(tpr, fmt, va_alist)
-	tpr_t tpr;
-	char *fmt;
-	va_dcl
-#endif
 {
 	register struct session *sess = (struct session *)tpr;
 	struct tty *tp = NULL;
@@ -468,14 +436,7 @@ tprintf(tpr, fmt, va_alist)
  *	use tprintf]
  */
 void
-#ifdef __STDC__
 ttyprintf(struct tty *tp, const char *fmt, ...)
-#else
-ttyprintf(tp, fmt, va_alist)
-	struct tty *tp;
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 
@@ -491,13 +452,7 @@ ttyprintf(tp, fmt, va_alist)
  */
 
 int
-#ifdef __STDC__
 db_printf(const char *fmt, ...)
-#else
-db_printf(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 	int retval;
@@ -519,13 +474,7 @@ db_printf(fmt, va_alist)
  * printf: print a message to the console and the log
  */
 int
-#ifdef __STDC__
 printf(const char *fmt, ...)
-#else
-printf(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 	int savintr, retval;
@@ -565,14 +514,7 @@ vprintf(fmt, ap)
  * sprintf: print a message to a buffer
  */
 int
-#ifdef __STDC__
 sprintf(char *buf, const char *fmt, ...)
-#else
-sprintf(buf, fmt, va_alist)
-	char *buf;
-	const char *cfmt;
-	va_dcl
-#endif
 {
 	int retval;
 	va_list ap;
@@ -612,15 +554,7 @@ vsprintf(buf, fmt, ap)
  * snprintf: print a message to a buffer
  */
 int
-#ifdef __STDC__
 snprintf(char *buf, size_t size, const char *fmt, ...)
-#else
-snprintf(buf, size, fmt, va_alist)
-	char *buf;
-	size_t size;
-	const char *cfmt;
-	va_dcl
-#endif
 {
 	int retval;
 	va_list ap;