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

the ANSI way.

11 files changed, 12 insertions, 95 deletions

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;