ANSIfy netinet/; from David Hill

6 files changed, 38 insertions, 97 deletions

diff --git a/sys/netinet/ip_ecn.c b/sys/netinet/ip_ecn.c
index b26c73e447f..e5d6cf249bb 100644
--- a/sys/netinet/ip_ecn.c
+++ b/sys/netinet/ip_ecn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ecn.c,v 1.7 2014/12/19 17:14:40 tedu Exp $	*/
+/*	$OpenBSD: ip_ecn.c,v 1.8 2016/09/24 14:51:37 naddy Exp $	*/
 /*	$KAME: ip_ecn.c,v 1.9 2000/10/01 12:44:48 itojun Exp $	*/
 
 /*
@@ -84,10 +84,7 @@
  * call it after you've done the default initialization/copy for the outer.
  */
 void
-ip_ecn_ingress(mode, outer, inner)
-	int mode;
-	u_int8_t *outer;
-	u_int8_t *inner;
+ip_ecn_ingress(int mode, u_int8_t *outer, u_int8_t *inner)
 {
 	if (!outer || !inner)
 		panic("NULL pointer passed to ip_ecn_ingress");
@@ -120,10 +117,7 @@ ip_ecn_ingress(mode, outer, inner)
  * the caller should drop the packet if the return value is 0.
  */
 int
-ip_ecn_egress(mode, outer, inner)
-	int mode;
-	u_int8_t *outer;
-	u_int8_t *inner;
+ip_ecn_egress(int mode, u_int8_t *outer, u_int8_t *inner)
 {
 	if (!outer || !inner)
 		panic("NULL pointer passed to ip_ecn_egress");
diff --git a/sys/netinet/ip_ether.c b/sys/netinet/ip_ether.c
index baa2d61c4b3..08363ae55fa 100644
--- a/sys/netinet/ip_ether.c
+++ b/sys/netinet/ip_ether.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ether.c,v 1.80 2015/12/02 08:47:00 claudio Exp $  */
+/*	$OpenBSD: ip_ether.c,v 1.81 2016/09/24 14:51:37 naddy Exp $  */
 /*
  * The author of this code is Angelos D. Keromytis (kermit@adk.gr)
  *
@@ -507,11 +507,8 @@ etherip_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int proto)
 }
 
 int
-etherip_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
-	int *name;
-	u_int namelen;
-	void *oldp, *newp;
-	size_t *oldlenp, newlen;
+etherip_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
+    void *newp, size_t newlen)
 {
 	/* All sysctl names at this level are terminal. */
 	if (namelen != 1)
diff --git a/sys/netinet/ip_ipcomp.c b/sys/netinet/ip_ipcomp.c
index 721fe0f40e0..237cb8bd809 100644
--- a/sys/netinet/ip_ipcomp.c
+++ b/sys/netinet/ip_ipcomp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipcomp.c,v 1.47 2016/09/13 19:56:55 markus Exp $ */
+/* $OpenBSD: ip_ipcomp.c,v 1.48 2016/09/24 14:51:37 naddy Exp $ */
 
 /*
  * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org)
@@ -80,10 +80,7 @@ ipcomp_attach(void)
  * ipcomp_init() is called when an CPI is being set up.
  */
 int
-ipcomp_init(tdbp, xsp, ii)
-	struct tdb     *tdbp;
-	struct xformsw *xsp;
-	struct ipsecinit *ii;
+ipcomp_init(struct tdb *tdbp, struct xformsw *xsp, struct ipsecinit *ii)
 {
 	struct comp_algo *tcomp = NULL;
 	struct cryptoini cric;
@@ -120,8 +117,7 @@ ipcomp_init(tdbp, xsp, ii)
  * ipcomp_zeroize() used when IPCA is deleted
  */
 int
-ipcomp_zeroize(tdbp)
-	struct tdb *tdbp;
+ipcomp_zeroize(struct tdb *tdbp)
 {
 	int err;
 
@@ -134,11 +130,7 @@ ipcomp_zeroize(tdbp)
  * ipcomp_input() gets called to uncompress an input packet
  */
 int
-ipcomp_input(m, tdb, skip, protoff)
-	struct mbuf    *m;
-	struct tdb     *tdb;
-	int             skip;
-	int             protoff;
+ipcomp_input(struct mbuf *m, struct tdb *tdb, int skip, int protoff)
 {
 	struct comp_algo *ipcompx = (struct comp_algo *) tdb->tdb_compalgxform;
 	struct tdb_crypto *tc;
@@ -361,12 +353,8 @@ baddone:
  * IPComp output routine, called by ipsp_process_packet()
  */
 int
-ipcomp_output(m, tdb, mp, skip, protoff)
-	struct mbuf    *m;
-	struct tdb     *tdb;
-	struct mbuf   **mp;
-	int             skip;
-	int             protoff;
+ipcomp_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip,
+    int protoff)
 {
 	struct comp_algo *ipcompx = (struct comp_algo *) tdb->tdb_compalgxform;
 	int             hlen;
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index bd0692d5f24..8520d6e5a01 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_subr.c,v 1.155 2016/09/15 02:00:18 dlg Exp $	*/
+/*	$OpenBSD: tcp_subr.c,v 1.156 2016/09/24 14:51:37 naddy Exp $	*/
 /*	$NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $	*/
 
 /*
@@ -186,8 +186,7 @@ tcp_init(void)
  * into just an IP overlay pointer, with casting as appropriate for v6. rja
  */
 struct mbuf *
-tcp_template(tp)
-	struct tcpcb *tp;
+tcp_template(struct tcpcb *tp)
 {
 	struct inpcb *inp = tp->t_inpcb;
 	struct mbuf *m;
@@ -488,9 +487,7 @@ tcp_newtcpcb(struct inpcb *inp)
  * then send a RST to peer.
  */
 struct tcpcb *
-tcp_drop(tp, errno)
-	struct tcpcb *tp;
-	int errno;
+tcp_drop(struct tcpcb *tp, int errno)
 {
 	struct socket *so = tp->t_inpcb->inp_socket;
 
@@ -595,9 +592,7 @@ tcp_rscale(struct tcpcb *tp, u_long hiwat)
  * (for now, won't do anything until can select for soft error).
  */
 void
-tcp_notify(inp, error)
-	struct inpcb *inp;
-	int error;
+tcp_notify(struct inpcb *inp, int error)
 {
 	struct tcpcb *tp = intotcpcb(inp);
 	struct socket *so = inp->inp_socket;
@@ -863,9 +858,7 @@ tcp_ctlinput(int cmd, struct sockaddr *sa, u_int rdomain, void *v)
  * Path MTU Discovery handlers.
  */
 void
-tcp6_mtudisc_callback(sin6, rdomain)
-	struct sockaddr_in6 *sin6;
-	u_int rdomain;
+tcp6_mtudisc_callback(struct sockaddr_in6 *sin6, u_int rdomain)
 {
 	(void) in6_pcbnotify(&tcbtable, sin6, 0,
 	    &sa6_any, 0, rdomain, PRC_MSGSIZE, NULL, tcp_mtudisc);
@@ -878,9 +871,7 @@ tcp6_mtudisc_callback(sin6, rdomain)
  * that all packets will be received.
  */
 void
-tcp_mtudisc(inp, errno)
-	struct inpcb *inp;
-	int errno;
+tcp_mtudisc(struct inpcb *inp, int errno)
 {
 	struct tcpcb *tp = intotcpcb(inp);
 	struct rtentry *rt = in_pcbrtentry(inp);
@@ -913,9 +904,7 @@ tcp_mtudisc(inp, errno)
 }
 
 void
-tcp_mtudisc_increase(inp, errno)
-	struct inpcb *inp;
-	int errno;
+tcp_mtudisc_increase(struct inpcb *inp, int errno)
 {
 	struct tcpcb *tp = intotcpcb(inp);
 	struct rtentry *rt = in_pcbrtentry(inp);
@@ -985,10 +974,8 @@ tcp_signature_tdb_attach(void)
 }
 
 int
-tcp_signature_tdb_init(tdbp, xsp, ii)
-	struct tdb *tdbp;
-	struct xformsw *xsp;
-	struct ipsecinit *ii;
+tcp_signature_tdb_init(struct tdb *tdbp, struct xformsw *xsp,
+    struct ipsecinit *ii)
 {
 	if ((ii->ii_authkeylen < 1) || (ii->ii_authkeylen > 80))
 		return (EINVAL);
@@ -1003,8 +990,7 @@ tcp_signature_tdb_init(tdbp, xsp, ii)
 }
 
 int
-tcp_signature_tdb_zeroize(tdbp)
-	struct tdb *tdbp;
+tcp_signature_tdb_zeroize(struct tdb *tdbp)
 {
 	if (tdbp->tdb_amxkey) {
 		explicit_bzero(tdbp->tdb_amxkey, tdbp->tdb_amxkeylen);
@@ -1016,29 +1002,20 @@ tcp_signature_tdb_zeroize(tdbp)
 }
 
 int
-tcp_signature_tdb_input(m, tdbp, skip, protoff)
-	struct mbuf *m;
-	struct tdb *tdbp;
-	int skip, protoff;
+tcp_signature_tdb_input(struct mbuf *m, struct tdb *tdbp, int skip, int protoff)
 {
 	return (0);
 }
 
 int
-tcp_signature_tdb_output(m, tdbp, mp, skip, protoff)
-	struct mbuf *m;
-	struct tdb *tdbp;
-	struct mbuf **mp;
-	int skip, protoff;
+tcp_signature_tdb_output(struct mbuf *m, struct tdb *tdbp, struct mbuf **mp,
+    int skip, int protoff)
 {
 	return (EINVAL);
 }
 
 int
-tcp_signature_apply(fstate, data, len)
-	caddr_t fstate;
-	caddr_t data;
-	unsigned int len;
+tcp_signature_apply(caddr_t fstate, caddr_t data, unsigned int len)
 {
 	MD5Update((MD5_CTX *)fstate, (char *)data, len);
 	return 0;
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 1e6c76aedc6..6f4f07e70de 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_timer.c,v 1.49 2016/03/07 18:44:00 naddy Exp $	*/
+/*	$OpenBSD: tcp_timer.c,v 1.50 2016/09/24 14:51:37 naddy Exp $	*/
 /*	$NetBSD: tcp_timer.c,v 1.14 1996/02/13 23:44:09 christos Exp $	*/
 
 /*
@@ -144,8 +144,7 @@ tcp_slowtimo(void)
  * Cancel all timers for TCP tp.
  */
 void
-tcp_canceltimers(tp)
-	struct tcpcb *tp;
+tcp_canceltimers(struct tcpcb *tp)
 {
 	int i;
 
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 9fbcecf3f42..a530575f07b 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_usrreq.c,v 1.134 2016/07/20 19:57:53 bluhm Exp $	*/
+/*	$OpenBSD: tcp_usrreq.c,v 1.135 2016/09/24 14:51:37 naddy Exp $	*/
 /*	$NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $	*/
 
 /*
@@ -124,11 +124,8 @@ int tcp_ident(void *, size_t *, void *, size_t, int);
  */
 /*ARGSUSED*/
 int
-tcp_usrreq(so, req, m, nam, control, p)
-	struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-	struct proc *p;
+tcp_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
+    struct mbuf *control, struct proc *p)
 {
 	struct sockaddr_in *sin;
 	struct inpcb *inp;
@@ -455,11 +452,8 @@ tcp_usrreq(so, req, m, nam, control, p)
 }
 
 int
-tcp_ctloutput(op, so, level, optname, mp)
-	int op;
-	struct socket *so;
-	int level, optname;
-	struct mbuf **mp;
+tcp_ctloutput(int op, struct socket *so, int level, int optname,
+    struct mbuf **mp)
 {
 	int error = 0, s;
 	struct inpcb *inp;
@@ -626,8 +620,7 @@ tcp_ctloutput(op, so, level, optname, mp)
  * bufer space, and entering LISTEN state if to accept connections.
  */
 int
-tcp_attach(so)
-	struct socket *so;
+tcp_attach(struct socket *so)
 {
 	struct tcpcb *tp;
 	struct inpcb *inp;
@@ -676,8 +669,7 @@ tcp_attach(so)
  * send segment to peer (with FIN).
  */
 struct tcpcb *
-tcp_disconnect(tp)
-	struct tcpcb *tp;
+tcp_disconnect(struct tcpcb *tp)
 {
 	struct socket *so = tp->t_inpcb->inp_socket;
 
@@ -706,8 +698,7 @@ tcp_disconnect(tp)
  * We can let the user exit from the close as soon as the FIN is acked.
  */
 struct tcpcb *
-tcp_usrclosed(tp)
-	struct tcpcb *tp;
+tcp_usrclosed(struct tcpcb *tp)
 {
 
 	switch (tp->t_state) {
@@ -858,13 +849,8 @@ tcp_ident(void *oldp, size_t *oldlenp, void *newp, size_t newlen, int dodrop)
  * Sysctl for tcp variables.
  */
 int
-tcp_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
-	int *name;
-	u_int namelen;
-	void *oldp;
-	size_t *oldlenp;
-	void *newp;
-	size_t newlen;
+tcp_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
+    size_t newlen)
 {
 	int error, nval;