kill register declarations. to sync with kame better.

10 files changed, 64 insertions, 64 deletions

diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c
index 6dcfc4f1950..9dbdaf4652c 100644
--- a/sys/netinet6/dest6.c
+++ b/sys/netinet6/dest6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dest6.c,v 1.3 2000/02/07 06:09:09 itojun Exp $	*/
+/*	$OpenBSD: dest6.c,v 1.4 2001/02/16 08:22:04 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -57,7 +57,7 @@ dest6_input(mp, offp, proto)
 	struct mbuf **mp;
 	int *offp, proto;
 {
-	register struct mbuf *m = *mp;
+	struct mbuf *m = *mp;
 	int off = *offp, dstoptlen, optlen;
 	struct ip6_dest *dstopts;
 	u_int8_t *opt;
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 445a5dcb83f..5f4ccc9af73 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6.c,v 1.24 2001/02/07 11:46:22 itojun Exp $	*/
+/*	$OpenBSD: in6.c,v 1.25 2001/02/16 08:22:05 itojun Exp $	*/
 /*	$KAME: in6.c,v 1.109 2000/10/24 07:19:01 jinmei Exp $	*/
 
 /*
@@ -1132,8 +1132,8 @@ in6_lifaddr_ioctl(so, cmd, data, ifp, p)
  */
 void
 in6_ifscrub(ifp, ia)
