diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-03-15 18:19:54 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-03-15 18:19:54 +0000 |
| commit | de0519636e72969a9359cf27a32e00375235e343 (patch) | |
| tree | 3670fa3ad7bf3bf88d6e1ab3add73f82987d555e | |
| parent | e018051dbb8764df0d8660f8e0e82fa3eaefb0c4 (diff) | |
Kill #if __STDC__ used to do K&R vs. ANSI varargs/stdarg; just do things
the ANSI way.
50 files changed, 52 insertions, 667 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 { diff --git a/sys/crypto/blf.c b/sys/crypto/blf.c index e321a46c4c1..e28015e6643 100644 --- a/sys/crypto/blf.c +++ b/sys/crypto/blf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: blf.c,v 1.3 2000/06/17 23:36:22 provos Exp $ */ +/* $OpenBSD: blf.c,v 1.4 2002/03/15 18:19:52 millert Exp $ */ /* * Blowfish block cipher for OpenBSD @@ -398,16 +398,8 @@ Blowfish_initstate(c) } -#ifdef __STDC__ u_int32_t Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, u_int16_t *current) -#else -u_int32_t -Blowfish_stream2word(data, databytes, current) - const u_int8_t *data; - u_int16_t databytes; - u_int16_t *current; -#endif { u_int8_t i; u_int16_t j; @@ -426,16 +418,8 @@ Blowfish_stream2word(data, databytes, current) return temp; } -#if __STDC__ void Blowfish_expand0state(blf_ctx *c, const u_int8_t *key, u_int16_t keybytes) -#else -void -Blowfish_expand0state(c, key, keybytes) - blf_ctx *c; - const u_int8_t *key; - u_int16_t keybytes; -#endif { u_int16_t i; u_int16_t j; @@ -471,19 +455,9 @@ Blowfish_expand0state(c, key, keybytes) } -#if __STDC__ void Blowfish_expandstate(blf_ctx *c, const u_int8_t *data, u_int16_t databytes, const u_int8_t *key, u_int16_t keybytes) -#else -void -Blowfish_expandstate(c, data, databytes, key, keybytes) - blf_ctx *c; - const u_int8_t *data; - u_int16_t databytes; - const u_int8_t *key; - u_int16_t keybytes; -#endif { u_int16_t i; u_int16_t j; @@ -523,16 +497,8 @@ Blowfish_expandstate(c, data, databytes, key, keybytes) } -#if __STDC__ void blf_key(blf_ctx *c, const u_int8_t *k, u_int16_t len) -#else -void -blf_key(c, k, len) - blf_ctx *c; - const u_int8_t *k; - u_int16_t len; -#endif { /* Initalize S-boxes and subkeys with Pi */ Blowfish_initstate(c); @@ -541,16 +507,8 @@ blf_key(c, k, len) Blowfish_expand0state(c, k, len); } -#if __STDC__ void blf_enc(blf_ctx *c, u_int32_t *data, u_int16_t blocks) -#else -void -blf_enc(c, data, blocks) - blf_ctx *c; - u_int32_t *data; - u_int16_t blocks; -#endif { u_int32_t *d; u_int16_t i; @@ -562,16 +520,8 @@ blf_enc(c, data, blocks) } } -#if __STDC__ void blf_dec(blf_ctx *c, u_int32_t *data, u_int16_t blocks) -#else -void -blf_dec(c, data, blocks) - blf_ctx *c; - u_int32_t *data; - u_int16_t blocks; -#endif { u_int32_t *d; u_int16_t i; @@ -583,16 +533,8 @@ blf_dec(c, data, blocks) } } -#if __STDC__ void blf_ecb_encrypt(blf_ctx *c, u_int8_t *data, u_int32_t len) -#else -void -blf_ecb_encrypt(c, data, len) - blf_ctx *c; - u_int8_t *data; - u_int32_t len; -#endif { u_int32_t l, r, d[2]; u_int32_t i; @@ -617,16 +559,8 @@ blf_ecb_encrypt(c, data, len) } } -#if __STDC__ void blf_ecb_decrypt(blf_ctx *c, u_int8_t *data, u_int32_t len) -#else -void -blf_ecb_decrypt(c, data, len) - blf_ctx *c; - u_int8_t *data; - u_int32_t len; -#endif { u_int32_t l, r, d[2]; u_int32_t i; @@ -651,17 +585,8 @@ blf_ecb_decrypt(c, data, len) } } -#if __STDC__ void blf_cbc_encrypt(blf_ctx *c, u_int8_t *iv, u_int8_t *data, u_int32_t len) -#else -void -blf_cbc_encrypt(c, iv, data, len) - blf_ctx *c; - u_int8_t *iv; - u_int8_t *data; - u_int32_t len; -#endif { u_int32_t l, r, d[2]; u_int32_t i, j; @@ -689,17 +614,8 @@ blf_cbc_encrypt(c, iv, data, len) } } -#if __STDC__ void blf_cbc_decrypt(blf_ctx *c, u_int8_t *iva, u_int8_t *data, u_int32_t len) -#else -void -blf_cbc_decrypt(c, iva, data, len) - blf_ctx *c; - u_int8_t *iva; - u_int8_t *data; - u_int32_t len; -#endif { u_int32_t l, r, d[2]; u_int8_t *iv; diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index c0b5766f0ce..a1de22a917b 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_kthread.c,v 1.16 2002/03/14 01:27:04 millert Exp $ */ +/* $OpenBSD: kern_kthread.c,v 1.17 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: kern_kthread.c,v 1.3 1998/12/22 21:21:36 kleink Exp $ */ /*- @@ -61,17 +61,8 @@ * The VM space and limits, etc. will be shared with proc0. */ int -#if __STDC__ kthread_create(void (*func)(void *), void *arg, struct proc **newpp, const char *fmt, ...) -#else -kthread_create(func, arg, newpp, fmt, va_alist) - void (*func)(void *); - void *arg; - struct proc **newpp; - const char *fmt; - va_dcl -#endif { struct proc *p2; register_t rv[2]; 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; diff --git a/sys/lib/libsa/exit.c b/sys/lib/libsa/exit.c index 7486a180968..d1b22eb9afe 100644 --- a/sys/lib/libsa/exit.c +++ b/sys/lib/libsa/exit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exit.c,v 1.5 2002/03/14 01:27:07 millert Exp $ */ +/* $OpenBSD: exit.c,v 1.6 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: exit.c,v 1.11 1996/12/01 20:22:19 pk Exp $ */ /*- @@ -28,21 +28,13 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef __STDC__ + #include <machine/stdarg.h> -#else -#include <machine/varargs.h> -#endif #include "stand.h" __dead void -#ifdef __STDC__ panic(const char *fmt, ...) -#else -panic(fmt /*, va_alist */) - char *fmt; -#endif { extern void closeall(void); va_list ap; @@ -53,11 +45,7 @@ panic(fmt /*, va_alist */) closeall(); } -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vprintf(fmt, ap); printf("\n"); va_end(ap); diff --git a/sys/lib/libsa/printf.c b/sys/lib/libsa/printf.c index 4dfe0ea69de..b3ea67de348 100644 --- a/sys/lib/libsa/printf.c +++ b/sys/lib/libsa/printf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printf.c,v 1.16 2002/03/14 03:16:10 millert Exp $ */ +/* $OpenBSD: printf.c,v 1.17 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: printf.c,v 1.10 1996/11/30 04:19:21 gwr Exp $ */ /*- @@ -61,11 +61,7 @@ #include <sys/cdefs.h> #include <sys/types.h> -#ifdef __STDC__ #include <machine/stdarg.h> -#else -#include <machine/varargs.h> -#endif #include "stand.h" @@ -84,21 +80,12 @@ sputchar(c) } void -#ifdef __STDC__ sprintf(char *buf, const char *fmt, ...) -#else -sprintf(buf, fmt, va_alist) - char *buf, *fmt; -#endif { va_list ap; sbuf = buf; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif kdoprnt(sputchar, fmt, ap); va_end(ap); *sbuf = '\0'; @@ -106,20 +93,11 @@ sprintf(buf, fmt, va_alist) #endif /* NO_SPRINTF */ void -#ifdef __STDC__ printf(const char *fmt, ...) -#else -printf(fmt, va_alist) - char *fmt; -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif kdoprnt(putchar, fmt, ap); va_end(ap); } diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h index e455a713206..bd012095eea 100644 --- a/sys/lib/libsa/stand.h +++ b/sys/lib/libsa/stand.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stand.h,v 1.38 2002/03/14 03:16:10 millert Exp $ */ +/* $OpenBSD: stand.h,v 1.39 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $ */ /*- @@ -39,11 +39,7 @@ #include <sys/types.h> #include <sys/cdefs.h> #include <sys/stat.h> -#ifdef __STDC__ #include <machine/stdarg.h> -#else -#include <machine/varargs.h> -#endif #include "saioctl.h" #include "saerrno.h" diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c index bd97bb1e68b..a4cc2293e3b 100644 --- a/sys/net/raw_usrreq.c +++ b/sys/net/raw_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_usrreq.c,v 1.4 2001/12/11 05:13:37 jason Exp $ */ +/* $OpenBSD: raw_usrreq.c,v 1.5 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: raw_usrreq.c,v 1.11 1996/02/13 22:00:43 christos Exp $ */ /* @@ -71,13 +71,7 @@ raw_init() * Raw protocol interface. */ void -#if __STDC__ raw_input(struct mbuf *m0, ...) -#else -raw_input(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { register struct rawcb *rp; register struct mbuf *m = m0; diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 8375c732d23..b7f94bd7278 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtsock.c,v 1.20 2002/03/14 01:27:10 millert Exp $ */ +/* $OpenBSD: rtsock.c,v 1.21 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $ */ /* @@ -176,13 +176,7 @@ route_usrreq(so, req, m, nam, control) /*ARGSUSED*/ int -#if __STDC__ route_output(struct mbuf *m, ...) -#else -route_output(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register struct rt_msghdr *rtm = 0; register struct radix_node *rn = 0; diff --git a/sys/netatalk/ddp_output.c b/sys/netatalk/ddp_output.c index 83759dc34b4..6d16cb0fae8 100644 --- a/sys/netatalk/ddp_output.c +++ b/sys/netatalk/ddp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ddp_output.c,v 1.4 2002/03/14 01:27:10 millert Exp $ */ +/* $OpenBSD: ddp_output.c,v 1.5 2002/03/15 18:19:52 millert Exp $ */ /* * Copyright (c) 1990,1991 Regents of The University of Michigan. @@ -99,13 +99,7 @@ int ddp_route(struct mbuf *, struct route * ); int ddp_cksum = 1; int -#if __STDC__ ddp_output(struct mbuf *m, ...) -#else -ddp_output(m, va_alist) - struct mbuf *m; - va_dcl -#endif { struct ddpcb *ddp; struct ddpehdr *deh; diff --git a/sys/netccitt/hd_output.c b/sys/netccitt/hd_output.c index 3ffca89ca57..bb8f77ee0ad 100644 --- a/sys/netccitt/hd_output.c +++ b/sys/netccitt/hd_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hd_output.c,v 1.3 1996/05/10 12:31:15 deraadt Exp $ */ +/* $OpenBSD: hd_output.c,v 1.4 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: hd_output.c,v 1.7 1996/05/07 02:36:06 thorpej Exp $ */ /* @@ -70,13 +70,7 @@ */ int -#if __STDC__ hd_output(struct mbuf *m0, ...) -#else -hd_output(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { register struct hdcb *hdp; register struct mbuf *m = m0; @@ -211,13 +205,7 @@ hd_send_iframe(hdp, buf, poll_bit) } int -#if __STDC__ hd_ifoutput(struct mbuf *m, ...) -#else -hd_ifoutput(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register struct hdcb *hdp; register struct ifnet *ifp; diff --git a/sys/netccitt/llc_input.c b/sys/netccitt/llc_input.c index 7bc5ea257a9..c21950bc133 100644 --- a/sys/netccitt/llc_input.c +++ b/sys/netccitt/llc_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: llc_input.c,v 1.2 1996/03/04 07:36:30 niklas Exp $ */ +/* $OpenBSD: llc_input.c,v 1.3 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: llc_input.c,v 1.3 1996/02/13 22:04:44 christos Exp $ */ /* @@ -306,13 +306,7 @@ llcintr() * are then enacted accordingly. */ int -#if __STDC__ llc_input(struct mbuf *m, ...) -#else -llc_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { int frame_kind; int pollfinal; diff --git a/sys/netccitt/llc_output.c b/sys/netccitt/llc_output.c index 81ca88a4cb2..d42090d972a 100644 --- a/sys/netccitt/llc_output.c +++ b/sys/netccitt/llc_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: llc_output.c,v 1.3 1999/01/11 05:12:29 millert Exp $ */ +/* $OpenBSD: llc_output.c,v 1.4 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: llc_output.c,v 1.3 1996/02/13 22:04:47 christos Exp $ */ /* @@ -69,13 +69,7 @@ */ int -#if __STDC__ llc_output(struct mbuf *m, ...) -#else -llc_output(m, va_alist) - struct mbuf *m; - va_dcl -#endif { struct llc_linkcb *linkp; register int i = splimp(); diff --git a/sys/netccitt/pk_input.c b/sys/netccitt/pk_input.c index 47a1ab59cd6..c1a6653b41c 100644 --- a/sys/netccitt/pk_input.c +++ b/sys/netccitt/pk_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk_input.c,v 1.4 2002/03/14 01:27:10 millert Exp $ */ +/* $OpenBSD: pk_input.c,v 1.5 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: pk_input.c,v 1.7 1996/02/13 22:05:21 christos Exp $ */ /* @@ -340,13 +340,7 @@ struct mbuf_cache pk_input_cache = {0}; ((xp)->packet_cause >= X25_RESTART_DTE_ORIGINATED2)) void -#if __STDC__ pk_input(struct mbuf *m, ...) -#else -pk_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register struct x25_packet *xp; register struct pklcd *lcp; diff --git a/sys/netccitt/pk_subr.c b/sys/netccitt/pk_subr.c index 3ed2f844d64..23b21500098 100644 --- a/sys/netccitt/pk_subr.c +++ b/sys/netccitt/pk_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk_subr.c,v 1.5 2002/03/14 01:27:10 millert Exp $ */ +/* $OpenBSD: pk_subr.c,v 1.6 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: pk_subr.c,v 1.12 1996/03/30 21:54:33 christos Exp $ */ /* @@ -1142,15 +1142,7 @@ format_ntn(xcp) /* VARARGS1 */ void -#if __STDC__ pk_message(int lcn, struct x25config * xcp, char * fmt,...) -#else -pk_message(lcn, xcp, fmt, va_alist) - int lcn; - struct x25config *xcp; - char *fmt; - va_dcl -#endif { va_list ap; diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 510f5d8b940..d1535c3f728 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: igmp.c,v 1.13 2002/03/14 01:27:11 millert Exp $ */ +/* $OpenBSD: igmp.c,v 1.14 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: igmp.c,v 1.15 1996/02/13 23:41:25 christos Exp $ */ /* @@ -118,13 +118,7 @@ rti_delete(ifp) } void -#if __STDC__ igmp_input(struct mbuf *m, ...) -#else -igmp_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register int iphlen; register struct ifnet *ifp = m->m_pkthdr.rcvif; diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index 5112b109332..4bf0d4e518c 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_gif.c,v 1.22 2001/12/07 09:32:45 itojun Exp $ */ +/* $OpenBSD: in_gif.c,v 1.23 2002/03/15 18:19:52 millert Exp $ */ /* $KAME: in_gif.c,v 1.50 2001/01/22 07:27:16 itojun Exp $ */ /* @@ -166,13 +166,7 @@ in_gif_output(ifp, family, m, rt) } void -#if __STDC__ in_gif_input(struct mbuf *m, ...) -#else -in_gif_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { int off; struct gif_softc *sc; diff --git a/sys/netinet/ip_ether.c b/sys/netinet/ip_ether.c index 3dbbd91fd4d..11fd4a84637 100644 --- a/sys/netinet/ip_ether.c +++ b/sys/netinet/ip_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ether.c,v 1.36 2001/11/29 08:20:50 itojun Exp $ */ +/* $OpenBSD: ip_ether.c,v 1.37 2002/03/15 18:19:52 millert Exp $ */ /* * The author of this code is Angelos D. Keromytis (kermit@adk.gr) * @@ -74,13 +74,7 @@ struct etheripstat etheripstat; */ void -#if __STDC__ etherip_input(struct mbuf *m, ...) -#else -etherip_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { union sockaddr_union ssrc, sdst; struct ether_header eh; diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c index 9e559d76df7..591b92104ed 100644 --- a/sys/netinet/ip_gre.c +++ b/sys/netinet/ip_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_gre.c,v 1.14 2002/03/14 03:16:11 millert Exp $ */ +/* $OpenBSD: ip_gre.c,v 1.15 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: ip_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -216,13 +216,7 @@ gre_input2(m , hlen, proto) * IPPROTO_GRE and a local destination address). */ void -#if __STDC__ gre_input(struct mbuf *m, ...) -#else -gre_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register int hlen,ret; va_list ap; @@ -254,13 +248,7 @@ gre_input(m, va_alist) */ void -#if __STDC__ gre_mobile_input(struct mbuf *m, ...) -#else -gre_mobile_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register struct ip *ip = mtod(m, struct ip *); register struct mobip_h *mip = mtod(m, struct mobip_h *); diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 3214ae7ca00..796821178e7 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_icmp.c,v 1.46 2002/03/14 01:27:11 millert Exp $ */ +/* $OpenBSD: ip_icmp.c,v 1.47 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: ip_icmp.c,v 1.19 1996/02/13 23:42:22 christos Exp $ */ /* @@ -286,13 +286,7 @@ struct sockaddr_in icmpmask = { 8, 0 }; * Process a received ICMP message. */ void -#if __STDC__ icmp_input(struct mbuf *m, ...) -#else -icmp_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register struct icmp *icp; register struct ip *ip = mtod(m, struct ip *); diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c index d7aa583dfce..14bb58daffe 100644 --- a/sys/netinet/ip_id.c +++ b/sys/netinet/ip_id.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_id.c,v 1.5 2002/03/14 01:27:11 millert Exp $ */ +/* $OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $ */ /* * Copyright 1998 Niels Provos <provos@citi.umich.edu> @@ -92,14 +92,8 @@ u_int16_t ip_randomid(void); * of 0 - (mod-1) */ -#ifdef __STDC__ static u_int16_t pmod(u_int16_t gen, u_int16_t exp, u_int16_t mod) -#else -static u_int16_t -pmod(gen, exp, mod) - u_int16_t gen, exp, mod; -#endif { u_int16_t s, t, u; diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 44ae469845b..e8d374ed6bf 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_mroute.c,v 1.24 2002/03/14 01:27:11 millert Exp $ */ +/* $OpenBSD: ip_mroute.c,v 1.25 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: ip_mroute.c,v 1.27 1996/05/07 02:40:50 thorpej Exp $ */ /* @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * @(#)ip_mroute.c 8.2 (Berkeley) 11/15/93 - * $Id: ip_mroute.c,v 1.24 2002/03/14 01:27:11 millert Exp $ + * $Id: ip_mroute.c,v 1.25 2002/03/15 18:19:52 millert Exp $ */ /* @@ -1496,13 +1496,7 @@ encap_send(ip, vifp, m) * ENCAP_PROTO and a local destination address). */ void -#if __STDC__ ipip_mroute_input(struct mbuf *m, ...) -#else -ipip_mroute_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register int hlen; register struct ip *ip = mtod(m, struct ip *); diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 3c30b4ad900..be3c4403aca 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.142 2002/03/14 01:27:11 millert Exp $ */ +/* $OpenBSD: ip_output.c,v 1.143 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -97,13 +97,7 @@ static void ip_mloopback(struct ifnet *, struct mbuf *, struct sockaddr_in *); * The mbuf opt, if present, will not be freed. */ int -#if __STDC__ ip_output(struct mbuf *m0, ...) -#else -ip_output(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { register struct ip *ip, *mhip; register struct ifnet *ifp; diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index c9c4b08002b..1af29e3b207 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ip.c,v 1.24 2001/06/23 16:15:56 fgsch Exp $ */ +/* $OpenBSD: raw_ip.c,v 1.25 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $ */ /* @@ -121,13 +121,7 @@ struct sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET }; * mbuf chain. */ void -#if __STDC__ rip_input(struct mbuf *m, ...) -#else -rip_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register struct ip *ip = mtod(m, struct ip *); register struct inpcb *inp; @@ -184,13 +178,7 @@ rip_input(m, va_alist) * Tack on options user may have setup with control call. */ int -#if __STDC__ rip_output(struct mbuf *m, ...) -#else -rip_output(m, va_alist) - struct mbuf *m; - va_dcl -#endif { struct socket *so; u_long dst; diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 1db524d661f..83f82f07335 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.108 2002/03/09 05:13:04 provos Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.109 2002/03/15 18:19:52 millert Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -386,12 +386,7 @@ tcp6_input(mp, offp, proto) * protocol specification dated September, 1981 very closely. */ void -#if __STDC__ tcp_input(struct mbuf *m, ...) -#else -tcp_input(m, va_alist) - struct mbuf *m; -#endif { struct ip *ip; struct inpcb *inp; diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 0f53ae8bb74..63431eda548 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp_usrreq.c,v 1.75 2002/03/14 01:27:11 millert Exp $ */ +/* $OpenBSD: udp_usrreq.c,v 1.76 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */ /* @@ -151,13 +151,7 @@ udp6_input(mp, offp, proto) #endif void -#if __STDC__ udp_input(struct mbuf *m, ...) -#else -udp_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register struct ip *ip; register struct udphdr *uh; @@ -870,13 +864,7 @@ udp_ctlinput(cmd, sa, v) } int -#if __STDC__ udp_output(struct mbuf *m, ...) -#else -udp_output(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register struct inpcb *inp; struct mbuf *addr, *control; diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 1c7821e371e..2aa0881bbb4 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ip6.c,v 1.8 2002/03/14 01:27:12 millert Exp $ */ +/* $OpenBSD: raw_ip6.c,v 1.9 2002/03/15 18:19:53 millert Exp $ */ /* $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $ */ /* @@ -355,13 +355,7 @@ rip6_ctlinput(cmd, sa, d) * Tack on options user may have setup with control call. */ int -#if __STDC__ rip6_output(struct mbuf *m, ...) -#else -rip6_output(m, va_alist) - struct mbuf *m; - va_dcl -#endif { struct socket *so; struct sockaddr_in6 *dstsock; diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c index 4f5e6622d1e..7163256faaa 100644 --- a/sys/netipx/ipx_usrreq.c +++ b/sys/netipx/ipx_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipx_usrreq.c,v 1.10 2001/11/06 19:53:21 miod Exp $ */ +/* $OpenBSD: ipx_usrreq.c,v 1.11 2002/03/15 18:19:53 millert Exp $ */ /*- * @@ -81,13 +81,7 @@ int ipx_recvspace = IPXRCVQ; * This may also be called for raw listeners. */ void -#if __STDC__ ipx_input(struct mbuf *m, ...) -#else -ipx_input(m, va_alist) - struct mbuf *m; - va_decl -#endif { register struct ipxpcb *ipxp; register struct ipx *ipx = mtod(m, struct ipx *); @@ -172,13 +166,7 @@ ipx_drop(ipxp, errno) } int -#if __STDC__ ipx_output(struct mbuf *m0, ...) -#else -ipx_output(m0, va_alist) - struct mbuf *m0; - va_decl -#endif { register struct mbuf *m; register struct ipx *ipx; diff --git a/sys/netiso/clnp_input.c b/sys/netiso/clnp_input.c index a184970f06b..20ce571e4cd 100644 --- a/sys/netiso/clnp_input.c +++ b/sys/netiso/clnp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clnp_input.c,v 1.3 1996/04/21 22:29:13 deraadt Exp $ */ +/* $OpenBSD: clnp_input.c,v 1.4 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: clnp_input.c,v 1.12 1996/04/13 01:34:26 cgd Exp $ */ /*- @@ -287,13 +287,7 @@ next: * will it be correctly aligned? */ void -#if __STDC__ clnp_input(struct mbuf *m, ...) -#else -clnp_input(m, va_alist) - struct mbuf *m; /* ptr to first mbuf of pkt */ - va_dcl -#endif { struct snpa_hdr *shp; /* subnetwork header */ register struct clnp_fixed *clnp; /* ptr to fixed part of diff --git a/sys/netiso/clnp_output.c b/sys/netiso/clnp_output.c index a07d80a03c7..b1fb89f5365 100644 --- a/sys/netiso/clnp_output.c +++ b/sys/netiso/clnp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clnp_output.c,v 1.3 1996/04/21 22:29:16 deraadt Exp $ */ +/* $OpenBSD: clnp_output.c,v 1.4 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: clnp_output.c,v 1.9 1996/04/13 01:34:32 cgd Exp $ */ /*- @@ -181,13 +181,7 @@ int clnp_id = 0; /* id for segmented dgrams */ * iso_addrmatch1. */ int -#if __STDC__ clnp_output(struct mbuf *m0, ...) -#else -clnp_output(m0, va_alist) - struct mbuf *m0; /* data for the packet */ - va_dcl -#endif { struct isopcb *isop; /* iso pcb */ int datalen;/* number of bytes of data in m0 */ diff --git a/sys/netiso/clnp_raw.c b/sys/netiso/clnp_raw.c index 287f31d7494..3fb5782298a 100644 --- a/sys/netiso/clnp_raw.c +++ b/sys/netiso/clnp_raw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clnp_raw.c,v 1.3 2001/05/16 12:54:06 ho Exp $ */ +/* $OpenBSD: clnp_raw.c,v 1.4 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: clnp_raw.c,v 1.9 1996/02/13 22:08:42 christos Exp $ */ /*- @@ -103,13 +103,7 @@ struct sockproto rclnp_proto = {PF_ISO, 0}; * indicating no protocol. */ void -#if __STDC__ rclnp_input(struct mbuf *m, ...) -#else -rclnp_input(m, va_alist) - struct mbuf *m; /* ptr to packet */ - va_dcl -#endif { struct sockaddr_iso *src; /* ptr to src address */ struct sockaddr_iso *dst; /* ptr to dest address */ @@ -146,13 +140,7 @@ rclnp_input(m, va_alist) * NOTES: */ int -#if __STDC__ rclnp_output(struct mbuf *m0, ...) -#else -rclnp_output(m0, va_alist) - struct mbuf *m0; /* packet to send */ - va_dcl -#endif { struct socket *so; /* socket to send from */ struct rawisopcb *rp; /* ptr to raw cb */ diff --git a/sys/netiso/cltp_usrreq.c b/sys/netiso/cltp_usrreq.c index 2be18dbdda0..5e1553cffc7 100644 --- a/sys/netiso/cltp_usrreq.c +++ b/sys/netiso/cltp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cltp_usrreq.c,v 1.2 1996/03/04 10:35:06 mickey Exp $ */ +/* $OpenBSD: cltp_usrreq.c,v 1.3 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: cltp_usrreq.c,v 1.9 1996/02/13 22:08:59 christos Exp $ */ /* @@ -79,13 +79,7 @@ int cltp_cksum = 1; /* ARGUSED */ void -#if __STDC__ cltp_input(struct mbuf *m0, ...) -#else -cltp_input(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { struct sockaddr *srcsa, *dstsa; u_int cons_channel; @@ -222,13 +216,7 @@ cltp_ctlinput(cmd, sa, dummy) } int -#if __STDC__ cltp_output(struct mbuf *m, ...) -#else -cltp_output(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register struct isopcb *isop; register int len; diff --git a/sys/netiso/esis.c b/sys/netiso/esis.c index 21a10ff9015..9552b89a956 100644 --- a/sys/netiso/esis.c +++ b/sys/netiso/esis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esis.c,v 1.6 2001/08/19 15:07:34 miod Exp $ */ +/* $OpenBSD: esis.c,v 1.7 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: esis.c,v 1.14 1996/05/07 02:45:04 thorpej Exp $ */ /*- @@ -245,13 +245,7 @@ release: * NOTES: */ void -#if __STDC__ esis_input(struct mbuf *m0, ...) -#else -esis_input(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { struct snpa_hdr *shp; /* subnetwork header */ register struct esis_fixed *pdu = mtod(m0, struct esis_fixed *); @@ -1003,13 +997,7 @@ esis_shoutput(ifp, type, ht, sn_addr, sn_len, isoa) * NOTES: */ void -#if __STDC__ isis_input(struct mbuf *m0, ...) -#else -isis_input(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { struct snpa_hdr *shp; /* subnetwork header */ register struct rawcb *rp, *first_rp = 0; @@ -1072,13 +1060,7 @@ isis_input(m0, va_alist) } int -#if __STDC__ isis_output(struct mbuf *m, ...) -#else -isis_output(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register struct sockaddr_dl *sdl; register struct ifnet *ifp; diff --git a/sys/netiso/idrp_usrreq.c b/sys/netiso/idrp_usrreq.c index c050d256de2..89a39e700a6 100644 --- a/sys/netiso/idrp_usrreq.c +++ b/sys/netiso/idrp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: idrp_usrreq.c,v 1.2 1996/03/04 10:35:20 mickey Exp $ */ +/* $OpenBSD: idrp_usrreq.c,v 1.3 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: idrp_usrreq.c,v 1.5 1996/02/13 22:09:33 christos Exp $ */ /* @@ -88,13 +88,7 @@ idrp_init() * No return value. */ void -#if __STDC__ idrp_input(struct mbuf *m, ...) -#else -idrp_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { struct sockaddr_iso *src, *dst; va_list ap; @@ -121,13 +115,7 @@ bad: m_freem(m); } int -#if __STDC__ idrp_output(struct mbuf *m, ...) -#else -idrp_output(m, va_alist) - struct mbuf *m; - va_dcl -#endif { struct mbuf *addr; register struct sockaddr_iso *siso; diff --git a/sys/netiso/if_eon.c b/sys/netiso/if_eon.c index 9e22247e001..3b97c1f4fd9 100644 --- a/sys/netiso/if_eon.c +++ b/sys/netiso/if_eon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_eon.c,v 1.13 2001/06/27 03:49:54 angelos Exp $ */ +/* $OpenBSD: if_eon.c,v 1.14 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: if_eon.c,v 1.15 1996/05/09 22:29:37 scottr Exp $ */ /*- @@ -447,13 +447,7 @@ flush: } void -#if __STDC__ eoninput(struct mbuf *m, ...) -#else -eoninput(m, va_alist) - struct mbuf *m; - va_dcl -#endif { int iphlen; register struct eon_hdr *eonhdr; diff --git a/sys/netiso/tp_cons.c b/sys/netiso/tp_cons.c index 42a1449fe27..7ecb8657c43 100644 --- a/sys/netiso/tp_cons.c +++ b/sys/netiso/tp_cons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tp_cons.c,v 1.7 2002/03/14 01:27:12 millert Exp $ */ +/* $OpenBSD: tp_cons.c,v 1.8 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: tp_cons.c,v 1.8 1996/02/14 21:32:37 christos Exp $ */ /*- @@ -222,13 +222,7 @@ tpcons_ctlinput(cmd, siso, v) * No return value. */ void -#if __STDC__ tpcons_input(struct mbuf *m, ...) -#else -tpcons_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { struct sockaddr *faddr, *laddr; caddr_t channel; @@ -266,13 +260,7 @@ tpcons_input(m, va_alist) */ int -#if __STDC__ tpcons_output(struct mbuf *m0, ...) -#else -tpcons_output(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { struct isopcb *isop; int datalen; @@ -341,13 +329,7 @@ tpcons_output(m0, va_alist) */ int -#if __STDC__ tpcons_output_dg(struct mbuf *m0, ...) -#else -tpcons_output_dg(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { int datalen; caddr_t chan; @@ -371,13 +353,7 @@ struct mbuf; int tpcons_output(struct mbuf *m0, ...); int -#if __STDC__ tpcons_output(struct mbuf *m0, ...) -#else -tpcons_output(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { return 0; } diff --git a/sys/netiso/tp_inet.c b/sys/netiso/tp_inet.c index ac0de1823de..16b7e6cf434 100644 --- a/sys/netiso/tp_inet.c +++ b/sys/netiso/tp_inet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tp_inet.c,v 1.7 2002/03/14 01:27:12 millert Exp $ */ +/* $OpenBSD: tp_inet.c,v 1.8 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: tp_inet.c,v 1.11 1996/03/16 23:13:49 christos Exp $ */ /*- @@ -374,13 +374,7 @@ tpip_mtu(v) */ int -#if __STDC__ tpip_output(struct mbuf *m0, ...) -#else -tpip_output(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { int datalen; struct inpcb *inp; @@ -417,13 +411,7 @@ tpip_output(m0, va_alist) /* ARGSUSED */ int -#if __STDC__ tpip_output_dg(struct mbuf *m0, ...) -#else -tpip_output_dg(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { int datalen; struct in_addr *laddr, *faddr; @@ -512,13 +500,7 @@ bad: * NOTES: */ void -#if __STDC__ tpip_input(struct mbuf *m, ...) -#else -tpip_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { int iplen; struct sockaddr_in src, dst; diff --git a/sys/netiso/tp_input.c b/sys/netiso/tp_input.c index 1702a4dbc9f..d7c1c1655e7 100644 --- a/sys/netiso/tp_input.c +++ b/sys/netiso/tp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tp_input.c,v 1.4 2002/03/14 01:27:12 millert Exp $ */ +/* $OpenBSD: tp_input.c,v 1.5 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: tp_input.c,v 1.9 1996/03/16 23:13:51 christos Exp $ */ /*- @@ -418,13 +418,7 @@ ok: * reasonable minimum. */ void -#if __STDC__ tp_input(struct mbuf *m, ...) -#else -tp_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { struct sockaddr *faddr, *laddr; /* NSAP addresses */ caddr_t cons_channel; diff --git a/sys/netiso/tp_iso.c b/sys/netiso/tp_iso.c index 89832dc37f5..ce79cf5948b 100644 --- a/sys/netiso/tp_iso.c +++ b/sys/netiso/tp_iso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tp_iso.c,v 1.4 2002/03/14 01:27:12 millert Exp $ */ +/* $OpenBSD: tp_iso.c,v 1.5 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: tp_iso.c,v 1.8 1996/03/16 23:13:54 christos Exp $ */ /*- @@ -386,13 +386,7 @@ tpclnp_mtu(v) */ int -#if __STDC__ tpclnp_output(struct mbuf *m0, ...) -#else -tpclnp_output(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { int datalen; struct isopcb *isop; @@ -439,13 +433,7 @@ tpclnp_output(m0, va_alist) */ int -#if __STDC__ tpclnp_output_dg(struct mbuf *m0, ...) -#else -tpclnp_output_dg(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { struct isopcb tmppcb; int err; @@ -515,13 +503,7 @@ tpclnp_output_dg(m0, va_alist) * No return value. */ void -#if __STDC__ tpclnp_input(struct mbuf *m, ...) -#else -tpclnp_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { struct sockaddr_iso *src, *dst; int clnp_len, ce_bit; diff --git a/sys/netiso/tuba_subr.c b/sys/netiso/tuba_subr.c index caa444ef8c2..d796e4d0ccf 100644 --- a/sys/netiso/tuba_subr.c +++ b/sys/netiso/tuba_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tuba_subr.c,v 1.10 2002/03/14 01:27:12 millert Exp $ */ +/* $OpenBSD: tuba_subr.c,v 1.11 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: tuba_subr.c,v 1.7 1996/02/13 22:12:32 christos Exp $ */ /* @@ -255,13 +255,7 @@ tuba_pcbconnect(v, nam) * No return value. */ void -#if __STDC__ tuba_tcpinput(struct mbuf *m, ...) -#else -tuba_tcpinput(m, va_alist) - struct mbuf *m; /* ptr to first mbuf of pkt */ - va_dcl -#endif { unsigned long lindex, findex; register struct tcpiphdr *ti; diff --git a/sys/netns/idp_usrreq.c b/sys/netns/idp_usrreq.c index 09d778f84f0..0c7070ad276 100644 --- a/sys/netns/idp_usrreq.c +++ b/sys/netns/idp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: idp_usrreq.c,v 1.4 1997/01/18 17:31:02 briggs Exp $ */ +/* $OpenBSD: idp_usrreq.c,v 1.5 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: idp_usrreq.c,v 1.9 1996/02/13 22:13:43 christos Exp $ */ /* @@ -67,13 +67,7 @@ * This may also be called for raw listeners. */ void -#if __STDC__ idp_input(struct mbuf *m, ...) -#else -idp_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register struct nspcb *nsp; register struct idp *idp = mtod(m, struct idp *); @@ -161,13 +155,7 @@ idp_drop(nsp, errno) int noIdpRoute; int -#if __STDC__ idp_output(struct mbuf *m0, ...) -#else -idp_output(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { struct nspcb *nsp; register struct mbuf *m; diff --git a/sys/netns/ns_output.c b/sys/netns/ns_output.c index fe5c1320674..3bfea9f656c 100644 --- a/sys/netns/ns_output.c +++ b/sys/netns/ns_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ns_output.c,v 1.2 1996/03/04 08:20:28 niklas Exp $ */ +/* $OpenBSD: ns_output.c,v 1.3 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: ns_output.c,v 1.8 1996/02/13 22:14:01 christos Exp $ */ /* @@ -61,13 +61,7 @@ int ns_output_cnt = 0; struct mbuf *ns_lastout; int -#if __STDC__ ns_output(struct mbuf *m0, ...) -#else -ns_output(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { struct route *ro; int flags; diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c index 97f83bd067c..48759d4910a 100644 --- a/sys/netns/spp_usrreq.c +++ b/sys/netns/spp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spp_usrreq.c,v 1.11 2001/06/27 03:49:55 angelos Exp $ */ +/* $OpenBSD: spp_usrreq.c,v 1.12 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: spp_usrreq.c,v 1.9 1996/02/13 22:14:13 christos Exp $ */ /* @@ -81,13 +81,7 @@ u_short spp_newchecks[50]; /*ARGSUSED*/ void -#if __STDC__ spp_input(struct mbuf *m, ...) -#else -spp_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { register struct nspcb *nsp; register struct sppcb *cb; @@ -739,13 +733,7 @@ register struct nspcb *nsp; #endif int -#if __STDC__ spp_output(struct mbuf *m0, ...) -#else -spp_output(m0, va_alist) - struct mbuf *m0; - va_dcl -#endif { register struct sppcb *cb = NULL; struct socket *so; diff --git a/sys/scsi/ses.c b/sys/scsi/ses.c index 16112ddbe27..f9ff3546714 100644 --- a/sys/scsi/ses.c +++ b/sys/scsi/ses.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ses.c,v 1.3 2002/03/14 01:27:13 millert Exp $ */ +/* $OpenBSD: ses.c,v 1.4 2002/03/15 18:19:53 millert Exp $ */ /* $NetBSD: ses.c,v 1.3 2000/01/21 21:19:57 mjacob Exp $ */ /* * Copyright (C) 2000 National Aeronautics & Space Administration @@ -594,7 +594,6 @@ ses_runcmd(struct ses_softc *ssc, char *cdb, int cdbl, char *dptr, int *dlenp) return (error); } -#ifdef __STDC__ static void ses_log(struct ses_softc *ssc, const char *fmt, ...) { @@ -605,21 +604,6 @@ ses_log(struct ses_softc *ssc, const char *fmt, ...) vprintf(fmt, ap); va_end(ap); } -#else -static void -ses_log(ssc, fmt, va_alist) - struct ses_softc *ssc; - char *fmt; - va_dcl -{ - va_list ap; - - printf("%s: ", ssc->sc_device.dv_xname); - va_start(ap, fmt); - vprintf(fmt, ap); - va_end(ap); -} -#endif /* * The code after this point runs on many platforms, |