Remove 'register' keyword.

29 files changed, 98 insertions, 84 deletions

diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c
index a113640..f232dc9 100644
--- a/lib/libc/net/gethostbydns.c
+++ b/lib/libc/net/gethostbydns.c
@@ -162,9 +162,9 @@ gethostanswer(answer, anslen, qname, qtype)
 	const char *qname;
 	int qtype;
 {
-	register const HEADER *hp;
-	register const u_char *cp;
-	register int n;
+	const HEADER *hp;
+	const u_char *cp;
+	int n;
 	const u_char *eom, *erdata;
 	char *bp, **ap, **hap;
 	int type, class, buflen, ancount, qdcount;
@@ -387,7 +387,7 @@ gethostanswer(answer, anslen, qname, qtype)
 				continue;
 			}
 			if (!haveanswer) {
-				register int nn;
+				int nn;
 
 				host.h_name = bp;
 				nn = strlen(bp) + 1;	/* for the \0 */
@@ -486,7 +486,7 @@ _dns_gethostbyname(void *rval, void *cb_data, va_list ap)
 	const char *name;
 	int af;
 	querybuf buf;
-	register const char *cp;
+	const char *cp;
 	char *bp;
 	int n, size, type, len;
 
@@ -613,10 +613,10 @@ _dns_gethostbyaddr(void *rval, void *cb_data, va_list ap)
 	static const u_char tunnelled[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0,0 };
 	int n, size;
 	querybuf buf;
-	register struct hostent *hp;
+	struct hostent *hp;
 	char qbuf[MAXDNAME+1], *qp;
 #ifdef SUNSECURITY
-	register struct hostent *rhp;
+	struct hostent *rhp;
 	char **haddr;
 	u_long old_options;
 	char hname2[MAXDNAME+1];
diff --git a/lib/libc/net/gethostbyht.c b/lib/libc/net/gethostbyht.c
index 478d2d2..c05d8b3 100644
--- a/lib/libc/net/gethostbyht.c
+++ b/lib/libc/net/gethostbyht.c
@@ -103,7 +103,7 @@ struct hostent *
 gethostent()
 {
 	char *p;
-	register char *cp, **q;
+	char *cp, **q;
 	int af, len;
 
 	if (!hostf && !(hostf = fopen(_PATH_HOSTS, "r" ))) {
@@ -169,8 +169,8 @@ _ht_gethostbyname(void *rval, void *cb_data, va_list ap)
 {
 	const char *name;
 	int af;
-	register struct hostent *p;
-	register char **cp;
+	struct hostent *p;
+	char **cp;
 
 	name = va_arg(ap, const char *);
 	af = va_arg(ap, int);
@@ -197,7 +197,7 @@ _ht_gethostbyaddr(void *rval, void *cb_data, va_list ap)
 {
 	const char *addr;
 	int len, af;
-	register struct hostent *p;
+	struct hostent *p;
 
 	addr = va_arg(ap, const char *);
 	len = va_arg(ap, int);
diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c
index 7b1d82b..3667be4 100644
--- a/lib/libc/net/gethostbynis.c
+++ b/lib/libc/net/gethostbynis.c
@@ -63,7 +63,7 @@ _gethostbynis(name, map, af)
 	char *map;
 	int af;
 {
-	register char *cp, **q;
+	char *cp, **q;
 	char *result;
 	int resultlen,size;
 	static struct hostent h;
diff --git a/lib/libc/net/getnetbydns.c b/lib/libc/net/getnetbydns.c
index 433b3b8..ed208f0 100644
--- a/lib/libc/net/getnetbydns.c
+++ b/lib/libc/net/getnetbydns.c
@@ -110,9 +110,9 @@ getnetanswer(answer, anslen, net_i)
 	int net_i;
 {
 
-	register HEADER *hp;
-	register u_char *cp;
-	register int n;
+	HEADER *hp;
+	u_char *cp;
+	int n;
 	u_char *eom;
 	int type, class, buflen, ancount, qdcount, haveanswer, i, nchar;
 	char aux1[MAXHOSTNAMELEN], aux2[MAXHOSTNAMELEN], ans[MAXHOSTNAMELEN];
diff --git a/lib/libc/net/getnetbyht.c b/lib/libc/net/getnetbyht.c
index b5f73be..59c8cd7 100644
--- a/lib/libc/net/getnetbyht.c
+++ b/lib/libc/net/getnetbyht.c
@@ -93,7 +93,7 @@ struct netent *
 getnetent()
 {
 	char *p;
-	register char *cp, **q;
+	char *cp, **q;
 
 	if (netf == NULL && (netf = fopen(_PATH_NETWORKS, "r" )) == NULL)
 		return (NULL);
@@ -141,8 +141,8 @@ int
 _ht_getnetbyname(void *rval, void *cb_data, va_list ap)
 {
 	const char *name;
-	register struct netent *p;
-	register char **cp;
+	struct netent *p;
+	char **cp;
 
 	name = va_arg(ap, const char *);
 
@@ -166,7 +166,7 @@ _ht_getnetbyaddr(void *rval, void *cb_data, va_list ap)
 {
 	unsigned long net;
 	int type;
-	register struct netent *p;
+	struct netent *p;
 
 	net = va_arg(ap, unsigned long);
 	type = va_arg(ap, int);
diff --git a/lib/libc/net/getnetbynis.c b/lib/libc/net/getnetbynis.c
index c6db4f4..f8c7fee 100644
--- a/lib/libc/net/getnetbynis.c
+++ b/lib/libc/net/getnetbynis.c
@@ -56,7 +56,7 @@ static char *host_aliases[MAXALIASES];
 static struct netent *
 _getnetbynis(const char *name, char *map, int af)
 {
-	register char *cp, **q;
+	char *cp, **q;
 	static char *result;
 	int resultlen;
 	static struct netent h;
diff --git a/lib/libc/net/getproto.c b/lib/libc/net/getproto.c
index 46f46d3..b22bc51 100644
--- a/lib/libc/net/getproto.c
+++ b/lib/libc/net/getproto.c
@@ -34,6 +34,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getproto.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <netdb.h>
 
@@ -41,9 +43,9 @@ extern int _proto_stayopen;
 
 struct protoent *
 getprotobynumber(proto)
-	register int proto;
+	int proto;
 {
-	register struct protoent *p;
+	struct protoent *p;
 
 	setprotoent(_proto_stayopen);
 	while ( (p = getprotoent()) )
diff --git a/lib/libc/net/getprotoent.c b/lib/libc/net/getprotoent.c
index c10ae33..c8f1ad4 100644
--- a/lib/libc/net/getprotoent.c
+++ b/lib/libc/net/getprotoent.c
@@ -34,6 +34,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -75,7 +77,7 @@ struct protoent *
 getprotoent()
 {
 	char *p;
-	register char *cp, **q;
+	char *cp, **q;
 
 	if (protof == NULL && (protof = fopen(_PATH_PROTOCOLS, "r" )) == NULL)
 		return (NULL);
diff --git a/lib/libc/net/getprotoname.c b/lib/libc/net/getprotoname.c
index 0832acf..7039b0a 100644
--- a/lib/libc/net/getprotoname.c
+++ b/lib/libc/net/getprotoname.c
@@ -34,6 +34,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getprotoname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <netdb.h>
 #include <string.h>
@@ -42,10 +44,10 @@ extern int _proto_stayopen;
 
 struct protoent *
 getprotobyname(name)
-	register const char *name;
+	const char *name;
 {
-	register struct protoent *p;
-	register char **cp;
+	struct protoent *p;
+	char **cp;
 
 	setprotoent(_proto_stayopen);
 	while ( (p = getprotoent()) ) {
diff --git a/lib/libc/net/getservbyname.c b/lib/libc/net/getservbyname.c
index 124f5ac..79769f6 100644
--- a/lib/libc/net/getservbyname.c
+++ b/lib/libc/net/getservbyname.c
@@ -34,6 +34,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getservbyname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <netdb.h>
 #include <string.h>
@@ -44,8 +46,8 @@ struct servent *
 getservbyname(name, proto)
 	const char *name, *proto;
 {
-	register struct servent *p;
-	register char **cp;
+	struct servent *p;
+	char **cp;
 
 #ifdef YP
 	extern char *___getservbyname_yp;
diff --git a/lib/libc/net/getservbyport.c b/lib/libc/net/getservbyport.c
index ef9a2e8..2efb60f 100644
--- a/lib/libc/net/getservbyport.c
+++ b/lib/libc/net/getservbyport.c
@@ -34,6 +34,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getservbyport.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <netdb.h>
 #include <string.h>
@@ -45,7 +47,7 @@ getservbyport(port, proto)
 	int port;
 	const char *proto;
 {
-	register struct servent *p;
+	struct servent *p;
 
 #ifdef YP
 	extern int ___getservbyport_yp;
diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c
index 76307a1..53a03f6 100644
--- a/lib/libc/net/getservent.c
+++ b/lib/libc/net/getservent.c
@@ -213,7 +213,7 @@ struct servent *
 getservent()
 {
 	char *p;
-	register char *cp, **q;
+	char *cp, **q;
 
 #ifdef YP
 	if (serv_stepping_yp && _getservent_yp(line)) {
diff --git a/lib/libc/net/herror.c b/lib/libc/net/herror.c
index e42badf..a4b4e3d 100644
--- a/lib/libc/net/herror.c
+++ b/lib/libc/net/herror.c
@@ -81,7 +81,7 @@ herror(s)
 	const char *s;
 {
 	struct iovec iov[4];
-	register struct iovec *v = iov;
+	struct iovec *v = iov;
 
 	if (s && *s) {
 		v->iov_base = (char *)s;
diff --git a/lib/libc/net/inet_addr.c b/lib/libc/net/inet_addr.c
index bff7af8..5335687f 100644
--- a/lib/libc/net/inet_addr.c
+++ b/lib/libc/net/inet_addr.c
@@ -74,7 +74,7 @@ static char rcsid[] = "$FreeBSD$";
  */
 in_addr_t		/* XXX should be struct in_addr :( */
 inet_addr(cp)
-	register const char *cp;
+	const char *cp;
 {
 	struct in_addr val;
 
@@ -92,7 +92,7 @@ inet_addr(cp)
  */
 int
 inet_aton(cp, addr)
-	register const char *cp;
+	const char *cp;
 	struct in_addr *addr;
 {
 	u_long parts[4];
diff --git a/lib/libc/net/inet_lnaof.c b/lib/libc/net/inet_lnaof.c
index 9225928..e79a39b 100644
--- a/lib/libc/net/inet_lnaof.c
+++ b/lib/libc/net/inet_lnaof.c
@@ -50,7 +50,7 @@ in_addr_t
 inet_lnaof(in)
 	struct in_addr in;
 {
-	register in_addr_t i = ntohl(in.s_addr);
+	in_addr_t i = ntohl(in.s_addr);
 
 	if (IN_CLASSA(i))
 		return ((i)&IN_CLASSA_HOST);
diff --git a/lib/libc/net/inet_netof.c b/lib/libc/net/inet_netof.c
index 94f27a3..feba96b 100644
--- a/lib/libc/net/inet_netof.c
+++ b/lib/libc/net/inet_netof.c
@@ -49,7 +49,7 @@ in_addr_t
 inet_netof(in)
 	struct in_addr in;
 {
-	register in_addr_t i = ntohl(in.s_addr);
+	in_addr_t i = ntohl(in.s_addr);
 
 	if (IN_CLASSA(i))
 		return (((i)&IN_CLASSA_NET) >> IN_CLASSA_NSHIFT);
diff --git a/lib/libc/net/inet_network.c b/lib/libc/net/inet_network.c
index 7cc30a5..5ee0c8e 100644
--- a/lib/libc/net/inet_network.c
+++ b/lib/libc/net/inet_network.c
@@ -49,12 +49,12 @@ static char sccsid[] = "@(#)inet_network.c	8.1 (Berkeley) 6/4/93";
  */
 in_addr_t
 inet_network(cp)
-	register const char *cp;
+	const char *cp;
 {
-	register in_addr_t val, base, n;
-	register char c;
+	in_addr_t val, base, n;
+	char c;
 	in_addr_t parts[4], *pp = parts;
-	register int i;
+	int i;
 
 again:
 	val = 0; base = 10;
diff --git a/lib/libc/net/ip6opt.c b/lib/libc/net/ip6opt.c
index f9291b9..b692a91 100644
--- a/lib/libc/net/ip6opt.c
+++ b/lib/libc/net/ip6opt.c
@@ -70,7 +70,7 @@ inet6_option_init(bp, cmsgp, type)
 	struct cmsghdr **cmsgp;
 	int type;
 {
-	register struct cmsghdr *ch = (struct cmsghdr *)bp;
+	struct cmsghdr *ch = (struct cmsghdr *)bp;
 
 	/* argument validation */
 	if (type != IPV6_HOPOPTS && type != IPV6_DSTOPTS)
@@ -102,7 +102,7 @@ inet6_option_append(cmsg, typep, multx, plusy)
 	int plusy;
 {
 	int padlen, optlen, off;
-	register u_char *bp = (u_char *)cmsg + cmsg->cmsg_len;
+	u_char *bp = (u_char *)cmsg + cmsg->cmsg_len;
 	struct ip6_ext *eh = (struct ip6_ext *)CMSG_DATA(cmsg);
 
 	/* argument validation */
@@ -176,7 +176,7 @@ inet6_option_alloc(cmsg, datalen, multx, plusy)
 	int plusy;
 {
 	int padlen, off;
-	register u_int8_t *bp = (u_char *)cmsg + cmsg->cmsg_len;
+	u_int8_t *bp = (u_char *)cmsg + cmsg->cmsg_len;
 	u_int8_t *retval;
 	struct ip6_ext *eh = (struct ip6_ext *)CMSG_DATA(cmsg);
 
diff --git a/lib/libc/net/iso_addr.c b/lib/libc/net/iso_addr.c
index 8829497..d81ee5f 100644
--- a/lib/libc/net/iso_addr.c
+++ b/lib/libc/net/iso_addr.c
@@ -34,6 +34,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)iso_addr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <netiso/iso.h>
@@ -50,12 +52,12 @@ static char sccsid[] = "@(#)iso_addr.c	8.1 (Berkeley) 6/4/93";
 
 struct iso_addr *
 iso_addr(addr)
-	register const char *addr;
+	const char *addr;
 {
 	static struct iso_addr out_addr;
-	register char *cp = out_addr.isoa_genaddr;
+	char *cp = out_addr.isoa_genaddr;
 	char *cplim = cp + sizeof(out_addr.isoa_genaddr);
-	register int byte = 0, state = VIRGIN, new;
+	int byte = 0, state = VIRGIN, new;
 
 	bzero((char *)&out_addr, sizeof(out_addr));
 	do {
diff --git a/lib/libc/net/linkaddr.c b/lib/libc/net/linkaddr.c
index 68eed3d..c23559a 100644
--- a/lib/libc/net/linkaddr.c
+++ b/lib/libc/net/linkaddr.c
@@ -34,6 +34,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)linkaddr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -53,12 +55,12 @@ static char sccsid[] = "@(#)linkaddr.c	8.1 (Berkeley) 6/4/93";
 
 void
 link_addr(addr, sdl)
-	register const char *addr;
-	register struct sockaddr_dl *sdl;
+	const char *addr;
+	struct sockaddr_dl *sdl;
 {
-	register char *cp = sdl->sdl_data;
+	char *cp = sdl->sdl_data;
 	char *cplim = sdl->sdl_len + (char *)sdl;
-	register int byte = 0, state = NAMING, new;
+	int byte = 0, state = NAMING, new;
 
 	bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1);
 	sdl->sdl_family = AF_LINK;
@@ -124,12 +126,12 @@ static char hexlist[] = "0123456789abcdef";
 
 char *
 link_ntoa(sdl)
-	register const struct sockaddr_dl *sdl;
+	const struct sockaddr_dl *sdl;
 {
 	static char obuf[64];
-	register char *out = obuf;
-	register int i;
-	register u_char *in = (u_char *)LLADDR(sdl);
+	char *out = obuf;
+	int i;
+	u_char *in = (u_char *)LLADDR(sdl);
 	u_char *inlim = in + sdl->sdl_alen;
 	int firsttime = 1;
 
diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c
index 4ab24b3..6beaa2c 100644
--- a/lib/libc/net/name6.c
+++ b/lib/libc/net/name6.c
@@ -991,9 +991,9 @@ getanswer(answer, anslen, qname, qtype, template, errp)
 	struct hostent *template;
 	int *errp;
 {
-	register const HEADER *hp;
-	register const u_char *cp;
-	register int n;
+	const HEADER *hp;
+	const u_char *cp;
+	int n;
 	const u_char *eom, *erdata;
 	char *bp, **ap, **hap;
 	int type, class, buflen, ancount, qdcount;
@@ -1202,7 +1202,7 @@ getanswer(answer, anslen, qname, qtype, template, errp)
 			DNS_ASSERT(strcasecmp(template->h_name, bp) == 0);
 			DNS_ASSERT(n == template->h_length);
 			if (!haveanswer) {
-				register int nn;
+				int nn;
 
 				template->h_name = bp;
 				nn = strlen(bp) + 1;	/* for the \0 */
diff --git a/lib/libc/net/ns_addr.c b/lib/libc/net/ns_addr.c
index e00f20d..a9558b6 100644
--- a/lib/libc/net/ns_addr.c
+++ b/lib/libc/net/ns_addr.c
@@ -103,7 +103,7 @@ Field(buf, out, len)
 	u_char *out;
 	int len;
 {
-	register char *bp = buf;
+	char *bp = buf;
 	int i, ibase, base16 = 0, base10 = 0, clen = 0;
 	int hb[6], *hp;
 
diff --git a/lib/libc/net/ns_ntoa.c b/lib/libc/net/ns_ntoa.c
index 6ba2caf..0f9458f 100644
--- a/lib/libc/net/ns_ntoa.c
+++ b/lib/libc/net/ns_ntoa.c
@@ -52,9 +52,9 @@ ns_ntoa(addr)
 	static char obuf[40];
 	union { union ns_net net_e; u_long long_e; } net;
 	u_short port = htons(addr.x_port);
-	register char *cp;
+	char *cp;
 	char *cp2;
-	register u_char *up = addr.x_host.c_host;
+	u_char *up = addr.x_host.c_host;
 	u_char *uplim = up + 6;
 	static char *spectHex();
 
@@ -89,7 +89,7 @@ spectHex(p0)
 {
 	int ok = 0;
 	int nonzero = 0;
-	register char *p = p0;
+	char *p = p0;
 	for (; *p; p++) switch (*p) {
 
 	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
diff --git a/lib/libc/net/nsap_addr.c b/lib/libc/net/nsap_addr.c
index 1f16fd2..cc1ea19 100644
--- a/lib/libc/net/nsap_addr.c
+++ b/lib/libc/net/nsap_addr.c
@@ -30,7 +30,7 @@ static char rcsid[] = "$FreeBSD$";
 
 static char
 xtob(c)
-	register int c;
+	int c;
 {
 	return (c - (((c >= '0') && (c <= '9')) ? '0' : '7'));
 }
@@ -74,10 +74,10 @@ inet_nsap_addr(ascii, binary, maxlen)
 char *
 inet_nsap_ntoa(binlen, binary, ascii)
 	int binlen;
-	register const u_char *binary;
-	register char *ascii;
+	const u_char *binary;
+	char *ascii;
 {
-	register int nib;
+	int nib;
 	int i;
 	static char tmpbuf[255*3];
 	char *start;
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index 68ccb71..f64fa2c 100644
--- a/lib/libc/net/rcmd.c
+++ b/lib/libc/net/rcmd.c
@@ -457,7 +457,7 @@ iruserok_sa(ra, rlen, superuser, ruser, luser)
 	int superuser;
 	const char *ruser, *luser;
 {
-	register char *cp;
+	char *cp;
 	struct stat sbuf;
 	struct passwd *pwd;
 	FILE *hostf;
@@ -605,7 +605,7 @@ __ivaliduser_sa(hostf, raddr, salen, luser, ruser)
 	socklen_t salen;
 	const char *luser, *ruser;
 {
-	register char *user, *p;
+	char *user, *p;
 	int ch;
 	char buf[MAXHOSTNAMELEN + 128];		/* host + login */
 	char hname[MAXHOSTNAMELEN];
diff --git a/lib/libc/net/res_init.c b/lib/libc/net/res_init.c
index ce74928..46bf3a9 100644
--- a/lib/libc/net/res_init.c
+++ b/lib/libc/net/res_init.c
@@ -139,9 +139,9 @@ struct __res_state_ext _res_ext;
 int
 res_init()
 {
-	register FILE *fp;
-	register char *cp, **pp;
-	register int n;
+	FILE *fp;
+	char *cp, **pp;
+	int n;
 	char buf[MAXDNAME];
 	int nserv = 0;    /* number of nameserver records read from file */
 	int haveenv = 0;
@@ -556,7 +556,7 @@ static u_int32_t
 net_mask(in)		/* XXX - should really use system's version of this */
 	struct in_addr in;
 {
-	register u_int32_t i = ntohl(in.s_addr);
+	u_int32_t i = ntohl(in.s_addr);
 
 	if (IN_CLASSA(i))
 		return (htonl(IN_CLASSA_NET));
diff --git a/lib/libc/net/res_mkquery.c b/lib/libc/net/res_mkquery.c
index 6cbd373..8f7a7a8 100644
--- a/lib/libc/net/res_mkquery.c
+++ b/lib/libc/net/res_mkquery.c
@@ -100,9 +100,9 @@ res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
 	u_char *buf;		/* buffer to put query */
 	int buflen;		/* size of buffer */
 {
-	register HEADER *hp;
-	register u_char *cp;
-	register int n;
+	HEADER *hp;
+	u_char *cp;
+	int n;
 	u_char *dnptrs[20], **dpp, **lastdnptr;
 
 	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
@@ -213,8 +213,8 @@ res_opt(n0, buf, buflen, anslen)
 	int buflen;		/* size of buffer */
 	int anslen;		/* answer buffer length */
 {
-	register HEADER *hp;
-	register u_char *cp;
+	HEADER *hp;
+	u_char *cp;
 
 	hp = (HEADER *) buf;
 	cp = buf + n0;
diff --git a/lib/libc/net/res_query.c b/lib/libc/net/res_query.c
index 8a94a42..6a46f29 100644
--- a/lib/libc/net/res_query.c
+++ b/lib/libc/net/res_query.c
@@ -373,7 +373,7 @@ const char *
 hostalias(name)
 	const char *name;
 {
-	register char *cp1, *cp2;
+	char *cp1, *cp2;
 	FILE *fp;
 	char *file;
 	char buf[BUFSIZ];
diff --git a/lib/libc/net/rthdr.c b/lib/libc/net/rthdr.c
index 1f9d102..c919313 100644
--- a/lib/libc/net/rthdr.c
+++ b/lib/libc/net/rthdr.c
@@ -62,8 +62,8 @@ inet6_rthdr_init(bp, type)
     void *bp;
     int type;
 {
-    register struct cmsghdr *ch = (struct cmsghdr *)bp;
-    register struct ip6_rthdr *rthdr;
+    struct cmsghdr *ch = (struct cmsghdr *)bp;
+    struct ip6_rthdr *rthdr;
 
     rthdr = (struct ip6_rthdr *)CMSG_DATA(ch);
 
@@ -90,7 +90,7 @@ inet6_rthdr_add(cmsg, addr, flags)
     const struct in6_addr *addr;
     u_int flags;
 {
-    register struct ip6_rthdr *rthdr;
+    struct ip6_rthdr *rthdr;
 
     rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
 
@@ -139,7 +139,7 @@ inet6_rthdr_lasthop(cmsg, flags)
     struct cmsghdr *cmsg;
     unsigned int flags;
 {
-    register struct ip6_rthdr *rthdr;
+    struct ip6_rthdr *rthdr;
 
     rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
 
@@ -195,7 +195,7 @@ int
 inet6_rthdr_segments(cmsg)
     const struct cmsghdr *cmsg;
 {
-    register struct ip6_rthdr *rthdr;
+    struct ip6_rthdr *rthdr;
 
     rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
 
@@ -229,7 +229,7 @@ inet6_rthdr_getaddr(cmsg, index)
     struct cmsghdr *cmsg;
     int index;
 {
-    register struct ip6_rthdr *rthdr;
+    struct ip6_rthdr *rthdr;
 
     rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
 
@@ -270,7 +270,7 @@ inet6_rthdr_getflags(cmsg, index)
     const struct cmsghdr *cmsg;
     int index;
 {
-    register struct ip6_rthdr *rthdr;
+    struct ip6_rthdr *rthdr;
 
     rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);