From 0bdb14484506210583060b5be251fed9874a7180 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Sat, 14 Jan 2006 11:44:25 +0000
Subject: [PATCH] * Remove (void) casts for discarded return values.

* Put function types on separate lines.

* Ansify function definitions.

* Remove __P.

In-collaboration-with: Alexey Slynko <slynko@tronet.ru>
---
 sys/netinet6/esp_input.c    |  11 ++--
 sys/netinet6/icmp6.c        |   7 ++-
 sys/netinet6/in6.c          |  12 ++---
 sys/netinet6/in6_gif.c      |   5 +-
 sys/netinet6/in6_ifattach.c |  12 ++---
 sys/netinet6/in6_prefix.c   |   6 +--
 sys/netinet6/ip6_input.c    |   4 +-
 sys/netinet6/ip6_mroute.c   |   4 +-
 sys/netinet6/ip6_output.c   |   6 +--
 sys/netinet6/nd6.c          |   8 +--
 sys/netinet6/nd6_rtr.c      | 104 ++++++++++++++----------------------
 sys/netinet6/scope6.c       |   4 +-
 sys/netinet6/sctp6_usrreq.c |  27 +++-------
 sys/netinet6/sctp6_var.h    |  24 ++++-----
 14 files changed, 96 insertions(+), 138 deletions(-)

diff --git a/sys/netinet6/esp_input.c b/sys/netinet6/esp_input.c
index fc4084131c..417631dbee 100644
--- a/sys/netinet6/esp_input.c
+++ b/sys/netinet6/esp_input.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/esp_input.c,v 1.1.2.8 2003/01/23 21:06:47 sam Exp $	*/
-/*	$DragonFly: src/sys/netinet6/esp_input.c,v 1.9 2004/11/30 19:21:26 joerg Exp $	*/
+/*	$DragonFly: src/sys/netinet6/esp_input.c,v 1.10 2006/01/14 11:44:24 swildner Exp $	*/
 /*	$KAME: esp_input.c,v 1.62 2002/01/07 11:39:57 kjc Exp $	*/
 
 /*
@@ -466,9 +466,7 @@ bad:
 
 #ifdef INET6
 int
-esp6_input(mp, offp, proto)
-	struct mbuf **mp;
-	int *offp, proto;
+esp6_input(struct mbuf **mp, int *offp, int proto)
 {
 	struct mbuf *m = *mp;
 	int off = *offp;
@@ -880,10 +878,7 @@ bad:
 }
 
 void
-esp6_ctlinput(cmd, sa, d)
-	int cmd;
-	struct sockaddr *sa;
-	void *d;
+esp6_ctlinput(int cmd, struct sockaddr *sa, void *d)
 {
 	const struct newesp *espp;
 	struct newesp esp;
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 0f61aa0db9..19a42e5776 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/icmp6.c,v 1.6.2.13 2003/05/06 06:46:58 suz Exp $	*/
-/*	$DragonFly: src/sys/netinet6/icmp6.c,v 1.20 2005/03/04 03:48:25 hsu Exp $	*/
+/*	$DragonFly: src/sys/netinet6/icmp6.c,v 1.21 2006/01/14 11:44:24 swildner Exp $	*/
 /*	$KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $	*/
 
 /*
@@ -1100,8 +1100,7 @@ icmp6_notify_error(struct mbuf *m, int off, int icmp6len, int code)
 		ctlfunc = (void (*) (int, struct sockaddr *, void *))
 			(inet6sw[ip6_protox[nxt]].pr_ctlinput);
 		if (ctlfunc) {
-			(void) (*ctlfunc)(code, (struct sockaddr *)&icmp6dst,
-					  &ip6cp);
+			(*ctlfunc)(code, (struct sockaddr *)&icmp6dst, &ip6cp);
 		}
 	}
 	return(0);
@@ -1887,7 +1886,7 @@ icmp6_rip6_input(struct	mbuf **mp, int	off)
 	rip6src.sin6_len = sizeof(struct sockaddr_in6);
 	rip6src.sin6_family = AF_INET6;
 	/* KAME hack: recover scopeid */