-	register struct ifnet *ifp;
-	register struct in6_ifaddr *ia;
+	struct ifnet *ifp;
+	struct in6_ifaddr *ia;
 {
 	if ((ia->ia_flags & IFA_ROUTE) == 0)
 		return;
@@ -1330,8 +1330,8 @@ in6_purgemkludge(ifp)
  */
 struct	in6_multi *
 in6_addmulti(maddr6, ifp, errorp)
-	register struct in6_addr *maddr6;
-	register struct ifnet *ifp;
+	struct in6_addr *maddr6;
+	struct ifnet *ifp;
 	int *errorp;
 {
 	struct	in6_ifaddr *ia;
@@ -1451,7 +1451,7 @@ in6ifa_ifpforlinklocal(ifp, ignoreflags)
 	struct ifnet *ifp;
 	int ignoreflags;
 {
-	register struct ifaddr *ifa;
+	struct ifaddr *ifa;
 
 	for (ifa = ifp->if_addrlist.tqh_first;
 	     ifa;
@@ -1481,7 +1481,7 @@ in6ifa_ifpwithaddr(ifp, addr)
 	struct ifnet *ifp;
 	struct in6_addr *addr;
 {
-	register struct ifaddr *ifa;
+	struct ifaddr *ifa;
 
 	for (ifa = ifp->if_addrlist.tqh_first;
 	     ifa;
@@ -1505,13 +1505,13 @@ static char digits[] = "0123456789abcdef";
 static int ip6round = 0;
 char *
 ip6_sprintf(addr)
-register struct in6_addr *addr;
+	struct in6_addr *addr;
 {
 	static char ip6buf[8][48];
-	register int i;
-	register char *cp;
-	register u_short *a = (u_short *)addr;
-	register u_char *d;
+	int i;
+	char *cp;
+	u_short *a = (u_short *)addr;
+	u_char *d;
 	int dcolon = 0;
 
 	ip6round = (ip6round + 1) & 7;
@@ -1731,8 +1731,8 @@ in6_prefixlen2mask(maskp, len)
  */
 struct in6_ifaddr *
 in6_ifawithscope(oifp, dst)
-	register struct ifnet *oifp;
-	register struct in6_addr *dst;
+	struct ifnet *oifp;
+	struct in6_addr *dst;
 {
 	int dst_scope =	in6_addrscope(dst), src_scope, best_scope = 0;
 	int blen = -1;
@@ -1982,8 +1982,8 @@ in6_ifawithscope(oifp, dst)
 
 struct in6_ifaddr *
 in6_ifawithifp(ifp, dst)
-	register struct ifnet *ifp;
-	register struct in6_addr *dst;
+	struct ifnet *ifp;
+	struct in6_addr *dst;
 {
 	int dst_scope =	in6_addrscope(dst), blen = -1, tlen;
 	struct ifaddr *ifa;
diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c
index 81bfe828f63..1fdbc02d592 100644
--- a/sys/netinet6/in6_cksum.c
+++ b/sys/netinet6/in6_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_cksum.c,v 1.6 2000/09/09 16:13:34 itojun Exp $	*/
+/*	$OpenBSD: in6_cksum.c,v 1.7 2001/02/16 08:22:05 itojun Exp $	*/
 /*	$KAME: in6_cksum.c,v 1.9 2000/09/09 15:33:31 itojun Exp $	*/
 
 /*
@@ -92,13 +92,13 @@
 
 int
 in6_cksum(m, nxt, off, len)
-	register struct mbuf *m;
+	struct mbuf *m;
 	u_int8_t nxt;
 	u_int32_t off, len;
 {
-	register u_int16_t *w;
-	register int sum = 0;
-	register int mlen = 0;
+	u_int16_t *w;
+	int sum = 0;
+	int mlen = 0;
 	int byte_swapped = 0;
 #if 0
 	int srcifid = 0, dstifid = 0;
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 38923886da3..a596849812f 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_pcb.c,v 1.23 2001/02/08 18:46:23 itojun Exp $	*/
+/*	$OpenBSD: in6_pcb.c,v 1.24 2001/02/16 08:22:05 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -139,13 +139,13 @@ u_char inet6ctlerrmap[PRC_NCMDS] = {
  */
 int
 in6_pcbbind(inp, nam)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	struct mbuf *nam;
 {
-	register struct socket *so = inp->inp_socket;
+	struct socket *so = inp->inp_socket;
 
-	register struct inpcbtable *head = inp->inp_table;
-	register struct sockaddr_in6 *sin6;
+	struct inpcbtable *head = inp->inp_table;
+	struct sockaddr_in6 *sin6;
 	struct proc *p = curproc;		/* XXX */
 	u_short lport = 0;
 	int wild = INPLOOKUP_IPV6, reuseport = (so->so_options & SO_REUSEPORT);
@@ -431,7 +431,7 @@ portloop:
  */
 int
 in6_pcbconnect(inp, nam)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	struct mbuf *nam;
 {
 	struct in6_addr *in6a = NULL;
@@ -563,7 +563,7 @@ in6_pcbnotify(head, dst, fport_arg, la, lport_arg, cmd, notify)
 	int cmd;
 	void (*notify) __P((struct inpcb *, int));
 {
-	register struct inpcb *inp, *ninp;
+	struct inpcb *inp, *ninp;
 	struct in6_addr *faddr,laddr = *la;
 	u_short fport = fport_arg, lport = lport_arg;
 	int errno, nmatch = 0;
@@ -643,10 +643,10 @@ in6_pcbnotify(head, dst, fport_arg, la, lport_arg, cmd, notify)
  */
 int
 in6_setsockaddr(inp, nam)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	struct mbuf *nam;
 {
-	register struct sockaddr_in6 *sin6;
+	struct sockaddr_in6 *sin6;
 
 	nam->m_len = sizeof(struct sockaddr_in6);
 	sin6 = mtod(nam,struct sockaddr_in6 *);
@@ -668,10 +668,10 @@ in6_setsockaddr(inp, nam)
  */
 int
 in6_setpeeraddr(inp, nam)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	struct mbuf *nam;
 {
-	register struct sockaddr_in6 *sin6;
+	struct sockaddr_in6 *sin6;
 
 	nam->m_len = sizeof(struct sockaddr_in6);
 	sin6 = mtod(nam,struct sockaddr_in6 *);
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index c76b625ad4a..51ed8506971 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_var.h,v 1.10 2000/04/17 04:44:50 itojun Exp $	*/
+/*	$OpenBSD: in6_var.h,v 1.11 2001/02/16 08:22:06 itojun Exp $	*/
 /*	$KAME: in6_var.h,v 1.31 2000/03/25 07:23:46 sumikawa Exp $	*/
 
 /*
@@ -506,7 +506,7 @@ struct	in6_multistep {
 /* struct ifnet *ifp; */					\
 /* struct in6_multi *in6m; */					\
 do {								\
-	register struct in6_ifaddr *ia;				\
+	struct in6_ifaddr *ia;					\
 								\
 	IFP_TO_IA6((ifp), ia);					\
 	if (ia == NULL)						\
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 2b99d7a27c7..49413d8d15b 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_forward.c,v 1.9 2000/07/27 16:05:07 itojun Exp $	*/
+/*	$OpenBSD: ip6_forward.c,v 1.10 2001/02/16 08:22:06 itojun Exp $	*/
 /*	$KAME: ip6_forward.c,v 1.44 2000/07/27 13:43:21 itojun Exp $	*/
 
 /*
@@ -82,8 +82,8 @@ ip6_forward(m, srcrt)
 	int srcrt;
 {
 	struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *);
-	register struct sockaddr_in6 *dst;
-	register struct rtentry *rt;
+	struct sockaddr_in6 *dst;
+	struct rtentry *rt;
 	int error, type = 0, code = 0;
 	struct mbuf *mcopy = NULL;
 	long time_second = time.tv_sec;
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 47865f2091a..d8186e12a8f 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_input.c,v 1.22 2001/02/08 14:51:22 itojun Exp $	*/
+/*	$OpenBSD: ip6_input.c,v 1.23 2001/02/16 08:22:06 itojun Exp $	*/
 /*	$KAME: ip6_input.c,v 1.172 2001/02/08 11:18:05 itojun Exp $	*/
 
 /*
@@ -148,8 +148,8 @@ static struct mbuf *ip6_pullexthdr __P((struct mbuf *, size_t, int));
 void
 ip6_init()
 {
-	register struct ip6protosw *pr;
-	register int i;
+	struct ip6protosw *pr;
+	int i;
 
 	pr = (struct ip6protosw *)pffindproto(PF_INET6, IPPROTO_RAW, SOCK_RAW);
 	if (pr == 0)
@@ -693,7 +693,7 @@ ip6_hopopts_input(plenp, rtalertp, mp, offp)
 	struct mbuf **mp;
 	int *offp;
 {
-	register struct mbuf *m = *mp;
+	struct mbuf *m = *mp;
 	int off = *offp, hbhlen;
 	struct ip6_hbh *hbh;
 	u_int8_t *opt;
@@ -925,10 +925,10 @@ ip6_unknown_opt(optp, m, off)
  */
 void
 ip6_savecontrol(in6p, mp, ip6, m)
-	register struct inpcb *in6p;
-	register struct mbuf **mp;
-	register struct ip6_hdr *ip6;
-	register struct mbuf *m;
+	struct inpcb *in6p;
+	struct mbuf **mp;
+	struct ip6_hdr *ip6;
+	struct mbuf *m;
 {
 # define in6p_flags	inp_flags
 	int privileged = 0;
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 89c30cf2b3d..6a467c12faa 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_output.c,v 1.21 2001/02/08 18:46:23 itojun Exp $	*/
+/*	$OpenBSD: ip6_output.c,v 1.22 2001/02/16 08:22:06 itojun Exp $	*/
 /*	$KAME: ip6_output.c,v 1.152 2001/02/02 15:36:33 jinmei Exp $	*/
 
 /*
@@ -1287,8 +1287,8 @@ ip6_ctloutput(op, so, level, optname, mp)
 	struct mbuf **mp;
 {
 	int privileged;
-	register struct inpcb *inp = sotoinpcb(so);
-	register struct mbuf *m = *mp;
+	struct inpcb *inp = sotoinpcb(so);
+	struct mbuf *m = *mp;
 	int error, optval;
 	int optlen;
 #ifdef IPSEC
@@ -1755,10 +1755,10 @@ ip6_ctloutput(op, so, level, optname, mp)
 static int
 ip6_pcbopts(pktopt, m, so)
 	struct ip6_pktopts **pktopt;
-	register struct mbuf *m;
+	struct mbuf *m;
 	struct socket *so;
 {
-	register struct ip6_pktopts *opt = *pktopt;
+	struct ip6_pktopts *opt = *pktopt;
 	int error = 0;
 	struct proc *p = curproc;	/* XXX */
 	int priv = 0;
@@ -2085,8 +2085,8 @@ ip6_setmoptions(optname, im6op, m)
 static int
 ip6_getmoptions(optname, im6o, mp)
 	int optname;
-	register struct ip6_moptions *im6o;
-	register struct mbuf **mp;
+	struct ip6_moptions *im6o;
+	struct mbuf **mp;
 {
 	u_int *hlim, *loop, *ifindex;
 
@@ -2131,7 +2131,7 @@ ip6_getmoptions(optname, im6o, mp)
  */
 void
 ip6_freemoptions(im6o)
-	register struct ip6_moptions *im6o;
+	struct ip6_moptions *im6o;
 {
 	struct in6_multi_mship *imm;
 
@@ -2156,7 +2156,7 @@ ip6_setpktoptions(control, opt, priv)
 	struct ip6_pktopts *opt;
 	int priv;
 {
-	register struct cmsghdr *cm = 0;
+	struct cmsghdr *cm = 0;
 
 	if (control == 0 || opt == 0)
 		return(EINVAL);
@@ -2319,8 +2319,8 @@ ip6_setpktoptions(control, opt, priv)
 void
 ip6_mloopback(ifp, m, dst)
 	struct ifnet *ifp;
-	register struct mbuf *m;
-	register struct sockaddr_in6 *dst;
+	struct mbuf *m;
+	struct sockaddr_in6 *dst;
 {
 	struct mbuf *copym;
 	struct ip6_hdr *ip6;
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index 8940d654e15..a136d1503c0 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mld6.c,v 1.6 2000/02/28 11:55:22 itojun Exp $	*/
+/*	$OpenBSD: mld6.c,v 1.7 2001/02/16 08:22:06 itojun Exp $	*/
 /*	$KAME: mld6.c,v 1.16 2000/02/22 14:04:27 itojun Exp $	*/
 
 /*
@@ -339,7 +339,7 @@ mld6_input(m, off)
 void
 mld6_fasttimeo()
 {
-	register struct in6_multi *in6m;
+	struct in6_multi *in6m;
 	struct in6_multistep step;
 	int s;
 
diff --git a/sys/netinet6/route6.c b/sys/netinet6/route6.c
index e6627ab33a9..e68e41f7792 100644
--- a/sys/netinet6/route6.c
+++ b/sys/netinet6/route6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route6.c,v 1.3 2000/10/02 04:44:08 itojun Exp $	*/
+/*	$OpenBSD: route6.c,v 1.4 2001/02/16 08:22:07 itojun Exp $	*/
 /*	$KAME: route6.c,v 1.21 2000/09/20 23:00:49 itojun Exp $	*/
 
 /*
@@ -51,9 +51,9 @@ route6_input(mp, offp, proto)
 	struct mbuf **mp;
 	int *offp, proto;	/* proto is unused */
 {
-	register struct ip6_hdr *ip6;
-	register struct mbuf *m = *mp;
-	register struct ip6_rthdr *rh;
+	struct ip6_hdr *ip6;
+	struct mbuf *m = *mp;
+	struct ip6_rthdr *rh;
 	int off = *offp, rhlen;
 
 #ifndef PULLDOWN_TEST