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

the ANSI way.

7 files changed, 7 insertions, 78 deletions

diff --git a/sys/arch/hppa/stand/libsa/ct.c b/sys/arch/hppa/stand/libsa/ct.c
index 6b30f5a5458..6d025319374 100644
--- a/sys/arch/hppa/stand/libsa/ct.c
+++ b/sys/arch/hppa/stand/libsa/ct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ct.c,v 1.5 1999/04/20 20:01:01 mickey Exp $	*/
+/*	$OpenBSD: ct.c,v 1.6 2002/03/15 18:19:52 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -67,12 +67,7 @@ iodcio_t ctiodc;	/* cartridge tape IODC entry point */
 int ctcode[IODC_MAXSIZE/sizeof(int)];
 
 int
-#ifdef __STDC__
 ctopen(struct open_file *f, ...)
-#else
-ctopen(f)
-	struct open_file *f;
-#endif
 {
 	register struct hppa_dev *dp = f->f_devdata;
 	int ret;
diff --git a/sys/arch/hppa/stand/libsa/dk.c b/sys/arch/hppa/stand/libsa/dk.c
index b974fec4085..e70092add26 100644
--- a/sys/arch/hppa/stand/libsa/dk.c
+++ b/sys/arch/hppa/stand/libsa/dk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dk.c,v 1.5 1999/04/20 20:01:01 mickey Exp $	*/
+/*	$OpenBSD: dk.c,v 1.6 2002/03/15 18:19:52 millert Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -50,12 +50,7 @@ dk_disklabel(dp, label)
 }
 
 int
-#ifdef __STDC__
 dkopen(struct open_file *f, ...)
-#else
-dkopen(f, va_alist)
-	struct open_file *f;
-#endif
 {
 	register struct disklabel *lp;
 	register struct hppa_dev *dp = f->f_devdata;
diff --git a/sys/arch/hppa/stand/libsa/lf.c b/sys/arch/hppa/stand/libsa/lf.c
index 5440e4dbee6..73a68a22f3a 100644
--- a/sys/arch/hppa/stand/libsa/lf.c
+++ b/sys/arch/hppa/stand/libsa/lf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lf.c,v 1.3 1999/04/20 20:01:02 mickey Exp $	*/
+/*	$OpenBSD: lf.c,v 1.4 2002/03/15 18:19:52 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -38,12 +38,7 @@
 #include "dev_hppa.h"
 
 int
-#ifdef __STDC__
 lfopen(struct open_file *f, ...)
-#else
-lfopen(f, va_alist)
-	struct open_file *f;
-#endif
 {
 	register struct hppa_dev *dp = f->f_devdata;;
 
diff --git a/sys/arch/macppc/macppc/opendev.c b/sys/arch/macppc/macppc/opendev.c
index db389363803..aa072a95b03 100644
--- a/sys/arch/macppc/macppc/opendev.c
+++ b/sys/arch/macppc/macppc/opendev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opendev.c,v 1.4 2002/03/14 01:26:36 millert Exp $	*/
+/*	$OpenBSD: opendev.c,v 1.5 2002/03/15 18:19:52 millert Exp $	*/
 /*	$NetBSD: openfirm.c,v 1.1 1996/09/30 16:34:52 ws Exp $	*/
 
 /*
@@ -100,16 +100,7 @@ OF_package_to_path(phandle, buf, buflen)
 
 
 int
-#ifdef	__STDC__
 OF_call_method(char *method, int ihandle, int nargs, int nreturns, ...)
-#else
-OF_call_method(method, ihandle, nargs, nreturns, va_alist)
-	char *method;
-	int ihandle;
-	int nargs;
-	int nreturns;
-	va_dcl
-#endif
 {
 	va_list ap;
 	static struct {
@@ -150,15 +141,7 @@ OF_call_method(method, ihandle, nargs, nreturns, va_alist)
 	return 0;
 }
 int
-#ifdef	__STDC__
 OF_call_method_1(char *method, int ihandle, int nargs, ...)
-#else
-OF_call_method_1(method, ihandle, nargs, va_alist)
-	char *method;
-	int ihandle;
-	int nargs;
-	va_dcl
-#endif
 {
 	va_list ap;
 	static struct {
diff --git a/sys/arch/macppc/stand/Locore.c b/sys/arch/macppc/stand/Locore.c
index 452b5a66685..f14e9f878db 100644
--- a/sys/arch/macppc/stand/Locore.c
+++ b/sys/arch/macppc/stand/Locore.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: Locore.c,v 1.4 2002/03/14 01:26:37 millert Exp $	*/
+/*	$OpenBSD: Locore.c,v 1.5 2002/03/15 18:19:52 millert Exp $	*/
 /*	$NetBSD: Locore.c,v 1.1 1997/04/16 20:29:11 thorpej Exp $	*/
 
 /*
@@ -507,16 +507,7 @@ OF_chain(virt, size, entry, arg, len)
 #endif
 
 int
-#ifdef	__STDC__
 OF_call_method(char *method, int ihandle, int nargs, int nreturns, ...)
-#else
-OF_call_method(method, ihandle, nargs, nreturns, va_alist)
-	char *method;
-	int ihandle;
-	int nargs;
-	int nreturns;
-	va_dcl
-#endif
 {
 	va_list ap;
 	static struct {
diff --git a/sys/arch/sparc64/sparc64/ofw_machdep.c b/sys/arch/sparc64/sparc64/ofw_machdep.c
index 985838e8732..59815b7570b 100644
--- a/sys/arch/sparc64/sparc64/ofw_machdep.c
+++ b/sys/arch/sparc64/sparc64/ofw_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofw_machdep.c,v 1.5 2002/03/14 01:26:45 millert Exp $	*/
+/*	$OpenBSD: ofw_machdep.c,v 1.6 2002/03/15 18:19:52 millert Exp $	*/
 /*	$NetBSD: ofw_machdep.c,v 1.16 2001/07/20 00:07:14 eeh Exp $	*/
 
 /*
@@ -592,13 +592,7 @@ OF_stdout()
  * This is not safe, but then what do you expect?
  */
 void
-#ifdef __STDC__
 prom_printf(const char *fmt, ...)
-#else
-prom_printf(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	int len;
 	static char buf[256];
diff --git a/sys/arch/sparc64/sparc64/openfirm.c b/sys/arch/sparc64/sparc64/openfirm.c
index fd42ac2baa7..f1207c61ab7 100644
--- a/sys/arch/sparc64/sparc64/openfirm.c
+++ b/sys/arch/sparc64/sparc64/openfirm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openfirm.c,v 1.7 2002/03/14 03:16:01 millert Exp $	*/
+/*	$OpenBSD: openfirm.c,v 1.8 2002/03/15 18:19:52 millert Exp $	*/
 /*	$NetBSD: openfirm.c,v 1.13 2001/06/21 00:08:02 eeh Exp $	*/
 
 /*
@@ -323,16 +323,7 @@ OF_package_to_path(phandle, buf, buflen)
  * The following two functions may need to be re-worked to be 64-bit clean.
  */
 int
-#ifdef	__STDC__
 OF_call_method(char *method, int ihandle, int nargs, int nreturns, ...)
-#else
-OF_call_method(method, ihandle, nargs, nreturns, va_alist)
-	char *method;
-	int ihandle;
-	int nargs;
-	int nreturns;
-	va_dcl
-#endif
 {
 	va_list ap;
 	struct {
@@ -370,15 +361,7 @@ OF_call_method(method, ihandle, nargs, nreturns, va_alist)
 }
 
 int
-#ifdef	__STDC__
 OF_call_method_1(char *method, int ihandle, int nargs, ...)
-#else
-OF_call_method_1(method, ihandle, nargs, va_alist)
-	char *method;
-	int ihandle;
-	int nargs;
-	va_dcl
-#endif
 {
 	va_list ap;
 	struct {
@@ -726,14 +709,7 @@ OF_set_symbol_lookup(s2v, v2s)
 }
 
 int
-#ifdef	__STDC__
 OF_interpret(char *cmd, int nreturns, ...)
-#else
-OF_interpret(cmd, nreturns, va_alist)
-	char *cmd;
-	int nreturns;
-	va_dcl
-#endif
 {
 	va_list ap;
 	struct {