-	(void)in6_recoverscope(&rip6src, &ip6->ip6_src, m->m_pkthdr.rcvif);
+	in6_recoverscope(&rip6src, &ip6->ip6_src, m->m_pkthdr.rcvif);
 
 	LIST_FOREACH(in6p, &ripcbinfo.pcblisthead, inp_list)
 	{
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 97b5c70c81..2be108e9cd 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/in6.c,v 1.7.2.9 2002/04/28 05:40:26 suz Exp $	*/
-/*	$DragonFly: src/sys/netinet6/in6.c,v 1.16 2005/11/28 17:13:46 dillon Exp $	*/
+/*	$DragonFly: src/sys/netinet6/in6.c,v 1.17 2006/01/14 11:44:25 swildner Exp $	*/
 /*	$KAME: in6.c,v 1.259 2002/01/21 11:37:50 keiichi Exp $	*/
 
 /*
@@ -1002,7 +1002,7 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra,
 			llsol.s6_addr32[3] =
 				ifra->ifra_addr.sin6_addr.s6_addr32[3];
 			llsol.s6_addr8[12] = 0xff;
-			(void)in6_addmulti(&llsol, ifp, &error);
+			in6_addmulti(&llsol, ifp, &error);
 			if (error != 0) {
 				log(LOG_WARNING,
 				    "in6_update_ifa: addmulti failed for "
@@ -1036,7 +1036,7 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra,
 				  (struct sockaddr *)&mltmask,
 				  RTF_UP|RTF_CLONING,  /* xxx */
 				  (struct rtentry **)0);
-			(void)in6_addmulti(&mltaddr.sin6_addr, ifp, &error);
+			in6_addmulti(&mltaddr.sin6_addr, ifp, &error);
 			if (error != 0) {
 				log(LOG_WARNING,
 				    "in6_update_ifa: addmulti failed for "
@@ -1054,8 +1054,7 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra,
 		    == 0) {
 			IN6_LOOKUP_MULTI(mltaddr.sin6_addr, ifp, in6m);
 			if (in6m == NULL && ia != NULL) {
-				(void)in6_addmulti(&mltaddr.sin6_addr,
-				    ifp, &error);
+				in6_addmulti(&mltaddr.sin6_addr, ifp, &error);
 				if (error != 0) {
 					log(LOG_WARNING, "in6_update_ifa: "
 					    "addmulti failed for "
@@ -1089,8 +1088,7 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra,
 					  (struct sockaddr *)&mltmask,
 					  RTF_UP,
 					  (struct rtentry **)0);
-				(void)in6_addmulti(&mltaddr.sin6_addr, ifp,
-						   &error);
+				in6_addmulti(&mltaddr.sin6_addr, ifp, &error);
 				if (error != 0) {
 					log(LOG_WARNING, "in6_update_ifa: "
 					    "addmulti failed for %s on %s "
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index c57024f943..42b654604b 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/in6_gif.c,v 1.2.2.7 2003/01/23 21:06:47 sam Exp $	*/
-/*	$DragonFly: src/sys/netinet6/in6_gif.c,v 1.14 2005/03/04 03:48:25 hsu Exp $	*/
+/*	$DragonFly: src/sys/netinet6/in6_gif.c,v 1.15 2006/01/14 11:44:25 swildner Exp $	*/
 /*	$KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $	*/
 
 /*
@@ -222,7 +222,8 @@ in6_gif_output(struct ifnet *ifp,
 #endif
 }
 
-int in6_gif_input(struct mbuf **mp, int *offp, int proto)
+int
+in6_gif_input(struct mbuf **mp, int *offp, int proto)
 {
 	struct mbuf *m = *mp;
 	struct ifnet *gifp = NULL;
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index aa78cddadd..503db454d7 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.2.2.6 2002/04/28 05:40:26 suz Exp $	*/
-/*	$DragonFly: src/sys/netinet6/in6_ifattach.c,v 1.13 2005/06/03 19:56:08 eirikn Exp $	*/
+/*	$DragonFly: src/sys/netinet6/in6_ifattach.c,v 1.14 2006/01/14 11:44:25 swildner Exp $	*/
 /*	$KAME: in6_ifattach.c,v 1.118 2001/05/24 07:44:00 itojun Exp $	*/
 
 /*
@@ -906,8 +906,8 @@ in6_get_tmpifid(struct ifnet *ifp, u_int8_t *retbuf, const u_int8_t *baseid,
 		bcopy(baseid, ndi->randomseed1, sizeof(ndi->randomseed1));
 
 		/* generate_tmp_ifid will update seedn and buf */
-		(void)generate_tmp_ifid(ndi->randomseed0, ndi->randomseed1,
-					ndi->randomid);
+		generate_tmp_ifid(ndi->randomseed0, ndi->randomseed1,
+				  ndi->randomid);
 	}
 	bcopy(ndi->randomid, retbuf, 8);
 }
@@ -934,9 +934,9 @@ in6_tmpaddrtimer(void *ignored_arg)
 			 * We've been generating a random ID on this interface.
 			 * Create a new one.
 			 */
-			(void)generate_tmp_ifid(ndi->randomseed0,
-						ndi->randomseed1,
-						ndi->randomid);
+			generate_tmp_ifid(ndi->randomseed0,
+					  ndi->randomseed1,
+					  ndi->randomid);
 		}
 	}
 
diff --git a/sys/netinet6/in6_prefix.c b/sys/netinet6/in6_prefix.c
index dbd362800b..12f2750c9d 100644
--- a/sys/netinet6/in6_prefix.c
+++ b/sys/netinet6/in6_prefix.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/in6_prefix.c,v 1.4.2.3 2001/07/03 11:01:52 ume Exp $	*/
-/*	$DragonFly: src/sys/netinet6/in6_prefix.c,v 1.7 2005/06/03 19:56:08 eirikn Exp $	*/
+/*	$DragonFly: src/sys/netinet6/in6_prefix.c,v 1.8 2006/01/14 11:44:25 swildner Exp $	*/
 /*	$KAME: in6_prefix.c,v 1.47 2001/03/25 08:41:39 itojun Exp $	*/
 
 /*
@@ -570,7 +570,7 @@ in6_purgeprefix(struct ifnet *ifp)
 		if (ifpr->ifpr_prefix->sa_family != AF_INET6 ||
 		    ifpr->ifpr_type != IN6_PREFIX_RR)
  			continue;
-		(void)delete_each_prefix(ifpr2rp(ifpr), PR_ORIG_KERNEL);
+		delete_each_prefix(ifpr2rp(ifpr), PR_ORIG_KERNEL);
 	}
 }
 
@@ -999,7 +999,7 @@ delete_prefixes(struct ifnet *ifp, u_char origin)
 		    ifpr->ifpr_type != IN6_PREFIX_RR)
  			continue;
 		if (ifpr2rp(ifpr)->rp_statef_delmark)
-			(void)delete_each_prefix(ifpr2rp(ifpr), origin);
+			delete_each_prefix(ifpr2rp(ifpr), origin);
 	}
 }
 
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 72ad0d0124..44cf87cc6c 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/ip6_input.c,v 1.11.2.15 2003/01/24 05:11:35 sam Exp $	*/
-/*	$DragonFly: src/sys/netinet6/ip6_input.c,v 1.26 2005/06/17 19:12:22 dillon Exp $	*/
+/*	$DragonFly: src/sys/netinet6/ip6_input.c,v 1.27 2006/01/14 11:44:25 swildner Exp $	*/
 /*	$KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei Exp $	*/
 
 /*
@@ -587,7 +587,7 @@ ip6_input(struct netmsg *msg)
 		/*
 		 * record address information into m_aux.
 		 */
-		(void)ip6_setdstifaddr(m, ia6);
+		ip6_setdstifaddr(m, ia6);
 
 		/*
 		 * packets to a tentative, duplicated, or somehow invalid
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index f52079a967..be14b96e97 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/ip6_mroute.c,v 1.2.2.9 2003/01/23 21:06:47 sam Exp $	*/
-/*	$DragonFly: src/sys/netinet6/ip6_mroute.c,v 1.10 2005/11/28 17:13:46 dillon Exp $	*/
+/*	$DragonFly: src/sys/netinet6/ip6_mroute.c,v 1.11 2006/01/14 11:44:25 swildner Exp $	*/
 /*	$KAME: ip6_mroute.c,v 1.58 2001/12/18 02:36:31 itojun Exp $	*/
 
 /*
@@ -267,7 +267,7 @@ ip6_mrouter_set(struct socket *so, struct sockopt *sopt)
 		break;
 	}
 
-	(void)m_freem(m);
+	m_freem(m);
 	return(error);
 }
 
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index d29c043f24..ae679c94af 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/ip6_output.c,v 1.13.2.18 2003/01/24 05:11:35 sam Exp $	*/
-/*	$DragonFly: src/sys/netinet6/ip6_output.c,v 1.18 2005/02/08 22:56:19 hsu Exp $	*/
+/*	$DragonFly: src/sys/netinet6/ip6_output.c,v 1.19 2006/01/14 11:44:25 swildner Exp $	*/
 /*	$KAME: ip6_output.c,v 1.279 2002/01/26 06:12:30 jinmei Exp $	*/
 
 /*
@@ -1472,7 +1472,7 @@ do { \
 				error =	ip6_setmoptions(sopt->sopt_name,
 							&in6p->in6p_moptions,
 							m);
-				(void)m_free(m);
+				m_free(m);
 			    }
 				break;
 
@@ -2496,7 +2496,7 @@ ip6_mloopback(struct ifnet *ifp, struct mbuf *m, struct sockaddr_in6 *dst)
 	in6_clearscope(&ip6->ip6_src);
 	in6_clearscope(&ip6->ip6_dst);
 
-	(void)if_simloop(ifp, copym, dst->sin6_family, NULL);
+	if_simloop(ifp, copym, dst->sin6_family, NULL);
 }
 
 /*
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 7b47b1ca89..1693f17d51 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/nd6.c,v 1.2.2.15 2003/05/06 06:46:58 suz Exp $	*/
-/*	$DragonFly: src/sys/netinet6/nd6.c,v 1.17 2005/11/28 17:13:46 dillon Exp $	*/
+/*	$DragonFly: src/sys/netinet6/nd6.c,v 1.18 2006/01/14 11:44:25 swildner Exp $	*/
 /*	$KAME: nd6.c,v 1.144 2001/05/24 07:44:00 itojun Exp $	*/
 
 /*
@@ -1365,7 +1365,7 @@ nd6_ioctl(u_long cmd, caddr_t	data, struct ifnet *ifp)
 			struct nd_pfxrouter *pfr;
 			int j;
 
-			(void)in6_embedscope(&prl->prefix[i].prefix,
+			in6_embedscope(&prl->prefix[i].prefix,
 			    &pr->ndpr_prefix, NULL, NULL);
 			prl->prefix[i].raflags = pr->ndpr_raf;
 			prl->prefix[i].prefixlen = pr->ndpr_plen;
@@ -1407,7 +1407,7 @@ nd6_ioctl(u_long cmd, caddr_t	data, struct ifnet *ifp)
 		     rpp = LIST_NEXT(rpp, rp_entry)) {
 			if (i >= PRLSTSIZ)
 				break;
-			(void)in6_embedscope(&prl->prefix[i].prefix,
+			in6_embedscope(&prl->prefix[i].prefix,
 			    &pr->ndpr_prefix, NULL, NULL);
 			prl->prefix[i].raflags = rpp->rp_raf;
 			prl->prefix[i].prefixlen = rpp->rp_plen;
@@ -1604,7 +1604,7 @@ nd6_cache_lladdr(struct ifnet *ifp, struct in6_addr *from, char *lladdr,
 		return NULL;
 	if ((rt->rt_flags & (RTF_GATEWAY | RTF_LLINFO)) != RTF_LLINFO) {
 fail:
-		(void)nd6_free(rt);
+		nd6_free(rt);
 		return NULL;
 	}
 	ln = (struct llinfo_nd6 *)rt->rt_llinfo;
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index 918c73f9e0..e6f70def2a 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/nd6_rtr.c,v 1.2.2.5 2003/04/05 10:28:53 ume Exp $	*/
-/*	$DragonFly: src/sys/netinet6/nd6_rtr.c,v 1.10 2005/06/03 19:56:08 eirikn Exp $	*/
+/*	$DragonFly: src/sys/netinet6/nd6_rtr.c,v 1.11 2006/01/14 11:44:25 swildner Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.111 2001/04/27 01:37:15 jinmei Exp $	*/
 
 /*
@@ -108,9 +108,7 @@ int ip6_temp_regen_advance = TEMPADDR_REGEN_ADVANCE;
  * Based on RFC 2461
  */
 void
-nd6_rs_input(m, off, icmp6len)
-	struct	mbuf *m;
-	int off, icmp6len;
+nd6_rs_input(struct mbuf *m, int off, int icmp6len)
 {
 	struct ifnet *ifp = m->m_pkthdr.rcvif;
 	struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *);
@@ -201,9 +199,7 @@ nd6_rs_input(m, off, icmp6len)
  * TODO: ND_RA_FLAG_{OTHER,MANAGED} processing
  */
 void
-nd6_ra_input(m, off, icmp6len)
-	struct	mbuf *m;
-	int off, icmp6len;
+nd6_ra_input(struct mbuf *m, int off, int icmp6len)
 {
 	struct ifnet *ifp = m->m_pkthdr.rcvif;
 	struct nd_ifinfo *ndi = ND_IFINFO(ifp);
@@ -451,9 +447,7 @@ nd6_ra_input(m, off, icmp6len)
 
 /* tell the change to user processes watching the routing socket. */
 static void
-nd6_rtmsg(cmd, rt)
-	int cmd;
-	struct rtentry *rt;
+nd6_rtmsg(int cmd, struct rtentry *rt)
 {
 	struct rt_addrinfo info;
 
@@ -469,8 +463,7 @@ nd6_rtmsg(cmd, rt)
 }
 
 void
-defrouter_addreq(new)
-	struct nd_defrouter *new;
+defrouter_addreq(struct nd_defrouter *new)
 {
 	struct sockaddr_in6 def, mask, gate;
 	struct rtentry *newrt = NULL;
@@ -497,8 +490,7 @@ defrouter_addreq(new)
 
 /* Add a route to a given interface as default */
 void
-defrouter_addifreq(ifp)
-	struct ifnet *ifp;
+defrouter_addifreq(struct ifnet *ifp)
 {
 	struct sockaddr_in6 def, mask;
 	struct ifaddr *ifa;
@@ -543,9 +535,7 @@ defrouter_addifreq(ifp)
 }
 
 struct nd_defrouter *
-defrouter_lookup(addr, ifp)
-	struct in6_addr *addr;
-	struct ifnet *ifp;
+defrouter_lookup(struct in6_addr *addr, struct ifnet *ifp)
 {
 	struct nd_defrouter *dr;
 
@@ -559,9 +549,7 @@ defrouter_lookup(addr, ifp)
 }
 
 void
-defrouter_delreq(dr, dofree)
-	struct nd_defrouter *dr;
-	int dofree;
+defrouter_delreq(struct nd_defrouter *dr, int dofree)
 {
 	struct sockaddr_in6 def, mask, gate;
 	struct rtentry *oldrt = NULL;
@@ -596,8 +584,7 @@ defrouter_delreq(dr, dofree)
 }
 
 void
-defrtrlist_del(dr)
-	struct nd_defrouter *dr;
+defrtrlist_del(struct nd_defrouter *dr)
 {
 	struct nd_defrouter *deldr = NULL;
 	struct nd_prefix *pr;
@@ -648,7 +635,7 @@ defrtrlist_del(dr)
  *    destinations are on-link.
  */
 void
-defrouter_select()
+defrouter_select(void)
 {
 	struct nd_defrouter *dr, anydr;
 	struct rtentry *rt = NULL;
@@ -721,8 +708,7 @@ defrouter_select()
 }
 
 static struct nd_defrouter *
-defrtrlist_update(new)
-	struct nd_defrouter *new;
+defrtrlist_update(struct nd_defrouter *new)
 {
 	struct nd_defrouter *dr, *n;
 
@@ -770,9 +756,7 @@ defrtrlist_update(new)
 }
 
 static struct nd_pfxrouter *
-pfxrtr_lookup(pr, dr)
-	struct nd_prefix *pr;
-	struct nd_defrouter *dr;
+pfxrtr_lookup(struct nd_prefix *pr, struct nd_defrouter *dr)
 {
 	struct nd_pfxrouter *search;
 	
@@ -785,9 +769,7 @@ pfxrtr_lookup(pr, dr)
 }
 
 static void
-pfxrtr_add(pr, dr)
-	struct nd_prefix *pr;
-	struct nd_defrouter *dr;
+pfxrtr_add(struct nd_prefix *pr, struct nd_defrouter *dr)
 {
 	struct nd_pfxrouter *new;
 
@@ -803,16 +785,14 @@ pfxrtr_add(pr, dr)
 }
 
 static void
-pfxrtr_del(pfr)
-	struct nd_pfxrouter *pfr;
+pfxrtr_del(struct nd_pfxrouter *pfr)
 {
 	LIST_REMOVE(pfr, pfr_entry);
 	free(pfr, M_IP6NDP);
 }
 
 struct nd_prefix *
-nd6_prefix_lookup(pr)
-	struct nd_prefix *pr;
+nd6_prefix_lookup(struct nd_prefix *pr)
 {
 	struct nd_prefix *search;
 
@@ -831,9 +811,8 @@ nd6_prefix_lookup(pr)
 }
 
 int
-nd6_prelist_add(pr, dr, newp)
-	struct nd_prefix *pr, **newp;
-	struct nd_defrouter *dr;
+nd6_prelist_add(struct nd_prefix *pr, struct nd_defrouter *dr,
+		struct nd_prefix **newp)
 {
 	struct nd_prefix *new = NULL;
 	int i;
@@ -880,8 +859,7 @@ nd6_prelist_add(pr, dr, newp)
 }
 
 void
-prelist_remove(pr)
-	struct nd_prefix *pr;
+prelist_remove(struct nd_prefix *pr)
 {
 	struct nd_pfxrouter *pfr, *next;
 	int e;
@@ -927,11 +905,12 @@ prelist_remove(pr)
 	pfxlist_onlink_check();
 }
 
+/*
+ * Parameters:
+ *	dr:	may be NULL
+ */
 int
-prelist_update(new, dr, m)
-	struct nd_prefix *new;
-	struct nd_defrouter *dr; /* may be NULL */
-	struct mbuf *m;
+prelist_update(struct nd_prefix *new, struct nd_defrouter *dr, struct mbuf *m)
 {
 	struct in6_ifaddr *ia6 = NULL, *ia6_match = NULL;
 	struct ifaddr *ifa;
@@ -1226,8 +1205,7 @@ prelist_update(new, dr, m)
  * XXX: lengthy function name...
  */
 static struct nd_pfxrouter *
-find_pfxlist_reachable_router(pr)
-	struct nd_prefix *pr;
+find_pfxlist_reachable_router(struct nd_prefix *pr)
 {
 	struct nd_pfxrouter *pfxrtr;
 	struct rtentry *rt;
@@ -1260,7 +1238,7 @@ find_pfxlist_reachable_router(pr)
  * is no router around us.
  */
 void
-pfxlist_onlink_check()
+pfxlist_onlink_check(void)
 {
 	struct nd_prefix *pr;
 	struct in6_ifaddr *ifa;
@@ -1402,8 +1380,7 @@ pfxlist_onlink_check()
 }
 
 int
-nd6_prefix_onlink(pr)
-	struct nd_prefix *pr;
+nd6_prefix_onlink(struct nd_prefix *pr)
 {
 	struct ifaddr *ifa;
 	struct ifnet *ifp = pr->ndpr_ifp;
@@ -1515,8 +1492,7 @@ nd6_prefix_onlink(pr)
 }
 
 int
-nd6_prefix_offlink(pr)
-	struct nd_prefix *pr;
+nd6_prefix_offlink(struct nd_prefix *pr)
 {
 	int error = 0;
 	struct ifnet *ifp = pr->ndpr_ifp;
@@ -1609,10 +1585,12 @@ nd6_prefix_offlink(pr)
 	return(error);
 }
 
+/*
+ * Parameters:
+ *	ifid:	Mobile IPv6 addition
+ */
 static struct in6_ifaddr *
-in6_ifadd(pr, ifid)
-	struct nd_prefix *pr;
-	struct in6_addr  *ifid;   /* Mobile IPv6 addition */
+in6_ifadd(struct nd_prefix *pr, struct in6_addr *ifid)
 {
 	struct ifnet *ifp = pr->ndpr_ifp;
 	struct ifaddr *ifa;
@@ -1746,9 +1724,12 @@ in6_ifadd(pr, ifid)
 	return(ia);		/* this must NOT be NULL. */
 }
 
+/*
+ * Parameters:
+ *	ia0:	corresponding public address
+ */
 int
-in6_tmpifadd(ia0, forcegen)
-	const struct in6_ifaddr *ia0; /* corresponding public address */
+in6_tmpifadd(const struct in6_ifaddr *ia0, int forcegen)
 {
 	struct ifnet *ifp = ia0->ia_ifa.ifa_ifp;
 	struct in6_ifaddr *newia;
@@ -1896,9 +1877,7 @@ in6_init_address_ltimes(struct nd_prefix *new, struct in6_addrlifetime *lt6)
  * it shouldn't be called when acting as a router.
  */
 void
-rt6_flush(gateway, ifp)
-	struct in6_addr *gateway;
-	struct ifnet *ifp;
+rt6_flush(struct in6_addr *gateway, struct ifnet *ifp)
 {
 	struct radix_node_head *rnh = rt_tables[AF_INET6];
 
@@ -1917,9 +1896,7 @@ rt6_flush(gateway, ifp)
 }
 
 static int
-rt6_deleteroute(rn, arg)
-	struct radix_node *rn;
-	void *arg;
+rt6_deleteroute(struct radix_node *rn, void *arg)
 {
 #define SIN6(s)	((struct sockaddr_in6 *)s)
 	struct rtentry *rt = (struct rtentry *)rn;
@@ -1952,8 +1929,7 @@ rt6_deleteroute(rn, arg)
 }
 
 int
-nd6_setdefaultiface(ifindex)
-	int ifindex;
+nd6_setdefaultiface(int ifindex)
 {
 	int error = 0;
 
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c
index 4e40b96b4f..52d6724599 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/scope6.c,v 1.1.2.3 2002/04/01 15:29:04 ume Exp $	*/
-/*	$DragonFly: src/sys/netinet6/scope6.c,v 1.5 2005/06/03 19:56:08 eirikn Exp $	*/
+/*	$DragonFly: src/sys/netinet6/scope6.c,v 1.6 2006/01/14 11:44:25 swildner Exp $	*/
 /*	$KAME: scope6.c,v 1.10 2000/07/24 13:29:31 itojun Exp $	*/
 
 /*
@@ -52,7 +52,7 @@ static struct scope6_id sid_default;
 	(((struct in6_ifextra *)(ifp)->if_afdata[AF_INET6])->scope6_id)
 
 void
-scope6_init()
+scope6_init(void)
 {
 	bzero(&sid_default, sizeof(sid_default));
 }
diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c
index c38ec7c55d..52a9dd2169 100644
--- a/sys/netinet6/sctp6_usrreq.c
+++ b/sys/netinet6/sctp6_usrreq.c
@@ -1,5 +1,5 @@
 /*	$KAME: sctp6_usrreq.c,v 1.35 2004/08/17 06:28:03 t-momose Exp $	*/
-/*	$DragonFly: src/sys/netinet6/sctp6_usrreq.c,v 1.4 2005/07/15 17:19:28 eirikn Exp $	*/
+/*	$DragonFly: src/sys/netinet6/sctp6_usrreq.c,v 1.5 2006/01/14 11:44:25 swildner Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -121,7 +121,7 @@ extern struct protosw inetsw[];
 extern u_int32_t sctp_debug_on;
 #endif
 
-static	int sctp6_detach __P((struct socket *so));
+static	int sctp6_detach(struct socket *so);
 
 #if !(defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__))
 extern void in6_sin_2_v4mapsin6 (struct sockaddr_in *sin,
@@ -177,14 +177,9 @@ extern int sctp_no_csum_on_loopback;
 
 int
 #if defined(__APPLE__)
-sctp6_input(mp, offp)
+sctp6_input(struct mbuf **mp, int *offp)
 #else
-sctp6_input(mp, offp, proto)
-#endif
-     struct mbuf **mp;
-     int *offp;
-#ifndef __APPLE__
-     int proto;
+sctp6_input(struct mbuf **mp, int *offp, int proto)
 #endif
 {
 	struct mbuf *m = *mp;
@@ -440,7 +435,7 @@ sctp_skip_csum:
 	offset -= sizeof(*ch);
 	ecn_bits = ((ntohl(ip6->ip6_flow) >> 20) & 0x000000ff);
 	crit_enter();
-	(void)sctp_common_input_processing(&m, iphlen, offset, length, sh, ch,
+	sctp_common_input_processing(&m, iphlen, offset, length, sh, ch,
 	    in6p, stcb, net, ecn_bits);
 	/* inp's ref-count reduced && stcb unlocked */
 	crit_exit();
@@ -568,10 +563,7 @@ out:
 
 
 void
-sctp6_ctlinput(cmd, pktdst, d)
-     int cmd;
-     struct sockaddr *pktdst;
-     void *d;
+sctp6_ctlinput(int cmd, struct sockaddr *pktdst, void *d)
 {
 	struct sctphdr sh;
 	struct ip6ctlparam *ip6cp = NULL;
@@ -1642,11 +1634,8 @@ struct pr_usrreqs sctp6_usrreqs = {
 #else
 
 int
-sctp6_usrreq(so, req, m, nam, control, p)
-     struct socket *so;
-     int req;
-     struct mbuf *m, *nam, *control;
-     struct proc *p;
+sctp6_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
+	     struct mbuf *control, struct proc *p)
 {
 	int s;
 	int error = 0;
diff --git a/sys/netinet6/sctp6_var.h b/sys/netinet6/sctp6_var.h
index 996bc58db7..72bf4edab9 100644
--- a/sys/netinet6/sctp6_var.h
+++ b/sys/netinet6/sctp6_var.h
@@ -1,5 +1,5 @@
 /*	$KAME: sctp6_var.h,v 1.6 2003/11/25 06:40:55 ono Exp $	*/
-/*	$DragonFly: src/sys/netinet6/sctp6_var.h,v 1.2 2005/07/15 15:02:02 eirikn Exp $	*/
+/*	$DragonFly: src/sys/netinet6/sctp6_var.h,v 1.3 2006/01/14 11:44:25 swildner Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2004 Cisco Systems, Inc.
@@ -40,26 +40,26 @@
 #if defined(__FreeBSD__) || (__APPLE__) || defined(__DragonFly__)
 SYSCTL_DECL(_net_inet6_sctp6);
 extern struct pr_usrreqs sctp6_usrreqs;
-int	sctp6_ctloutput __P((struct socket *, struct sockopt *));
+int	sctp6_ctloutput(struct socket *, struct sockopt *);
 #else
-int	sctp6_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
+int	sctp6_ctloutput(int, struct socket *, int, int, struct mbuf **);
 #if defined(__NetBSD__) || defined(__OpenBSD__)
-int	sctp6_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *,
-			   struct mbuf *, struct proc *));
+int	sctp6_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
+		     struct mbuf *, struct proc *);
 #else
-int	sctp6_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *,
-			   struct mbuf *));
+int	sctp6_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
+		     struct mbuf *);
 #endif /* __NetBSD__ || __OpenBSD__ */
 #endif /* __FreeBSD__ || __APPLE__ || __DragonFly__ */
 
 #if defined(__APPLE__)
-int	sctp6_input __P((struct mbuf **, int *));
+int	sctp6_input(struct mbuf **, int *);
 #else
-int	sctp6_input __P((struct mbuf **, int *, int));
+int	sctp6_input(struct mbuf **, int *, int);
 #endif
-int	sctp6_output __P((struct sctp_inpcb *, struct mbuf *, struct sockaddr *,
-	struct mbuf *, struct proc *));
-void	sctp6_ctlinput __P((int, struct sockaddr *, void *));
+int	sctp6_output(struct sctp_inpcb *, struct mbuf *, struct sockaddr *,
+	struct mbuf *, struct proc *);
+void	sctp6_ctlinput(int, struct sockaddr *, void *);
 
 #endif /* _KERNEL */
 #endif
-- 
2.41.0