From: David Rhodus <drhodus@dragonflybsd.org>
Date: Mon, 25 Oct 2004 19:39:09 +0000 (+0000)
Subject: Remove register keyword usage.
X-Git-Tag: v2.0.1~9901
X-Git-Url: https://gitweb.dragonflybsd.org/~uqs/games.git/commitdiff_plain/660c873be252889b5e036891eab918b312214907

Remove register keyword usage.

Add missing $DragonFly$ keyword to the following files:
src/lib/libc/db/btree/bt_utils.c
src/lib/libc/db/hash/hash_log2.c
src/lib/libc/net/getproto.c
src/lib/libc/net/getprotoent.c
src/lib/libc/net/getprotoname.c
src/lib/libc/net/getservbyname.c
src/lib/libc/net/getservbyport.c
src/lib/libc/net/iso_addr.c
src/lib/libc/net/linkaddr.c
src/lib/libc/net/ns_ntoa.c
src/lib/libc/quad/muldi3.c
src/lib/libc/quad/qdivrem.c
src/lib/libc/rpc/authdes_prot.c
src/lib/libc/rpc/key_prot_xdr.c
src/lib/libcompat/4.3/insque.c
src/lib/libcompat/4.3/lsearch.c
src/lib/libcompat/4.3/remque.c
src/lib/libcompat/4.4/cuserid.c
src/lib/libcompat/regexp/regexp.c
src/lib/libcompat/regexp/regsub.c
src/lib/libcr/db/btree/bt_utils.c
src/lib/libcr/db/hash/hash_log2.c
src/lib/libcr/net/getproto.c
src/lib/libcr/net/getprotoent.c
src/lib/libcr/net/getprotoname.c
src/lib/libcr/net/getservbyname.c
src/lib/libcr/net/getservbyport.c
src/lib/libcr/net/iso_addr.c
src/lib/libcr/net/linkaddr.c
src/lib/libcr/net/ns_ntoa.c
src/lib/libcr/quad/muldi3.c
src/lib/libcr/quad/qdivrem.c
src/lib/libcr/rpc/authdes_prot.c
src/lib/libcr/rpc/key_prot_xdr.c
src/lib/libedit/common.c
src/lib/libedit/emacs.c
src/lib/libipx/ipx_ntoa.c
src/lib/libm/common_source/fmod.c
src/lib/libstand/ether.c
src/lib/libstand/fstat.c
src/lib/libstand/gets.c
src/lib/libstand/ioctl.c
src/lib/libstand/netif.c
src/lib/libstand/rarp.c
src/lib/libstand/rpc.c
src/lib/libstand/strcasecmp.c
src/lib/libstand/strtol.c
src/lib/libstand/write.c
---

diff --git a/lib/libatm/ip_checksum.c b/lib/libatm/ip_checksum.c
index f9fe9fce8c..f6b27e3219 100644
--- a/lib/libatm/ip_checksum.c
+++ b/lib/libatm/ip_checksum.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/lib/libatm/ip_checksum.c,v 1.3.2.1 2001/09/28 16:52:10 dillon Exp $
- *	@(#) $DragonFly: src/lib/libatm/ip_checksum.c,v 1.2 2003/06/17 04:26:41 dillon Exp $
+ *	@(#) $DragonFly: src/lib/libatm/ip_checksum.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  *
  */
 
@@ -76,7 +76,7 @@ ip_checksum(addr, count)
 	/* Compute Internet Checksum for "count" bytes
 	 * beginning at location "addr".
 	 */
-	register long sum = 0;
+	long sum = 0;
 
 	while( count > 1 ) {
 		/* This is the inner loop */
diff --git a/lib/libc/alpha/gen/isinf.c b/lib/libc/alpha/gen/isinf.c
index 6d24aea0aa..b032cfb8fa 100644
--- a/lib/libc/alpha/gen/isinf.c
+++ b/lib/libc/alpha/gen/isinf.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: isinf.c,v 1.1 1995/02/10 17:50:23 cgd Exp $	*/
 /* $FreeBSD: src/lib/libc/alpha/gen/isinf.c,v 1.1.1.1.6.1 2000/08/21 21:09:29 jhb Exp $ */
-/* $DragonFly: src/lib/libc/alpha/gen/Attic/isinf.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ */
+/* $DragonFly: src/lib/libc/alpha/gen/Attic/isinf.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -37,7 +37,7 @@ int
 isnan(d)
 	double d;
 {
-	register struct ieee_double *p = (struct ieee_double *)&d;
+	struct ieee_double *p = (struct ieee_double *)&d;
 
 	return (p->dbl_exp == DBL_EXP_INFNAN &&
 	    (p->dbl_frach || p->dbl_fracl));
@@ -47,7 +47,7 @@ int
 isinf(d)
 	double d;
 {
-	register struct ieee_double *p = (struct ieee_double *)&d;
+	struct ieee_double *p = (struct ieee_double *)&d;
 
 	return (p->dbl_exp == DBL_EXP_INFNAN &&
 	    !p->dbl_frach && !p->dbl_fracl);
diff --git a/lib/libc/alpha/gen/ldexp.c b/lib/libc/alpha/gen/ldexp.c
index 676251d12b..2a51b0ec22 100644
--- a/lib/libc/alpha/gen/ldexp.c
+++ b/lib/libc/alpha/gen/ldexp.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: ldexp.c,v 1.1 1995/02/10 17:50:24 cgd Exp $	*/
 /* $FreeBSD: src/lib/libc/alpha/gen/ldexp.c,v 1.1.1.1.6.1 2000/08/21 21:09:29 jhb Exp $ */
-/* $DragonFly: src/lib/libc/alpha/gen/Attic/ldexp.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ */
+/* $DragonFly: src/lib/libc/alpha/gen/Attic/ldexp.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -43,7 +43,7 @@ ldexp(val, exp)
 	double val;
 	int exp;
 {
-	register int oldexp, newexp, mulexp;
+	int oldexp, newexp, mulexp;
 	union doub {
 		double v;
 		struct ieee_double s;
diff --git a/lib/libc/amd64/gen/isinf.c b/lib/libc/amd64/gen/isinf.c
index 70cc9e5261..a476d3bd36 100644
--- a/lib/libc/amd64/gen/isinf.c
+++ b/lib/libc/amd64/gen/isinf.c
@@ -32,7 +32,7 @@
  *
  * @(#)isinf.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/amd64/gen/isinf.c,v 1.10 2003/02/12 20:03:41 mike Exp $
- * $DragonFly: src/lib/libc/amd64/gen/Attic/isinf.c,v 1.1 2004/02/02 05:43:14 dillon Exp $
+ * $DragonFly: src/lib/libc/amd64/gen/Attic/isinf.c,v 1.2 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /* For binary compat; to be removed in FreeBSD 6.0. */
@@ -43,7 +43,7 @@ int
 isnan(d)
 	double d;
 {
-	register struct IEEEdp {
+	struct IEEEdp {
 		u_int manl : 32;
 		u_int manh : 20;
 		u_int  exp : 11;
@@ -57,7 +57,7 @@ int
 isinf(d)
 	double d;
 {
-	register struct IEEEdp {
+	struct IEEEdp {
 		u_int manl : 32;
 		u_int manh : 20;
 		u_int  exp : 11;
diff --git a/lib/libc/db/btree/bt_utils.c b/lib/libc/db/btree/bt_utils.c
index 67980df98d..3a76380dff 100644
--- a/lib/libc/db/btree/bt_utils.c
+++ b/lib/libc/db/btree/bt_utils.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)bt_utils.c	8.8 (Berkeley) 7/20/94
+ * $DragonFly: src/lib/libc/db/btree/bt_utils.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -214,8 +215,8 @@ int
 __bt_defcmp(a, b)
 	const DBT *a, *b;
 {
-	register size_t len;
-	register u_char *p1, *p2;
+	size_t len;
+	u_char *p1, *p2;
 
 	/*
 	 * XXX
@@ -244,8 +245,8 @@ size_t
 __bt_defpfx(a, b)
 	const DBT *a, *b;
 {
-	register u_char *p1, *p2;
-	register size_t cnt, len;
+	u_char *p1, *p2;
+	size_t cnt, len;
 
 	cnt = 1;
 	len = MIN(a->size, b->size);
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
index fa616f7022..7d05478a8a 100644
--- a/lib/libc/db/hash/hash.c
+++ b/lib/libc/db/hash/hash.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/db/hash/hash.c,v 1.8 2000/01/27 23:06:08 jasone Exp $
- * $DragonFly: src/lib/libc/db/hash/hash.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $
+ * $DragonFly: src/lib/libc/db/hash/hash.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  *
  * @(#)hash.c	8.9 (Berkeley) 6/16/94
  */
@@ -355,7 +355,7 @@ init_htab(hashp, nelem)
 	HTAB *hashp;
 	int nelem;
 {
-	register int nbuckets, nsegs;
+	int nbuckets, nsegs;
 	int l2;
 
 	/*
@@ -601,11 +601,11 @@ hash_access(hashp, action, key, val)
 	ACTION action;
 	DBT *key, *val;
 {
-	register BUFHEAD *rbufp;
+	BUFHEAD *rbufp;
 	BUFHEAD *bufp, *save_bufp;
-	register u_int16_t *bp;
-	register int n, ndx, off, size;
-	register char *kp;
+	u_int16_t *bp;
+	int n, ndx, off, size;
+	char *kp;
 	u_int16_t pageno;
 
 #ifdef HASH_STATISTICS
@@ -730,8 +730,8 @@ hash_seq(dbp, key, data, flag)
 	DBT *key, *data;
 	u_int32_t flag;
 {
-	register u_int32_t bucket;
-	register BUFHEAD *bufp;
+	u_int32_t bucket;
+	BUFHEAD *bufp;
 	HTAB *hashp;
 	u_int16_t *bp, ndx;
 
@@ -874,7 +874,7 @@ hash_realloc(p_ptr, oldsize, newsize)
 	SEGMENT **p_ptr;
 	int oldsize, newsize;
 {
-	register void *p;
+	void *p;
 
 	if ( (p = malloc(newsize)) ) {
 		memmove(p, *p_ptr, oldsize);
@@ -910,8 +910,8 @@ alloc_segs(hashp, nsegs)
 	HTAB *hashp;
 	int nsegs;
 {
-	register int i;
-	register SEGMENT store;
+	int i;
+	SEGMENT store;
 
 	int save_errno;
 
diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c
index c42ef81b0e..06170e8035 100644
--- a/lib/libc/db/hash/hash_bigkey.c
+++ b/lib/libc/db/hash/hash_bigkey.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94
- * $DragonFly: src/lib/libc/db/hash/hash_bigkey.c,v 1.4 2003/11/12 20:21:23 eirikn Exp $
+ * $DragonFly: src/lib/libc/db/hash/hash_bigkey.c,v 1.5 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -89,7 +89,7 @@ __big_insert(hashp, bufp, key, val)
 	BUFHEAD *bufp;
 	const DBT *key, *val;
 {
-	register u_int16_t *p;
+	u_int16_t *p;
 	int key_size, n, val_size;
 	u_int16_t space, move_bytes, off;
 	char *cp, *key_data, *val_data;
@@ -187,7 +187,7 @@ __big_delete(hashp, bufp)
 	HTAB *hashp;
 	BUFHEAD *bufp;
 {
-	register BUFHEAD *last_bfp, *rbufp;
+	BUFHEAD *last_bfp, *rbufp;
 	u_int16_t *bp, pageno;
 	int key_done, n;
 
@@ -269,8 +269,8 @@ __find_bigpair(hashp, bufp, ndx, key, size)
 	char *key;
 	int size;
 {
-	register u_int16_t *bp;
-	register char *p;
+	u_int16_t *bp;
+	char *p;
 	int ksize;
 	u_int16_t bytes;
 	char *kkey;
@@ -451,8 +451,8 @@ collect_data(hashp, bufp, len, set)
 	BUFHEAD *bufp;
 	int len, set;
 {
-	register u_int16_t *bp;
-	register char *p;
+	u_int16_t *bp;
+	char *p;
 	BUFHEAD *xbp;
 	u_int16_t save_addr;
 	int mylen, totlen;
@@ -575,8 +575,8 @@ __big_split(hashp, op, np, big_keyp, addr, obucket, ret)
 	u_int32_t   obucket;/* Old Bucket */
 	SPLIT_RETURN *ret;
 {
-	register BUFHEAD *tmpp;
-	register u_int16_t *tp;
+	BUFHEAD *tmpp;
+	u_int16_t *tp;
 	BUFHEAD *bp;
 	DBT key, val;
 	u_int32_t change;
diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c
index 34b5ea3184..d12568e52f 100644
--- a/lib/libc/db/hash/hash_buf.c
+++ b/lib/libc/db/hash/hash_buf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/db/hash/hash_buf.c,v 1.4.8.1 2001/03/05 07:38:05 obrien Exp $
- * $DragonFly: src/lib/libc/db/hash/hash_buf.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $
+ * $DragonFly: src/lib/libc/db/hash/hash_buf.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  *
  * @(#)hash_buf.c	8.5 (Berkeley) 7/15/94
  */
@@ -108,9 +108,9 @@ __get_buf(hashp, addr, prev_bp, newpage)
 	BUFHEAD *prev_bp;
 	int newpage;	/* If prev_bp set, indicates a new overflow page. */
 {
-	register BUFHEAD *bp;
-	register u_int32_t is_disk_mask;
-	register int is_disk, segment_ndx;
+	BUFHEAD *bp;
+	u_int32_t is_disk_mask;
+	int is_disk, segment_ndx;
 	SEGMENT segp;
 
 	is_disk = 0;
@@ -162,9 +162,9 @@ newbuf(hashp, addr, prev_bp)
 	u_int32_t addr;
 	BUFHEAD *prev_bp;
 {
-	register BUFHEAD *bp;		/* The buffer we're going to use */
-	register BUFHEAD *xbp;		/* Temp pointer */
-	register BUFHEAD *next_xbp;
+	BUFHEAD *bp;		/* The buffer we're going to use */
+	BUFHEAD *xbp;		/* Temp pointer */
+	BUFHEAD *next_xbp;
 	SEGMENT segp;
 	int segment_ndx;
 	u_int16_t oaddr, *shortp;
diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c
index 35ad6902c0..ae16b6d2a9 100644
--- a/lib/libc/db/hash/hash_func.c
+++ b/lib/libc/db/hash/hash_func.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)hash_func.c	8.2 (Berkeley) 2/21/94
- * $DragonFly: src/lib/libc/db/hash/hash_func.c,v 1.4 2003/11/12 20:21:23 eirikn Exp $
+ * $DragonFly: src/lib/libc/db/hash/hash_func.c,v 1.5 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -67,10 +67,10 @@ u_int32_t (*__default_hash) (const void *, size_t) = hash4;
 static u_int32_t
 hash1(keyarg, len)
 	const void *keyarg;
-	register size_t len;
+	size_t len;
 {
-	register const u_char *key;
-	register u_int32_t h;
+	const u_char *key;
+	u_int32_t h;
 
 	/* Convert string to integer */
 	for (key = keyarg, h = 0; len--;)
@@ -89,9 +89,9 @@ hash2(keyarg, len)
 	const void *keyarg;
 	size_t len;
 {
-	register const u_char *e, *key;
-	register u_int32_t h;
-	register u_char c;
+	const u_char *e, *key;
+	u_int32_t h;
+	u_char c;
 
 	key = keyarg;
 	e = key + len;
@@ -116,11 +116,11 @@ hash2(keyarg, len)
 static u_int32_t
 hash3(keyarg, len)
 	const void *keyarg;
-	register size_t len;
+	size_t len;
 {
-	register const u_char *key;
-	register size_t loop;
-	register u_int32_t h;
+	const u_char *key;
+	size_t loop;
+	u_int32_t h;
 
 #define HASHC   h = *key++ + 65599 * h
 
@@ -164,11 +164,11 @@ hash3(keyarg, len)
 static u_int32_t
 hash4(keyarg, len)
 	const void *keyarg;
-	register size_t len;
+	size_t len;
 {
-	register const u_char *key;
-	register size_t loop;
-	register u_int32_t h;
+	const u_char *key;
+	size_t loop;
+	u_int32_t h;
 
 #define HASH4a   h = (h << 5) - h + *key++;
 #define HASH4b   h = (h << 5) + h + *key++;
diff --git a/lib/libc/db/hash/hash_log2.c b/lib/libc/db/hash/hash_log2.c
index 473a7eecb2..3ce298d816 100644
--- a/lib/libc/db/hash/hash_log2.c
+++ b/lib/libc/db/hash/hash_log2.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)hash_log2.c	8.2 (Berkeley) 5/31/94
+ * $DragonFly: src/lib/libc/db/hash/hash_log2.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -44,7 +45,7 @@ u_int32_t
 __log2(num)
 	u_int32_t num;
 {
-	register u_int32_t i, limit;
+	u_int32_t i, limit;
 
 	limit = 1;
 	for (i = 0; limit < num; limit = limit << 1, i++);
diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c
index b8fd971b54..b42f30fc9e 100644
--- a/lib/libc/db/hash/hash_page.c
+++ b/lib/libc/db/hash/hash_page.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/db/hash/hash_page.c,v 1.5 2000/01/27 23:06:08 jasone Exp $
- * $DragonFly: src/lib/libc/db/hash/hash_page.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $
+ * $DragonFly: src/lib/libc/db/hash/hash_page.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  *
  * @(#)hash_page.c	8.7 (Berkeley) 8/16/94
  */
@@ -98,7 +98,7 @@ putpair(p, key, val)
 	char *p;
 	const DBT *key, *val;
 {
-	register u_int16_t *bp, n, off;
+	u_int16_t *bp, n, off;
 
 	bp = (u_int16_t *)p;
 
@@ -129,10 +129,10 @@ extern int
 __delpair(hashp, bufp, ndx)
 	HTAB *hashp;
 	BUFHEAD *bufp;
-	register int ndx;
+	int ndx;
 {
-	register u_int16_t *bp, newoff;
-	register int n;
+	u_int16_t *bp, newoff;
+	int n;
 	u_int16_t pairlen;
 
 	bp = (u_int16_t *)bufp->page;
@@ -148,9 +148,9 @@ __delpair(hashp, bufp, ndx)
 
 	if (ndx != (n - 1)) {
 		/* Hard Case -- need to shuffle keys */
-		register int i;
-		register char *src = bufp->page + (int)OFFSET(bp);
-		register char *dst = src + (int)pairlen;
+		int i;
+		char *src = bufp->page + (int)OFFSET(bp);
+		char *dst = src + (int)pairlen;
 		memmove(dst, src, bp[ndx + 1] - OFFSET(bp));
 
 		/* Now adjust the pointers */
@@ -183,9 +183,9 @@ __split_page(hashp, obucket, nbucket)
 	HTAB *hashp;
 	u_int32_t obucket, nbucket;
 {
-	register BUFHEAD *new_bufp, *old_bufp;
-	register u_int16_t *ino;
-	register char *np;
+	BUFHEAD *new_bufp, *old_bufp;
+	u_int16_t *ino;
+	char *np;
 	DBT key, val;
 	int n, ndx, retval;
 	u_int16_t copyto, diff, off, moved;
@@ -282,10 +282,10 @@ ugly_split(hashp, obucket, old_bufp, new_bufp, copyto, moved)
 	int copyto;	/* First byte on page which contains key/data values. */
 	int moved;	/* Number of pairs moved to new page. */
 {
-	register BUFHEAD *bufp;	/* Buffer header for ino */
-	register u_int16_t *ino;	/* Page keys come off of */
-	register u_int16_t *np;	/* New page */
-	register u_int16_t *op;	/* Page keys go on to if they aren't moving */
+	BUFHEAD *bufp;	/* Buffer header for ino */
+	u_int16_t *ino;	/* Page keys come off of */
+	u_int16_t *np;	/* New page */
+	u_int16_t *op;	/* Page keys go on to if they aren't moving */
 
 	BUFHEAD *last_bfp;	/* Last buf header OVFL needing to be freed */
 	DBT key, val;
@@ -401,7 +401,7 @@ __addel(hashp, bufp, key, val)
 	BUFHEAD *bufp;
 	const DBT *key, *val;
 {
-	register u_int16_t *bp, *sop;
+	u_int16_t *bp, *sop;
 	int do_expand;
 
 	bp = (u_int16_t *)bufp->page;
@@ -467,7 +467,7 @@ __add_ovflpage(hashp, bufp)
 	HTAB *hashp;
 	BUFHEAD *bufp;
 {
-	register u_int16_t *sp;
+	u_int16_t *sp;
 	u_int16_t ndx, ovfl_num;
 #ifdef DEBUG1
 	int tmp1, tmp2;
@@ -522,7 +522,7 @@ __get_page(hashp, p, bucket, is_bucket, is_disk, is_bitmap)
 	u_int32_t bucket;
 	int is_bucket, is_disk, is_bitmap;
 {
-	register int fd, page, size;
+	int fd, page, size;
 	int rsize;
 	u_int16_t *bp;
 
@@ -552,7 +552,7 @@ __get_page(hashp, p, bucket, is_bucket, is_disk, is_bitmap)
 		PAGE_INIT(p);
 	} else
 		if (hashp->LORDER != BYTE_ORDER) {
-			register int i, max;
+			int i, max;
 
 			if (is_bitmap) {
 				max = hashp->BSIZE >> 2; /* divide by 4 */
@@ -582,7 +582,7 @@ __put_page(hashp, p, bucket, is_bucket, is_bitmap)
 	u_int32_t bucket;
 	int is_bucket, is_bitmap;
 {
-	register int fd, page, size;
+	int fd, page, size;
 	int wsize;
 
 	size = hashp->BSIZE;
@@ -591,8 +591,8 @@ __put_page(hashp, p, bucket, is_bucket, is_bitmap)
 	fd = hashp->fp;
 
 	if (hashp->LORDER != BYTE_ORDER) {
-		register int i;
-		register int max;
+		int i;
+		int max;
 
 		if (is_bitmap) {
 			max = hashp->BSIZE >> 2;	/* divide by 4 */
@@ -651,7 +651,7 @@ static u_int32_t
 first_free(map)
 	u_int32_t map;
 {
-	register u_int32_t i, mask;
+	u_int32_t i, mask;
 
 	mask = 0x1;
 	for (i = 0; i < BITS_PER_MAP; i++) {
@@ -666,8 +666,8 @@ static u_int16_t
 overflow_page(hashp)
 	HTAB *hashp;
 {
-	register u_int32_t *freep;
-	register int max_free, offset, splitnum;
+	u_int32_t *freep;
+	int max_free, offset, splitnum;
 	u_int16_t addr;
 	int bit, first_page, free_bit, free_page, i, in_use_bits, j;
 #ifdef DEBUG2
@@ -815,7 +815,7 @@ __free_ovflpage(hashp, obufp)
 	HTAB *hashp;
 	BUFHEAD *obufp;
 {
-	register u_int16_t addr;
+	u_int16_t addr;
 	u_int32_t *freep;
 	int bit_address, free_page, free_bit;
 	u_int16_t ndx;
@@ -883,7 +883,7 @@ squeeze_key(sp, key, val)
 	u_int16_t *sp;
 	const DBT *key, *val;
 {
-	register char *p;
+	char *p;
 	u_int16_t free_space, n, off, pageno;
 
 	p = (char *)sp;
diff --git a/lib/libc/db/recno/rec_search.c b/lib/libc/db/recno/rec_search.c
index 09104a6a4c..9883e99736 100644
--- a/lib/libc/db/recno/rec_search.c
+++ b/lib/libc/db/recno/rec_search.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)rec_search.c	8.4 (Berkeley) 7/14/94
- * $DragonFly: src/lib/libc/db/recno/rec_search.c,v 1.2 2003/06/17 04:26:42 dillon Exp $
+ * $DragonFly: src/lib/libc/db/recno/rec_search.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -65,8 +65,8 @@ __rec_search(t, recno, op)
 	recno_t recno;
 	enum SRCHOP op;
 {
-	register indx_t index;
-	register PAGE *h;
+	indx_t index;
+	PAGE *h;
 	EPGNO *parent;
 	RINTERNAL *r;
 	pgno_t pg;
diff --git a/lib/libc/db/test/btree.tests/main.c b/lib/libc/db/test/btree.tests/main.c
index 93fb6280d4..8b742bf247 100644
--- a/lib/libc/db/test/btree.tests/main.c
+++ b/lib/libc/db/test/btree.tests/main.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)main.c	8.1 (Berkeley) 6/4/93
- * $DragonFly: src/lib/libc/db/test/btree.tests/main.c,v 1.4 2003/11/12 20:21:23 eirikn Exp $
+ * $DragonFly: src/lib/libc/db/test/btree.tests/main.c,v 1.5 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -607,7 +607,7 @@ load(db, argv)
 	DB *db;
 	char **argv;
 {
-	register char *p, *t;
+	char *p, *t;
 	FILE *fp;
 	DBT data, key;
 	recno_t cnt;
diff --git a/lib/libc/db/test/dbtest.c b/lib/libc/db/test/dbtest.c
index d1fb66fe11..be14d7ce0b 100644
--- a/lib/libc/db/test/dbtest.c
+++ b/lib/libc/db/test/dbtest.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)dbtest.c	8.17 (Berkeley) 9/1/94
  * $FreeBSD: src/lib/libc/db/test/dbtest.c,v 1.3.8.1 2000/08/21 22:44:47 jhb Exp $
- * $DragonFly: src/lib/libc/db/test/dbtest.c,v 1.4 2004/07/27 07:59:09 asmodai Exp $
+ * $DragonFly: src/lib/libc/db/test/dbtest.c,v 1.5 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -335,8 +335,8 @@ void
 compare(db1, db2)
 	DBT *db1, *db2;
 {
-	register size_t len;
-	register u_char *p1, *p2;
+	size_t len;
+	u_char *p1, *p2;
 
 	if (db1->size != db2->size)
 		printf("compare failed: key->data len %lu != data len %lu\n",
diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c
index cd38beb036..589e6e6104 100644
--- a/lib/libc/gmon/gmon.c
+++ b/lib/libc/gmon/gmon.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/gmon/gmon.c,v 1.8 2000/01/27 23:06:25 jasone Exp $
- * $DragonFly: src/lib/libc/gmon/gmon.c,v 1.4 2004/03/20 16:27:40 drhodus Exp $
+ * $DragonFly: src/lib/libc/gmon/gmon.c,v 1.5 2004/10/25 19:38:01 drhodus Exp $
  *
  * @(#)gmon.c	8.1 (Berkeley) 6/4/93
  */
@@ -71,7 +71,7 @@ monstartup(lowpc, highpc)
 	u_long lowpc;
 	u_long highpc;
 {
-	register int o;
+	int o;
 	char *cp;
 	struct gmonparam *p = &_gmonparam;
 
diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c
index 782e75afbd..98c485c69a 100644
--- a/lib/libc/gmon/mcount.c
+++ b/lib/libc/gmon/mcount.c
@@ -32,7 +32,7 @@
  *
  * @(#)mcount.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/gmon/mcount.c,v 1.17 1999/12/29 05:04:13 peter Exp $
- * $DragonFly: src/lib/libc/gmon/mcount.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $
+ * $DragonFly: src/lib/libc/gmon/mcount.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -64,16 +64,16 @@ void	user (void);
  * perform this optimization.
  */
 _MCOUNT_DECL(frompc, selfpc)	/* _mcount; may be static, inline, etc */
-	register uintfptr_t frompc, selfpc;
+	uintfptr_t frompc, selfpc;
 {
 #ifdef GUPROF
 	u_int delta;
 #endif
-	register fptrdiff_t frompci;
-	register u_short *frompcindex;
-	register struct tostruct *top, *prevtop;
-	register struct gmonparam *p;
-	register long toindex;
+	fptrdiff_t frompci;
+	u_short *frompcindex;
+	struct tostruct *top, *prevtop;
+	struct gmonparam *p;
+	long toindex;
 #ifdef _KERNEL
 	MCOUNT_DECL(s)
 #endif
diff --git a/lib/libc/i386/gen/isinf.c b/lib/libc/i386/gen/isinf.c
index b0551318f1..30c1366d15 100644
--- a/lib/libc/i386/gen/isinf.c
+++ b/lib/libc/i386/gen/isinf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/i386/gen/isinf.c,v 1.6 1999/08/27 23:59:21 peter Exp $
- * $DragonFly: src/lib/libc/i386/gen/Attic/isinf.c,v 1.3 2003/12/06 03:11:35 drhodus Exp $
+ * $DragonFly: src/lib/libc/i386/gen/Attic/isinf.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -40,7 +40,7 @@ int
 isnan(d)
 	double d;
 {
-	register struct IEEEdp {
+	struct IEEEdp {
 		u_int manl : 32;
 		u_int manh : 20;
 		u_int  exp : 11;
@@ -54,7 +54,7 @@ int
 isinf(d)
 	double d;
 {
-	register struct IEEEdp {
+	struct IEEEdp {
 		u_int manl : 32;
 		u_int manh : 20;
 		u_int  exp : 11;
diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c
index dbac3c2453..6547a515fb 100644
--- a/lib/libc/net/gethostbydns.c
+++ b/lib/libc/net/gethostbydns.c
@@ -55,7 +55,7 @@
  * @(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93
  * $From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $
  * $FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.27.2.5 2002/11/02 18:54:57 ume Exp $
- * $DragonFly: src/lib/libc/net/gethostbydns.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $
+ * $DragonFly: src/lib/libc/net/gethostbydns.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -152,9 +152,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;
@@ -377,7 +377,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 */
@@ -477,7 +477,7 @@ _gethostbydnsname(name, af)
 	int af;
 {
 	querybuf *buf;
-	register const char *cp;
+	const char *cp;
 	char *bp;
 	int n, size, type, len;
 	struct hostent *hp;
@@ -610,10 +610,10 @@ _gethostbydnsaddr(addr, len, af)
 	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 90ddfaa833..8a0205fd06 100644
--- a/lib/libc/net/gethostbyht.c
+++ b/lib/libc/net/gethostbyht.c
@@ -52,7 +52,7 @@
  *
  * @(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/net/gethostbyht.c,v 1.12 1999/08/28 00:00:05 peter Exp $
- * $DragonFly: src/lib/libc/net/gethostbyht.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/gethostbyht.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -101,7 +101,7 @@ struct hostent *
 gethostent()
 {
 	char *p;
-	register char *cp, **q;
+	char *cp, **q;
 	int af, len;
 
 	if (!hostf && !(hostf = fopen(_PATH_HOSTS, "r" ))) {
@@ -167,8 +167,8 @@ _gethostbyhtname(name, af)
 	const char *name;
 	int af;
 {
-	register struct hostent *p;
-	register char **cp;
+	struct hostent *p;
+	char **cp;
 	
 	sethostent(0);
 	while ((p = gethostent()) != NULL) {
@@ -190,7 +190,7 @@ _gethostbyhtaddr(addr, len, af)
 	const char *addr;
 	int len, af;
 {
-	register struct hostent *p;
+	struct hostent *p;
 
 	sethostent(0);
 	while ((p = gethostent()) != NULL)
diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c
index 6e1cd355b9..edc78ced9a 100644
--- a/lib/libc/net/gethostbynis.c
+++ b/lib/libc/net/gethostbynis.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/gethostbynis.c,v 1.10.2.1 2000/10/01 16:39:47 nectar Exp $
- * $DragonFly: src/lib/libc/net/gethostbynis.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/gethostbynis.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -61,7 +61,7 @@ _gethostbynis(name, map, af)
 	int af;
 {
 #ifdef YP
-	register char *cp, **q;
+	char *cp, **q;
 	char *result;
 	int resultlen,size;
 	static struct hostent h;
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index a90b5e7754..3b2bd31a3f 100644
--- a/lib/libc/net/gethostnamadr.c
+++ b/lib/libc/net/gethostnamadr.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.15.2.2 2001/03/05 10:40:42 obrien Exp $
- * $DragonFly: src/lib/libc/net/gethostnamadr.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/gethostnamadr.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -81,7 +81,7 @@ static void
 init_services()
 {
 	char *cp, *p, buf[BUFSIZ];
-	register int cc = 0;
+	int cc = 0;
 	FILE *fd;
 
 	if ((fd = (FILE *)fopen(_PATH_HOSTCONF, "r")) == NULL) {
diff --git a/lib/libc/net/getnetbydns.c b/lib/libc/net/getnetbydns.c
index d627593914..7be34438a2 100644
--- a/lib/libc/net/getnetbydns.c
+++ b/lib/libc/net/getnetbydns.c
@@ -52,7 +52,7 @@
  *
  * @(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/net/getnetbydns.c,v 1.13.2.4 2002/10/11 11:07:13 ume Exp $
- * $DragonFly: src/lib/libc/net/getnetbydns.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/getnetbydns.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 /* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
  *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
@@ -104,9 +104,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];
@@ -217,8 +217,8 @@ static	char *net_aliases[MAXALIASES], netbuf[PACKETSZ];
 
 struct netent *
 _getnetbydnsaddr(net, net_type)
-	register unsigned long net;
-	register int net_type;
+	unsigned long net;
+	int net_type;
 {
 	unsigned int netbr[4];
 	int nn, anslen;
@@ -284,7 +284,7 @@ _getnetbydnsaddr(net, net_type)
 
 struct netent *
 _getnetbydnsname(net)
-	register const char *net;
+	const char *net;
 {
 	int anslen;
 	querybuf *buf;
diff --git a/lib/libc/net/getnetbyht.c b/lib/libc/net/getnetbyht.c
index 154303189f..93a37f4244 100644
--- a/lib/libc/net/getnetbyht.c
+++ b/lib/libc/net/getnetbyht.c
@@ -32,7 +32,7 @@
  *
  * @(#)getnetent.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/net/getnetbyht.c,v 1.7.2.1 2002/07/07 11:34:42 robert Exp $
- * $DragonFly: src/lib/libc/net/getnetbyht.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/getnetbyht.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
@@ -89,7 +89,7 @@ struct netent *
 getnetent()
 {
 	char *p;
-	register char *cp, **q;
+	char *cp, **q;
 
 	if (netf == NULL && (netf = fopen(_PATH_NETWORKS, "r" )) == NULL)
 		return (NULL);
@@ -135,10 +135,10 @@ again:
 
 struct netent *
 _getnetbyhtname(name)
-	register const char *name;
+	const char *name;
 {
-	register struct netent *p;
-	register char **cp;
+	struct netent *p;
+	char **cp;
 
 	setnetent(_net_stayopen);
 	while ( (p = getnetent()) ) {
@@ -156,10 +156,10 @@ found:
 
 struct netent *
 _getnetbyhtaddr(net, type)
-	register unsigned long net;
-	register int type;
+	unsigned long net;
+	int type;
 {
-	register struct netent *p;
+	struct netent *p;
 
 	setnetent(_net_stayopen);
 	while ( (p = getnetent()) )
diff --git a/lib/libc/net/getnetbynis.c b/lib/libc/net/getnetbynis.c
index bf8dd9ee17..a42f27ccad 100644
--- a/lib/libc/net/getnetbynis.c
+++ b/lib/libc/net/getnetbynis.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/getnetbynis.c,v 1.11 1999/08/28 00:00:07 peter Exp $
- * $DragonFly: src/lib/libc/net/getnetbynis.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/getnetbynis.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -57,7 +57,7 @@ _getnetbynis(name, map, af)
 	int af;
 {
 #ifdef YP
-	register char *cp, **q;
+	char *cp, **q;
 	static char *result;
 	int resultlen;
 	static struct netent h;
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
index a6f4d66d59..e142d6541d 100644
--- a/lib/libc/net/getnetnamadr.c
+++ b/lib/libc/net/getnetnamadr.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/getnetnamadr.c,v 1.12.2.1 2001/03/05 10:47:08 obrien Exp $
- * $DragonFly: src/lib/libc/net/getnetnamadr.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/getnetnamadr.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -81,7 +81,7 @@ static void
 init_services()
 {
 	char *cp, *p, buf[BUFSIZ];
-	register int cc = 0;
+	int cc = 0;
 	FILE *fd;
 
 	if ((fd = (FILE *)fopen(_PATH_NETCONF, "r")) == NULL) {
diff --git a/lib/libc/net/getproto.c b/lib/libc/net/getproto.c
index 3d704a86f6..62360cb4bb 100644
--- a/lib/libc/net/getproto.c
+++ b/lib/libc/net/getproto.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)getproto.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libc/net/getproto.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <netdb.h>
@@ -39,9 +40,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 7093ec4b0f..333b94e749 100644
--- a/lib/libc/net/getprotoent.c
+++ b/lib/libc/net/getprotoent.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)getprotoent.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libc/net/getprotoent.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -73,7 +74,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 fd539158c0..52593c91d1 100644
--- a/lib/libc/net/getprotoname.c
+++ b/lib/libc/net/getprotoname.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)getprotoname.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libc/net/getprotoname.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <netdb.h>
@@ -40,10 +41,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 397df6080a..bdb0c2f213 100644
--- a/lib/libc/net/getservbyname.c
+++ b/lib/libc/net/getservbyname.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)getservbyname.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libc/net/getservbyname.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <netdb.h>
@@ -42,8 +43,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 6ead8d0c0b..627b7a2cef 100644
--- a/lib/libc/net/getservbyport.c
+++ b/lib/libc/net/getservbyport.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)getservbyport.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libc/net/getservbyport.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <netdb.h>
@@ -43,7 +44,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 ab69a38007..c3d259a63f 100644
--- a/lib/libc/net/getservent.c
+++ b/lib/libc/net/getservent.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)getservent.c	8.1 (Berkeley) 6/4/93
- * $DragonFly: src/lib/libc/net/getservent.c,v 1.4 2003/11/12 20:21:24 eirikn Exp $
+ * $DragonFly: src/lib/libc/net/getservent.c,v 1.5 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -209,7 +209,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 84498dede6..278a84eae7 100644
--- a/lib/libc/net/herror.c
+++ b/lib/libc/net/herror.c
@@ -32,7 +32,7 @@
  *
  * @(#)herror.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/net/herror.c,v 1.8 1999/08/28 00:00:09 peter Exp $
- * $DragonFly: src/lib/libc/net/herror.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/herror.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -78,7 +78,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 cffb8a15b7..3c9929f6f9 100644
--- a/lib/libc/net/inet_addr.c
+++ b/lib/libc/net/inet_addr.c
@@ -56,7 +56,7 @@
  *
  * @(#)inet_addr.c	8.1 (Berkeley) 6/17/93
  * $FreeBSD: src/lib/libc/net/inet_addr.c,v 1.12.2.2 2002/04/28 05:40:24 suz Exp $
- * $DragonFly: src/lib/libc/net/inet_addr.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/inet_addr.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -75,7 +75,7 @@
  */
 in_addr_t		/* XXX should be struct in_addr :( */
 inet_addr(cp)
-	register const char *cp;
+	const char *cp;
 {
 	struct in_addr val;
 
@@ -93,7 +93,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 4ed7693130..df988e866e 100644
--- a/lib/libc/net/inet_lnaof.c
+++ b/lib/libc/net/inet_lnaof.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/inet_lnaof.c,v 1.2.6.1 2001/04/21 14:53:04 ume Exp $
- * $DragonFly: src/lib/libc/net/inet_lnaof.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/inet_lnaof.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  *
  * @(#)inet_lnaof.c	8.1 (Berkeley) 6/4/93
  */
@@ -49,7 +49,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 3983abec38..5edbc352ac 100644
--- a/lib/libc/net/inet_netof.c
+++ b/lib/libc/net/inet_netof.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/inet_netof.c,v 1.2.6.1 2001/04/21 14:53:04 ume Exp $
- * $DragonFly: src/lib/libc/net/inet_netof.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/inet_netof.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  *
  * @(#)inet_netof.c	8.1 (Berkeley) 6/4/93
  */
@@ -48,7 +48,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 9428093133..9d89d96e1e 100644
--- a/lib/libc/net/inet_network.c
+++ b/lib/libc/net/inet_network.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/inet_network.c,v 1.6.2.1 2001/04/21 14:53:04 ume Exp $
- * $DragonFly: src/lib/libc/net/inet_network.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/inet_network.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  *
  * @(#)inet_network.c	8.1 (Berkeley) 6/4/93
  */
@@ -48,12 +48,12 @@
  */
 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 cb83841735..30f091faef 100644
--- a/lib/libc/net/ip6opt.c
+++ b/lib/libc/net/ip6opt.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/ip6opt.c,v 1.1 1999/12/16 18:32:01 shin Exp $
- * $DragonFly: src/lib/libc/net/ip6opt.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/ip6opt.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -71,7 +71,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)
@@ -103,7 +103,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 */
@@ -177,7 +177,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 a4832c790c..e45c6a9a10 100644
--- a/lib/libc/net/iso_addr.c
+++ b/lib/libc/net/iso_addr.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)iso_addr.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libc/net/iso_addr.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -48,12 +49,12 @@
 
 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 e2179303d6..46bfe5537f 100644
--- a/lib/libc/net/linkaddr.c
+++ b/lib/libc/net/linkaddr.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)linkaddr.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libc/net/linkaddr.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -51,12 +52,12 @@
 
 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;
@@ -122,12 +123,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 5d72799b24..38c85e698e 100644
--- a/lib/libc/net/name6.c
+++ b/lib/libc/net/name6.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/lib/libc/net/name6.c,v 1.6.2.9 2002/11/02 18:54:57 ume Exp $	*/
-/*	$DragonFly: src/lib/libc/net/name6.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $	*/
+/*	$DragonFly: src/lib/libc/net/name6.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $	*/
 /*	$KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $	*/
 
 /*
@@ -1040,9 +1040,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, *obp;
 	int type, class, buflen, ancount, qdcount;
@@ -1251,7 +1251,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 981fdb744f..8fb8777a2e 100644
--- a/lib/libc/net/ns_addr.c
+++ b/lib/libc/net/ns_addr.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/ns_addr.c,v 1.3.6.2 2001/07/04 22:34:51 kris Exp $
- * $DragonFly: src/lib/libc/net/ns_addr.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/ns_addr.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  *
  * @(#)ns_addr.c	8.1 (Berkeley) 6/7/93
  */
@@ -101,7 +101,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;
 	char *fmt;
diff --git a/lib/libc/net/ns_ntoa.c b/lib/libc/net/ns_ntoa.c
index 374597da05..44f6b14b10 100644
--- a/lib/libc/net/ns_ntoa.c
+++ b/lib/libc/net/ns_ntoa.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)ns_ntoa.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libc/net/ns_ntoa.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -44,9 +45,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();
 
@@ -81,7 +82,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 e792902606..cee7fd38a2 100644
--- a/lib/libc/net/nsap_addr.c
+++ b/lib/libc/net/nsap_addr.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  *
  * $FreeBSD: src/lib/libc/net/nsap_addr.c,v 1.7 1999/08/28 00:00:15 peter Exp $
- * $DragonFly: src/lib/libc/net/nsap_addr.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/nsap_addr.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -29,7 +29,7 @@
 
 static char
 xtob(c)
-	register int c;
+	int c;
 {
 	return (c - (((c >= '0') && (c <= '9')) ? '0' : '7'));
 }
@@ -73,10 +73,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 1e740646aa..cfd9337574 100644
--- a/lib/libc/net/rcmd.c
+++ b/lib/libc/net/rcmd.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/rcmd.c,v 1.23.2.7 2002/08/26 16:17:49 jdp Exp $
- * $DragonFly: src/lib/libc/net/rcmd.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $
+ * $DragonFly: src/lib/libc/net/rcmd.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  *
  * @(#)rcmd.c	8.3 (Berkeley) 3/26/94
  */
@@ -450,7 +450,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;
@@ -601,7 +601,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 9ab18d446a..5f239cd37b 100644
--- a/lib/libc/net/res_init.c
+++ b/lib/libc/net/res_init.c
@@ -33,7 +33,7 @@
  * @(#)res_init.c	8.1 (Berkeley) 6/7/93
  * $From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $
  * $FreeBSD: src/lib/libc/net/res_init.c,v 1.19.2.7 2002/02/04 18:30:55 ume Exp $
- * $DragonFly: src/lib/libc/net/res_init.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $
+ * $DragonFly: src/lib/libc/net/res_init.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -138,9 +138,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;
@@ -555,7 +555,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 f0c4c6335d..50013ec6cb 100644
--- a/lib/libc/net/res_mkquery.c
+++ b/lib/libc/net/res_mkquery.c
@@ -33,7 +33,7 @@
  * @(#)res_mkquery.c	8.1 (Berkeley) 6/4/93
  * $From: Id: res_mkquery.c,v 8.9 1997/04/24 22:22:36 vixie Exp $
  * $FreeBSD: src/lib/libc/net/res_mkquery.c,v 1.15.2.2 2002/09/20 10:45:35 nectar Exp $
- * $DragonFly: src/lib/libc/net/res_mkquery.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/res_mkquery.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -99,9 +99,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) {
@@ -212,8 +212,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 1cdbb004f2..8387b78581 100644
--- a/lib/libc/net/res_query.c
+++ b/lib/libc/net/res_query.c
@@ -33,7 +33,7 @@
  * @(#)res_query.c	8.1 (Berkeley) 6/4/93
  * $From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $
  * $FreeBSD: src/lib/libc/net/res_query.c,v 1.19.2.2 2002/07/07 11:34:42 robert Exp $
- * $DragonFly: src/lib/libc/net/res_query.c,v 1.3 2004/04/13 21:53:43 dillon Exp $
+ * $DragonFly: src/lib/libc/net/res_query.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -385,7 +385,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 d3e5e37fd6..1ae34b5d7f 100644
--- a/lib/libc/net/rthdr.c
+++ b/lib/libc/net/rthdr.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/rthdr.c,v 1.2.2.1 2002/04/28 05:40:24 suz Exp $
- * $DragonFly: src/lib/libc/net/rthdr.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/net/rthdr.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -65,8 +65,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);
 
@@ -93,7 +93,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);
 
@@ -142,7 +142,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);
 
@@ -198,7 +198,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);
 
@@ -232,7 +232,7 @@ inet6_rthdr_getaddr(cmsg, idx)
     struct cmsghdr *cmsg;
     int idx;
 {
-    register struct ip6_rthdr *rthdr;
+    struct ip6_rthdr *rthdr;
 
     rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
 
@@ -273,7 +273,7 @@ inet6_rthdr_getflags(cmsg, idx)
     const struct cmsghdr *cmsg;
     int idx;
 {
-    register struct ip6_rthdr *rthdr;
+    struct ip6_rthdr *rthdr;
 
     rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
 
diff --git a/lib/libc/quad/muldi3.c b/lib/libc/quad/muldi3.c
index 46e536de84..81b1d4d7b3 100644
--- a/lib/libc/quad/muldi3.c
+++ b/lib/libc/quad/muldi3.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  * @(#)muldi3.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libc/quad/muldi3.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #include "quad.h"
@@ -103,8 +104,8 @@ __muldi3(a, b)
 	quad_t a, b;
 {
 	union uu u, v, low, prod;
-	register u_long high, mid, udiff, vdiff;
-	register int negall, negmid;
+	u_long high, mid, udiff, vdiff;
+	int negall, negmid;
 #define	u1	u.ul[H]
 #define	u0	u.ul[L]
 #define	v1	v.ul[H]
diff --git a/lib/libc/quad/qdivrem.c b/lib/libc/quad/qdivrem.c
index e5dea9df57..496dd40785 100644
--- a/lib/libc/quad/qdivrem.c
+++ b/lib/libc/quad/qdivrem.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  * @(#)qdivrem.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libc/quad/qdivrem.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -62,9 +63,9 @@ typedef u_long digit;
  * We may assume len >= 0.  NOTE THAT THIS WRITES len+1 DIGITS.
  */
 static void
-shl(register digit *p, register int len, register int sh)
+shl(digit *p, int len, int sh)
 {
-	register int i;
+	int i;
 
 	for (i = 0; i < len; i++)
 		p[i] = LHALF(p[i] << sh) | (p[i + 1] >> (HALF_BITS - sh));
@@ -85,7 +86,7 @@ __qdivrem(uq, vq, arq)
 {
 	union uu tmp;
 	digit *u, *v, *q;
-	register digit v1, v2;
+	digit v1, v2;
 	u_long qhat, rhat, t;
 	int m, n, d, j, i;
 	digit uspace[5], vspace[5], qspace[5];
@@ -195,7 +196,7 @@ __qdivrem(uq, vq, arq)
 	v1 = v[1];	/* for D3 -- note that v[1..n] are constant */
 	v2 = v[2];	/* for D3 */
 	do {
-		register digit uj0, uj1, uj2;
+		digit uj0, uj1, uj2;
 
 		/*
 		 * D3: Calculate qhat (\^q, in TeX notation).
diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c
index 597670de83..4f8003abb3 100644
--- a/lib/libc/regex/engine.c
+++ b/lib/libc/regex/engine.c
@@ -37,7 +37,7 @@
  *	@(#)engine.c	8.5 (Berkeley) 3/20/94
  *
  * $FreeBSD: src/lib/libc/regex/engine.c,v 1.5.8.1 2000/07/31 06:30:37 dcs Exp $
- * $DragonFly: src/lib/libc/regex/engine.c,v 1.4 2004/02/06 22:36:50 joerg Exp $
+ * $DragonFly: src/lib/libc/regex/engine.c,v 1.5 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -135,7 +135,7 @@ static char *pchar(int ch);
 
 /*
  - matcher - the actual matching engine
- == static int matcher(register struct re_guts *g, char *string, \
+ == static int matcher(struct re_guts *g, char *string, \
  ==	size_t nmatch, regmatch_t pmatch[], int eflags);
  */
 static int			/* 0 success, REG_NOMATCH failure */
@@ -342,7 +342,7 @@ matcher(struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[],
 
 /*
  - dissect - figure out what matched what, no back references
- == static char *dissect(register struct match *m, char *start, \
+ == static char *dissect(struct match *m, char *start, \
  ==	char *stop, sopno startst, sopno stopst);
  */
 static char *			/* == stop (success) always */
@@ -525,7 +525,7 @@ dissect(struct match *m, char *start, char *stop, sopno startst, sopno stopst)
 
 /*
  - backref - figure out what matched what, figuring in back references
- == static char *backref(register struct match *m, char *start, \
+ == static char *backref(struct match *m, char *start, \
  ==	char *stop, sopno startst, sopno stopst, sopno lev);
  */
 static char *			/* == stop (success) or NULL (failure) */
@@ -725,7 +725,7 @@ backref(struct match *m, char *start, char *stop, sopno startst, sopno stopst,
 
 /*
  - fast - step through the string at top speed
- == static char *fast(register struct match *m, char *start, \
+ == static char *fast(struct match *m, char *start, \
  ==	char *stop, sopno startst, sopno stopst);
  */
 static char *			/* where tentative match ended, or NULL */
@@ -811,7 +811,7 @@ fast(struct match *m, char *start, char *stop, sopno startst, sopno stopst)
 
 /*
  - slow - step through the string more deliberately
- == static char *slow(register struct match *m, char *start, \
+ == static char *slow(struct match *m, char *start, \
  ==	char *stop, sopno startst, sopno stopst);
  */
 static char *			/* where it ended */
@@ -893,8 +893,8 @@ slow(struct match *m, char *start, char *stop, sopno startst, sopno stopst)
 
 /*
  - step - map set of states reachable before char to set reachable after
- == static states step(register struct re_guts *g, sopno start, sopno stop, \
- ==	register states bef, int ch, register states aft);
+ == static states step(struct re_guts *g, sopno start, sopno stop, \
+ ==	states bef, int ch, states aft);
  == #define	BOL	(OUT+1)
  == #define	EOL	(BOL+1)
  == #define	BOLEOL	(BOL+2)
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index c539d6e199..2a0ad5aa85 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -37,7 +37,7 @@
  *	@(#)regcomp.c	8.5 (Berkeley) 3/20/94
  *
  * $FreeBSD: src/lib/libc/regex/regcomp.c,v 1.13.2.2 2002/03/20 13:13:15 dcs Exp $
- * $DragonFly: src/lib/libc/regex/regcomp.c,v 1.4 2004/02/06 22:36:50 joerg Exp $
+ * $DragonFly: src/lib/libc/regex/regcomp.c,v 1.5 2004/10/25 19:38:01 drhodus Exp $
  *
  * @(#)regcomp.c	8.5 (Berkeley) 3/20/94
  */
@@ -299,7 +299,7 @@ regcomp(regex_t *preg, const char *pattern, int cflags)
 
 /*
  - p_ere - ERE parser top level, concatenation and alternation
- == static void p_ere(register struct parse *p, int stop);
+ == static void p_ere(struct parse *p, int stop);
  */
 static void
 p_ere(struct parse *p,
@@ -344,7 +344,7 @@ p_ere(struct parse *p,
 
 /*
  - p_ere_exp - parse one subERE, an atom possibly followed by a repetition op
- == static void p_ere_exp(register struct parse *p);
+ == static void p_ere_exp(struct parse *p);
  */
 static void
 p_ere_exp(struct parse *p)
@@ -492,7 +492,7 @@ p_ere_exp(struct parse *p)
 
 /*
  - p_str - string (no metacharacters) "parser"
- == static void p_str(register struct parse *p);
+ == static void p_str(struct parse *p);
  */
 static void
 p_str(struct parse *p)
@@ -504,8 +504,8 @@ p_str(struct parse *p)
 
 /*
  - p_bre - BRE parser top level, anchoring and concatenation
- == static void p_bre(register struct parse *p, register int end1, \
- ==	register int end2);
+ == static void p_bre(struct parse *p, int end1, \
+ ==	int end2);
  * Giving end1 as OUT essentially eliminates the end1/end2 check.
  *
  * This implementation is a bit of a kludge, in that a trailing $ is first
@@ -544,7 +544,7 @@ p_bre(struct parse *p,
 
 /*
  - p_simp_re - parse a simple RE, an atom possibly followed by a repetition
- == static int p_simp_re(register struct parse *p, int starordinary);
+ == static int p_simp_re(struct parse *p, int starordinary);
  */
 static int			/* was the simple RE an unbackslashed $? */
 p_simp_re(struct parse *p,
@@ -661,7 +661,7 @@ p_simp_re(struct parse *p,
 
 /*
  - p_count - parse a repetition count
- == static int p_count(register struct parse *p);
+ == static int p_count(struct parse *p);
  */
 static int			/* the value */
 p_count(struct parse *p)
@@ -680,7 +680,7 @@ p_count(struct parse *p)
 
 /*
  - p_bracket - parse a bracketed character list
- == static void p_bracket(register struct parse *p);
+ == static void p_bracket(struct parse *p);
  *
  * Note a significant property of this code:  if the allocset() did SETERROR,
  * no set operations are done.
@@ -719,8 +719,8 @@ p_bracket(struct parse *p)
 		return;
 
 	if (p->g->cflags&REG_ICASE) {
-		register int i;
-		register int ci;
+		int i;
+		int ci;
 
 		for (i = p->g->csetsize - 1; i >= 0; i--)
 			if (CHIN(cs, i) && isalpha(i)) {
@@ -732,7 +732,7 @@ p_bracket(struct parse *p)
 			mccase(p, cs);
 	}
 	if (invert) {
-		register int i;
+		int i;
 
 		for (i = p->g->csetsize - 1; i >= 0; i--)
 			if (CHIN(cs, i))
@@ -756,7 +756,7 @@ p_bracket(struct parse *p)
 
 /*
  - p_b_term - parse one term of a bracketed character list
- == static void p_b_term(register struct parse *p, register cset *cs);
+ == static void p_b_term(struct parse *p, cset *cs);
  */
 static void
 p_b_term(struct parse *p, cset *cs)
@@ -833,7 +833,7 @@ p_b_term(struct parse *p, cset *cs)
 
 /*
  - p_b_cclass - parse a character-class name and deal with it
- == static void p_b_cclass(register struct parse *p, register cset *cs);
+ == static void p_b_cclass(struct parse *p, cset *cs);
  */
 static void
 p_b_cclass(struct parse *p, cset *cs)
@@ -925,7 +925,7 @@ p_b_cclass(struct parse *p, cset *cs)
 
 /*
  - p_b_eclass - parse an equivalence-class name and deal with it
- == static void p_b_eclass(register struct parse *p, register cset *cs);
+ == static void p_b_eclass(struct parse *p, cset *cs);
  *
  * This implementation is incomplete. xxx
  */
@@ -940,7 +940,7 @@ p_b_eclass(struct parse *p, cset *cs)
 
 /*
  - p_b_symbol - parse a character or [..]ed multicharacter collating symbol
- == static char p_b_symbol(register struct parse *p);
+ == static char p_b_symbol(struct parse *p);
  */
 static char			/* value of symbol */
 p_b_symbol(struct parse *p)
@@ -959,7 +959,7 @@ p_b_symbol(struct parse *p)
 
 /*
  - p_b_coll_elem - parse a collating-element name and look it up
- == static char p_b_coll_elem(register struct parse *p, int endc);
+ == static char p_b_coll_elem(struct parse *p, int endc);
  */
 static char			/* value of collating element */
 p_b_coll_elem(struct parse *p,
@@ -1004,7 +1004,7 @@ othercase(int ch)
 
 /*
  - bothcases - emit a dualcase version of a two-case character
- == static void bothcases(register struct parse *p, int ch);
+ == static void bothcases(struct parse *p, int ch);
  *
  * Boy, is this implementation ever a kludge...
  */
@@ -1030,7 +1030,7 @@ bothcases(struct parse *p, int ch)
 
 /*
  - ordinary - emit an ordinary character
- == static void ordinary(register struct parse *p, register int ch);
+ == static void ordinary(struct parse *p, int ch);
  */
 static void
 ordinary(struct parse *p, int ch)
@@ -1048,7 +1048,7 @@ ordinary(struct parse *p, int ch)
 
 /*
  - nonnewline - emit REG_NEWLINE version of OANY
- == static void nonnewline(register struct parse *p);
+ == static void nonnewline(struct parse *p);
  *
  * Boy, is this implementation ever a kludge...
  */
@@ -1073,7 +1073,7 @@ nonnewline(struct parse *p)
 
 /*
  - repeat - generate code for a bounded repetition, recursively if needed
- == static void repeat(register struct parse *p, sopno start, int from, int to);
+ == static void repeat(struct parse *p, sopno start, int from, int to);
  */
 static void
 repeat(struct parse *p,
@@ -1144,7 +1144,7 @@ repeat(struct parse *p,
 
 /*
  - seterr - set an error condition
- == static int seterr(register struct parse *p, int e);
+ == static int seterr(struct parse *p, int e);
  */
 static int			/* useless but makes type checking happy */
 seterr(struct parse *p, int e)
@@ -1158,7 +1158,7 @@ seterr(struct parse *p, int e)
 
 /*
  - allocset - allocate a set of characters for []
- == static cset *allocset(register struct parse *p);
+ == static cset *allocset(struct parse *p);
  */
 static cset *
 allocset(struct parse *p)
@@ -1212,7 +1212,7 @@ allocset(struct parse *p)
 
 /*
  - freeset - free a now-unused set
- == static void freeset(register struct parse *p, register cset *cs);
+ == static void freeset(struct parse *p, cset *cs);
  */
 static void
 freeset(struct parse *p, cset *cs)
@@ -1229,7 +1229,7 @@ freeset(struct parse *p, cset *cs)
 
 /*
  - freezeset - final processing on a set of characters
- == static int freezeset(register struct parse *p, register cset *cs);
+ == static int freezeset(struct parse *p, cset *cs);
  *
  * The main task here is merging identical sets.  This is usually a waste
  * of time (although the hash code minimizes the overhead), but can win
@@ -1267,7 +1267,7 @@ freezeset(struct parse *p, cset *cs)
 
 /*
  - firstch - return first character in a set (which must have at least one)
- == static int firstch(register struct parse *p, register cset *cs);
+ == static int firstch(struct parse *p, cset *cs);
  */
 static int			/* character; there is no "none" value */
 firstch(struct parse *p, cset *cs)
@@ -1284,7 +1284,7 @@ firstch(struct parse *p, cset *cs)
 
 /*
  - nch - number of characters in a set
- == static int nch(register struct parse *p, register cset *cs);
+ == static int nch(struct parse *p, cset *cs);
  */
 static int
 nch(struct parse *p, cset *cs)
@@ -1301,8 +1301,8 @@ nch(struct parse *p, cset *cs)
 
 /*
  - mcadd - add a collating element to a cset
- == static void mcadd(register struct parse *p, register cset *cs, \
- ==	register char *cp);
+ == static void mcadd(struct parse *p, cset *cs, \
+ ==	char *cp);
  */
 static void
 mcadd(struct parse *p, cset *cs, char *cp)
@@ -1326,7 +1326,7 @@ mcadd(struct parse *p, cset *cs, char *cp)
 #if used
 /*
  - mcsub - subtract a collating element from a cset
- == static void mcsub(register cset *cs, register char *cp);
+ == static void mcsub(cset *cs, char *cp);
  */
 static void
 mcsub(cset *cs, char *cp)
@@ -1351,7 +1351,7 @@ mcsub(cset *cs, char *cp)
 
 /*
  - mcin - is a collating element in a cset?
- == static int mcin(register cset *cs, register char *cp);
+ == static int mcin(cset *cs, char *cp);
  */
 static int
 mcin(cset *cs, char *cp)
@@ -1361,7 +1361,7 @@ mcin(cset *cs, char *cp)
 
 /*
  - mcfind - find a collating element in a cset
- == static char *mcfind(register cset *cs, register char *cp);
+ == static char *mcfind(cset *cs, char *cp);
  */
 static char *
 mcfind(cset *cs, char *cp)
@@ -1379,7 +1379,7 @@ mcfind(cset *cs, char *cp)
 
 /*
  - mcinvert - invert the list of collating elements in a cset
- == static void mcinvert(register struct parse *p, register cset *cs);
+ == static void mcinvert(struct parse *p, cset *cs);
  *
  * This would have to know the set of possibilities.  Implementation
  * is deferred.
@@ -1392,7 +1392,7 @@ mcinvert(struct parse *p, cset *cs)
 
 /*
  - mccase - add case counterparts of the list of collating elements in a cset
- == static void mccase(register struct parse *p, register cset *cs);
+ == static void mccase(struct parse *p, cset *cs);
  *
  * This would have to know the set of possibilities.  Implementation
  * is deferred.
@@ -1405,7 +1405,7 @@ mccase(struct parse *p, cset *cs)
 
 /*
  - isinsets - is this character in any sets?
- == static int isinsets(register struct re_guts *g, int c);
+ == static int isinsets(struct re_guts *g, int c);
  */
 static int			/* predicate */
 isinsets(struct re_guts *g, int c)
@@ -1423,7 +1423,7 @@ isinsets(struct re_guts *g, int c)
 
 /*
  - samesets - are these two characters in exactly the same sets?
- == static int samesets(register struct re_guts *g, int c1, int c2);
+ == static int samesets(struct re_guts *g, int c1, int c2);
  */
 static int			/* predicate */
 samesets(struct re_guts *g, int c1, int c2)
@@ -1442,7 +1442,7 @@ samesets(struct re_guts *g, int c1, int c2)
 
 /*
  - categorize - sort out character categories
- == static void categorize(struct parse *p, register struct re_guts *g);
+ == static void categorize(struct parse *p, struct re_guts *g);
  */
 static void
 categorize(struct parse *p, struct re_guts *g)
@@ -1468,7 +1468,7 @@ categorize(struct parse *p, struct re_guts *g)
 
 /*
  - dupl - emit a duplicate of a bunch of sops
- == static sopno dupl(register struct parse *p, sopno start, sopno finish);
+ == static sopno dupl(struct parse *p, sopno start, sopno finish);
  */
 static sopno			/* start of duplicate */
 dupl(struct parse *p,
@@ -1491,7 +1491,7 @@ dupl(struct parse *p,
 
 /*
  - doemit - emit a strip operator
- == static void doemit(register struct parse *p, sop op, size_t opnd);
+ == static void doemit(struct parse *p, sop op, size_t opnd);
  *
  * It might seem better to implement this as a macro with a function as
  * hard-case backup, but it's just too big and messy unless there are
@@ -1518,7 +1518,7 @@ doemit(struct parse *p, sop op, size_t opnd)
 
 /*
  - doinsert - insert a sop into the strip
- == static void doinsert(register struct parse *p, sop op, size_t opnd, sopno pos);
+ == static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
  */
 static void
 doinsert(struct parse *p, sop op, size_t opnd, sopno pos)
@@ -1554,7 +1554,7 @@ doinsert(struct parse *p, sop op, size_t opnd, sopno pos)
 
 /*
  - dofwd - complete a forward reference
- == static void dofwd(register struct parse *p, sopno pos, sop value);
+ == static void dofwd(struct parse *p, sopno pos, sop value);
  */
 static void
 dofwd(struct parse *p, sopno pos, sop value)
@@ -1569,7 +1569,7 @@ dofwd(struct parse *p, sopno pos, sop value)
 
 /*
  - enlarge - enlarge the strip
- == static void enlarge(register struct parse *p, sopno size);
+ == static void enlarge(struct parse *p, sopno size);
  */
 static void
 enlarge(struct parse *p, sopno size)
@@ -1590,7 +1590,7 @@ enlarge(struct parse *p, sopno size)
 
 /*
  - stripsnug - compact the strip
- == static void stripsnug(register struct parse *p, register struct re_guts *g);
+ == static void stripsnug(struct parse *p, struct re_guts *g);
  */
 static void
 stripsnug(struct parse *p, struct re_guts *g)
@@ -1605,7 +1605,7 @@ stripsnug(struct parse *p, struct re_guts *g)
 
 /*
  - findmust - fill in must and mlen with longest mandatory literal string
- == static void findmust(register struct parse *p, register struct re_guts *g);
+ == static void findmust(struct parse *p, struct re_guts *g);
  *
  * This algorithm could do fancy things like analyzing the operands of |
  * for common subsequences.  Someday.  This code is simple and finds most
@@ -1848,7 +1848,7 @@ altoffset(sop *scan, int offset, int mccs)
 
 /*
  - computejumps - compute char jumps for BM scan
- == static void computejumps(register struct parse *p, register struct re_guts *g);
+ == static void computejumps(struct parse *p, struct re_guts *g);
  *
  * This algorithm assumes g->must exists and is has size greater than
  * zero. It's based on the algorithm found on Computer Algorithms by
@@ -1890,7 +1890,7 @@ computejumps(struct parse *p, struct re_guts *g)
 
 /*
  - computematchjumps - compute match jumps for BM scan
- == static void computematchjumps(register struct parse *p, register struct re_guts *g);
+ == static void computematchjumps(struct parse *p, struct re_guts *g);
  *
  * This algorithm assumes g->must exists and is has size greater than
  * zero. It's based on the algorithm found on Computer Algorithms by
@@ -1973,7 +1973,7 @@ computematchjumps(struct parse *p, struct re_guts *g)
 
 /*
  - pluscount - count + nesting
- == static sopno pluscount(register struct parse *p, register struct re_guts *g);
+ == static sopno pluscount(struct parse *p, struct re_guts *g);
  */
 static sopno			/* nesting depth */
 pluscount(struct parse *p, struct re_guts *g)
diff --git a/lib/libc/rpc/auth_des.c b/lib/libc/rpc/auth_des.c
index ee11bd487c..fe1be6474d 100644
--- a/lib/libc/rpc/auth_des.c
+++ b/lib/libc/rpc/auth_des.c
@@ -28,7 +28,7 @@
  *
  * @(#)auth_des.c	2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI
  * $FreeBSD: src/lib/libc/rpc/auth_des.c,v 1.3 1999/08/28 00:00:32 peter Exp $
- * $DragonFly: src/lib/libc/rpc/auth_des.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $
+ * $DragonFly: src/lib/libc/rpc/auth_des.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  */
 /*
  * Copyright (c) 1988 by Sun Microsystems, Inc.
@@ -422,7 +422,7 @@ authdes_validate(auth, rverf)
 	struct ad_private *ad = AUTH_PRIVATE(auth);
 	struct authdes_verf verf;
 	int status;
-	register u_long *ixdr;
+	u_long *ixdr;
 
 	if (rverf->oa_length != (2 + 1) * BYTES_PER_XDR_UNIT) {
 		return (FALSE);
diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c
index 12ace04ba9..7fd8d0a487 100644
--- a/lib/libc/rpc/auth_none.c
+++ b/lib/libc/rpc/auth_none.c
@@ -29,7 +29,7 @@
  * @(#)auth_none.c	1.19 87/08/11 Copyr 1984 Sun Micro
  * @(#)auth_none.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.9 1999/08/28 00:00:32 peter Exp $
- * $DragonFly: src/lib/libc/rpc/auth_none.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/auth_none.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -72,9 +72,9 @@ static struct authnone_private {
 AUTH *
 authnone_create()
 {
-	register struct authnone_private *ap = authnone_private;
+	struct authnone_private *ap = authnone_private;
 	XDR xdr_stream;
-	register XDR *xdrs;
+	XDR *xdrs;
 
 	if (ap == 0) {
 		ap = (struct authnone_private *)calloc(1, sizeof (*ap));
@@ -102,7 +102,7 @@ authnone_marshal(client, xdrs)
 	AUTH *client;
 	XDR *xdrs;
 {
-	register struct authnone_private *ap = authnone_private;
+	struct authnone_private *ap = authnone_private;
 
 	if (ap == 0)
 		return (0);
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index 7c0d2dc7f0..6988c56ab9 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -29,7 +29,7 @@
  * @(#)auth_unix.c	1.19 87/08/11 Copyr 1984 Sun Micro
  * @(#)auth_unix.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/auth_unix.c,v 1.12 1999/12/29 05:04:16 peter Exp $
- * $DragonFly: src/lib/libc/rpc/auth_unix.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/auth_unix.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -108,15 +108,15 @@ authunix_create(machname, uid, gid, len, aup_gids)
 	char *machname;
 	int uid;
 	int gid;
-	register int len;
+	int len;
 	int *aup_gids;
 {
 	struct authunix_parms aup;
 	char mymem[MAX_AUTH_BYTES];
 	struct timeval now;
 	XDR xdrs;
-	register AUTH *auth;
-	register struct audata *au;
+	AUTH *auth;
+	struct audata *au;
 
 	/*
 	 * Allocate and set up auth handle
@@ -190,10 +190,10 @@ authunix_create(machname, uid, gid, len, aup_gids)
 AUTH *
 authunix_create_default()
 {
-	register int len;
+	int len;
 	char machname[MAX_MACHINE_NAME + 1];
-	register int uid;
-	register int gid;
+	int uid;
+	int gid;
 	int gids[NGRPS];
 	int i;
 	gid_t real_gids[NGROUPS];
@@ -228,17 +228,17 @@ authunix_marshal(auth, xdrs)
 	AUTH *auth;
 	XDR *xdrs;
 {
-	register struct audata *au = AUTH_PRIVATE(auth);
+	struct audata *au = AUTH_PRIVATE(auth);
 
 	return (XDR_PUTBYTES(xdrs, au->au_marshed, au->au_mpos));
 }
 
 static bool_t
 authunix_validate(auth, verf)
-	register AUTH *auth;
+	AUTH *auth;
 	struct opaque_auth verf;
 {
-	register struct audata *au;
+	struct audata *au;
 	XDR xdrs;
 
 	if (verf.oa_flavor == AUTH_SHORT) {
@@ -265,13 +265,13 @@ authunix_validate(auth, verf)
 
 static bool_t
 authunix_refresh(auth)
-	register AUTH *auth;
+	AUTH *auth;
 {
-	register struct audata *au = AUTH_PRIVATE(auth);
+	struct audata *au = AUTH_PRIVATE(auth);
 	struct authunix_parms aup;
 	struct timeval now;
 	XDR xdrs;
-	register int stat;
+	int stat;
 
 	if (auth->ah_cred.oa_base == au->au_origcred.oa_base) {
 		/* there is no hope.  Punt */
@@ -308,9 +308,9 @@ done:
 
 static void
 authunix_destroy(auth)
-	register AUTH *auth;
+	AUTH *auth;
 {
-	register struct audata *au = AUTH_PRIVATE(auth);
+	struct audata *au = AUTH_PRIVATE(auth);
 
 	mem_free(au->au_origcred.oa_base, au->au_origcred.oa_length);
 
@@ -331,11 +331,11 @@ authunix_destroy(auth)
  */
 static void
 marshal_new_auth(auth)
-	register AUTH *auth;
+	AUTH *auth;
 {
 	XDR		xdr_stream;
-	register XDR	*xdrs = &xdr_stream;
-	register struct audata *au = AUTH_PRIVATE(auth);
+	XDR	*xdrs = &xdr_stream;
+	struct audata *au = AUTH_PRIVATE(auth);
 
 	xdrmem_create(xdrs, au->au_marshed, MAX_AUTH_BYTES, XDR_ENCODE);
 	if ((! xdr_opaque_auth(xdrs, &(auth->ah_cred))) ||
diff --git a/lib/libc/rpc/authdes_prot.c b/lib/libc/rpc/authdes_prot.c
index 14679c00a9..e3de821385 100644
--- a/lib/libc/rpc/authdes_prot.c
+++ b/lib/libc/rpc/authdes_prot.c
@@ -1,6 +1,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = 	"@(#)authdes_prot.c	2.1 88/07/29 4.0 RPCSRC; from 1.6 88/02/08 SMI";
 #endif
+/* $DragonFly: src/lib/libc/rpc/authdes_prot.c,v 1.2 2004/10/25 19:38:01 drhodus Exp $								*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -70,8 +71,8 @@ xdr_authdes_cred(xdrs, cred)
 
 bool_t
 xdr_authdes_verf(xdrs, verf)
-	register XDR *xdrs;
-	register struct authdes_verf *verf;	
+	XDR *xdrs;
+	struct authdes_verf *verf;	
 {
 	/*
  	 * Unrolled xdr
diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c
index 37dc0c7702..303e6eeba0 100644
--- a/lib/libc/rpc/authunix_prot.c
+++ b/lib/libc/rpc/authunix_prot.c
@@ -29,7 +29,7 @@
  * @(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro
  * @(#)authunix_prot.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/authunix_prot.c,v 1.6 1999/08/28 00:00:33 peter Exp $
- * $DragonFly: src/lib/libc/rpc/authunix_prot.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/authunix_prot.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -50,8 +50,8 @@
  */
 bool_t
 xdr_authunix_parms(xdrs, p)
-	register XDR *xdrs;
-	register struct authunix_parms *p;
+	XDR *xdrs;
+	struct authunix_parms *p;
 {
 
 	if (xdr_u_long(xdrs, &(p->aup_time))
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index 475a10f1a1..61e4ed50e2 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -29,7 +29,7 @@
  * @(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro
  * @(#)clnt_raw.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/clnt_raw.c,v 1.10 1999/08/28 00:00:36 peter Exp $
- * $DragonFly: src/lib/libc/rpc/clnt_raw.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/clnt_raw.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -86,7 +86,7 @@ clntraw_create(prog, vers)
 	u_long prog;
 	u_long vers;
 {
-	register struct clntraw_private *clp = clntraw_private;
+	struct clntraw_private *clp = clntraw_private;
 	struct rpc_msg call_msg;
 	XDR *xdrs = &clp->xdr_stream;
 	CLIENT	*client = &clp->client_object;
@@ -134,8 +134,8 @@ clntraw_call(h, proc, xargs, argsp, xresults, resultsp, timeout)
 	caddr_t resultsp;
 	struct timeval timeout;
 {
-	register struct clntraw_private *clp = clntraw_private;
-	register XDR *xdrs = &clp->xdr_stream;
+	struct clntraw_private *clp = clntraw_private;
+	XDR *xdrs = &clp->xdr_stream;
 	struct rpc_msg msg;
 	enum clnt_stat status;
 	struct rpc_err error;
@@ -211,8 +211,8 @@ clntraw_freeres(cl, xdr_res, res_ptr)
 	xdrproc_t xdr_res;
 	caddr_t res_ptr;
 {
-	register struct clntraw_private *clp = clntraw_private;
-	register XDR *xdrs = &clp->xdr_stream;
+	struct clntraw_private *clp = clntraw_private;
+	XDR *xdrs = &clp->xdr_stream;
 	bool_t rval;
 
 	if (clp == 0)
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index d426b412c6..ac5dae92d9 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -29,7 +29,7 @@
  * @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro
  * @(#)clnt_simple.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/clnt_simple.c,v 1.12 2000/01/27 23:06:35 jasone Exp $
- * $DragonFly: src/lib/libc/rpc/clnt_simple.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/clnt_simple.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -62,7 +62,7 @@ callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out)
 	xdrproc_t inproc, outproc;
 	char *in, *out;
 {
-	register struct callrpc_private *crp = callrpc_private;
+	struct callrpc_private *crp = callrpc_private;
 	struct sockaddr_in server_addr;
 	enum clnt_stat clnt_stat;
 	struct hostent *hp;
diff --git a/lib/libc/rpc/clnt_tcp.c b/lib/libc/rpc/clnt_tcp.c
index 1d2aec1f74..5d0e270c8e 100644
--- a/lib/libc/rpc/clnt_tcp.c
+++ b/lib/libc/rpc/clnt_tcp.c
@@ -29,7 +29,7 @@
  * @(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro
  * @(#)clnt_tcp.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/clnt_tcp.c,v 1.14 2000/01/27 23:06:36 jasone Exp $
- * $DragonFly: src/lib/libc/rpc/clnt_tcp.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/clnt_tcp.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -113,12 +113,12 @@ clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
 	struct sockaddr_in *raddr;
 	u_long prog;
 	u_long vers;
-	register int *sockp;
+	int *sockp;
 	u_int sendsz;
 	u_int recvsz;
 {
 	CLIENT *h;
-	register struct ct_data *ct = NULL;
+	struct ct_data *ct = NULL;
 	struct timeval now;
 	struct rpc_msg call_msg;
 	static u_int32_t disrupt;
@@ -230,7 +230,7 @@ fooy:
 
 static enum clnt_stat
 clnttcp_call(h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
-	register CLIENT *h;
+	CLIENT *h;
 	u_long proc;
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
@@ -238,12 +238,12 @@ clnttcp_call(h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
 	caddr_t results_ptr;
 	struct timeval timeout;
 {
-	register struct ct_data *ct = (struct ct_data *) h->cl_private;
-	register XDR *xdrs = &(ct->ct_xdrs);
+	struct ct_data *ct = (struct ct_data *) h->cl_private;
+	XDR *xdrs = &(ct->ct_xdrs);
 	struct rpc_msg reply_msg;
 	u_long x_id;
 	u_int32_t *msg_x_id = (u_int32_t *)(ct->ct_mcall);	/* yuk */
-	register bool_t shipnow;
+	bool_t shipnow;
 	int refreshes = 2;
 
 	if (!ct->ct_waitset) {
@@ -330,7 +330,7 @@ clnttcp_geterr(h, errp)
 	CLIENT *h;
 	struct rpc_err *errp;
 {
-	register struct ct_data *ct =
+	struct ct_data *ct =
 	    (struct ct_data *) h->cl_private;
 
 	*errp = ct->ct_error;
@@ -342,8 +342,8 @@ clnttcp_freeres(cl, xdr_res, res_ptr)
 	xdrproc_t xdr_res;
 	caddr_t res_ptr;
 {
-	register struct ct_data *ct = (struct ct_data *)cl->cl_private;
-	register XDR *xdrs = &(ct->ct_xdrs);
+	struct ct_data *ct = (struct ct_data *)cl->cl_private;
+	XDR *xdrs = &(ct->ct_xdrs);
 
 	xdrs->x_op = XDR_FREE;
 	return ((*xdr_res)(xdrs, res_ptr));
@@ -361,8 +361,8 @@ clnttcp_control(cl, request, info)
 	int request;
 	char *info;
 {
-	register struct ct_data *ct = (struct ct_data *)cl->cl_private;
-	register struct timeval *tv;
+	struct ct_data *ct = (struct ct_data *)cl->cl_private;
+	struct timeval *tv;
 	int len;
 
 	switch (request) {
@@ -469,7 +469,7 @@ static void
 clnttcp_destroy(h)
 	CLIENT *h;
 {
-	register struct ct_data *ct =
+	struct ct_data *ct =
 	    (struct ct_data *) h->cl_private;
 
 	if (ct->ct_closeit) {
@@ -487,9 +487,9 @@ clnttcp_destroy(h)
  */
 static int
 readtcp(ct, buf, len)
-	register struct ct_data *ct;
+	struct ct_data *ct;
 	caddr_t buf;
-	register int len;
+	int len;
 {
 	fd_set *fds, readfds;
 	struct timeval start, after, duration, delta, tmp, tv;
@@ -566,7 +566,7 @@ writetcp(ct, buf, len)
 	caddr_t buf;
 	int len;
 {
-	register int i, cnt;
+	int i, cnt;
 
 	for (cnt = len; cnt > 0; cnt -= i, buf += i) {
 		if ((i = _write(ct->ct_sock, buf, cnt)) == -1) {
diff --git a/lib/libc/rpc/clnt_udp.c b/lib/libc/rpc/clnt_udp.c
index 3832af9d58..441fcca3cd 100644
--- a/lib/libc/rpc/clnt_udp.c
+++ b/lib/libc/rpc/clnt_udp.c
@@ -29,7 +29,7 @@
  * @(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro
  * @(#)clnt_udp.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/clnt_udp.c,v 1.15.2.1 2001/06/28 21:44:24 iedowse Exp $
- * $DragonFly: src/lib/libc/rpc/clnt_udp.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/clnt_udp.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -111,12 +111,12 @@ clntudp_bufcreate(raddr, program, version, wait, sockp, sendsz, recvsz)
 	u_long program;
 	u_long version;
 	struct timeval wait;
-	register int *sockp;
+	int *sockp;
 	u_int sendsz;
 	u_int recvsz;
 {
 	CLIENT *cl;
-	register struct cu_data *cu = NULL;
+	struct cu_data *cu = NULL;
 	struct timeval now;
 	struct rpc_msg call_msg;
 	static u_int32_t disrupt;
@@ -207,7 +207,7 @@ clntudp_create(raddr, program, version, wait, sockp)
 	u_long program;
 	u_long version;
 	struct timeval wait;
-	register int *sockp;
+	int *sockp;
 {
 
 	return(clntudp_bufcreate(raddr, program, version, wait, sockp,
@@ -216,7 +216,7 @@ clntudp_create(raddr, program, version, wait, sockp)
 
 static enum clnt_stat
 clntudp_call(cl, proc, xargs, argsp, xresults, resultsp, utimeout)
-	register CLIENT	*cl;		/* client handle */
+	CLIENT	*cl;		/* client handle */
 	u_long		proc;		/* procedure number */
 	xdrproc_t	xargs;		/* xdr routine for args */
 	caddr_t		argsp;		/* pointer to args */
@@ -224,10 +224,10 @@ clntudp_call(cl, proc, xargs, argsp, xresults, resultsp, utimeout)
 	caddr_t		resultsp;	/* pointer to results */
 	struct timeval	utimeout;	/* seconds to wait before giving up */
 {
-	register struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	register XDR *xdrs;
-	register int outlen;
-	register int inlen;
+	struct cu_data *cu = (struct cu_data *)cl->cl_private;
+	XDR *xdrs;
+	int outlen;
+	int inlen;
 	struct sockaddr *sa;
 	int fromlen;
 	fd_set *fds, readfds;
@@ -430,7 +430,7 @@ clntudp_geterr(cl, errp)
 	CLIENT *cl;
 	struct rpc_err *errp;
 {
-	register struct cu_data *cu = (struct cu_data *)cl->cl_private;
+	struct cu_data *cu = (struct cu_data *)cl->cl_private;
 
 	*errp = cu->cu_error;
 }
@@ -442,8 +442,8 @@ clntudp_freeres(cl, xdr_res, res_ptr)
 	xdrproc_t xdr_res;
 	caddr_t res_ptr;
 {
-	register struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	register XDR *xdrs = &(cu->cu_outxdrs);
+	struct cu_data *cu = (struct cu_data *)cl->cl_private;
+	XDR *xdrs = &(cu->cu_outxdrs);
 
 	xdrs->x_op = XDR_FREE;
 	return ((*xdr_res)(xdrs, res_ptr));
@@ -462,8 +462,8 @@ clntudp_control(cl, request, info)
 	int request;
 	char *info;
 {
-	register struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	register struct timeval *tv;
+	struct cu_data *cu = (struct cu_data *)cl->cl_private;
+	struct timeval *tv;
 	int len;
 
 	switch (request) {
@@ -581,7 +581,7 @@ static void
 clntudp_destroy(cl)
 	CLIENT *cl;
 {
-	register struct cu_data *cu = (struct cu_data *)cl->cl_private;
+	struct cu_data *cu = (struct cu_data *)cl->cl_private;
 
 	if (cu->cu_closeit) {
 		(void)_close(cu->cu_sock);
diff --git a/lib/libc/rpc/clnt_unix.c b/lib/libc/rpc/clnt_unix.c
index a62c3e2c01..af7a765a73 100644
--- a/lib/libc/rpc/clnt_unix.c
+++ b/lib/libc/rpc/clnt_unix.c
@@ -29,7 +29,7 @@
  * @(#)clnt_unix.c 1.37 87/10/05 Copyr 1984 Sun Micro
  * @(#)clnt_unix.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/clnt_unix.c,v 1.5 2000/01/27 23:06:37 jasone Exp $
- * $DragonFly: src/lib/libc/rpc/clnt_unix.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/clnt_unix.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -115,12 +115,12 @@ clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz)
 	struct sockaddr_un *raddr;
 	u_long prog;
 	u_long vers;
-	register int *sockp;
+	int *sockp;
 	u_int sendsz;
 	u_int recvsz;
 {
 	CLIENT *h;
-	register struct ct_data *ct = NULL;
+	struct ct_data *ct = NULL;
 	struct timeval now;
 	struct rpc_msg call_msg;
 	static u_int32_t disrupt;
@@ -221,7 +221,7 @@ fooy:
 
 static enum clnt_stat
 clntunix_call(h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
-	register CLIENT *h;
+	CLIENT *h;
 	u_long proc;
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
@@ -229,12 +229,12 @@ clntunix_call(h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
 	caddr_t results_ptr;
 	struct timeval timeout;
 {
-	register struct ct_data *ct = (struct ct_data *) h->cl_private;
-	register XDR *xdrs = &(ct->ct_xdrs);
+	struct ct_data *ct = (struct ct_data *) h->cl_private;
+	XDR *xdrs = &(ct->ct_xdrs);
 	struct rpc_msg reply_msg;
 	u_long x_id;
 	u_int32_t *msg_x_id = (u_int32_t *)(ct->ct_mcall);	/* yuk */
-	register bool_t shipnow;
+	bool_t shipnow;
 	int refreshes = 2;
 
 	if (!ct->ct_waitset) {
@@ -321,7 +321,7 @@ clntunix_geterr(h, errp)
 	CLIENT *h;
 	struct rpc_err *errp;
 {
-	register struct ct_data *ct =
+	struct ct_data *ct =
 	    (struct ct_data *) h->cl_private;
 
 	*errp = ct->ct_error;
@@ -333,8 +333,8 @@ clntunix_freeres(cl, xdr_res, res_ptr)
 	xdrproc_t xdr_res;
 	caddr_t res_ptr;
 {
-	register struct ct_data *ct = (struct ct_data *)cl->cl_private;
-	register XDR *xdrs = &(ct->ct_xdrs);
+	struct ct_data *ct = (struct ct_data *)cl->cl_private;
+	XDR *xdrs = &(ct->ct_xdrs);
 
 	xdrs->x_op = XDR_FREE;
 	return ((*xdr_res)(xdrs, res_ptr));
@@ -352,8 +352,8 @@ clntunix_control(cl, request, info)
 	int request;
 	char *info;
 {
-	register struct ct_data *ct = (struct ct_data *)cl->cl_private;
-	register struct timeval *tv;
+	struct ct_data *ct = (struct ct_data *)cl->cl_private;
+	struct timeval *tv;
 	int len;
 
 	switch (request) {
@@ -460,7 +460,7 @@ static void
 clntunix_destroy(h)
 	CLIENT *h;
 {
-	register struct ct_data *ct =
+	struct ct_data *ct =
 	    (struct ct_data *) h->cl_private;
 
 	if (ct->ct_closeit) {
@@ -542,9 +542,9 @@ static int __msgwrite(sock, buf, cnt)
  */
 static int
 readunix(ct, buf, len)
-	register struct ct_data *ct;
+	struct ct_data *ct;
 	caddr_t buf;
-	register int len;
+	int len;
 {
 	fd_set *fds, readfds;
 	struct timeval start, after, duration, delta, tmp, tv;
@@ -621,7 +621,7 @@ writeunix(ct, buf, len)
 	caddr_t buf;
 	int len;
 {
-	register int i, cnt;
+	int i, cnt;
 
 	for (cnt = len; cnt > 0; cnt -= i, buf += i) {
 		if ((i = __msgwrite(ct->ct_sock, buf, cnt)) == -1) {
diff --git a/lib/libc/rpc/des_crypt.c b/lib/libc/rpc/des_crypt.c
index 573792e388..92eac78c8f 100644
--- a/lib/libc/rpc/des_crypt.c
+++ b/lib/libc/rpc/des_crypt.c
@@ -28,7 +28,7 @@
  *
  * @(#)des_crypt.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI
  * $FreeBSD: src/lib/libc/rpc/des_crypt.c,v 1.3 1999/08/28 00:00:38 peter Exp $
- * $DragonFly: src/lib/libc/rpc/des_crypt.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $
+ * $DragonFly: src/lib/libc/rpc/des_crypt.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  */
 /*
  * des_crypt.c, DES encryption library routines
@@ -39,15 +39,15 @@
 #include <rpc/des_crypt.h>
 #include <rpc/des.h>
 
-static int common_crypt	( char *, char *, register unsigned, unsigned, struct desparams * );
+static int common_crypt	( char *, char *, unsigned, unsigned, struct desparams * );
 int (*__des_crypt_LOCAL)() = 0;
 extern _des_crypt_call ( char *, int, struct desparams * );
 /*
  * Copy 8 bytes
  */
 #define COPY8(src, dst) { \
-	register char *a = (char *) dst; \
-	register char *b = (char *) src; \
+	char *a = (char *) dst; \
+	char *b = (char *) src; \
 	*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
 	*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
 }
@@ -56,9 +56,9 @@ extern _des_crypt_call ( char *, int, struct desparams * );
  * Copy multiple of 8 bytes
  */
 #define DESCOPY(src, dst, len) { \
-	register char *a = (char *) dst; \
-	register char *b = (char *) src; \
-	register int i; \
+	char *a = (char *) dst; \
+	char *b = (char *) src; \
+	int i; \
 	for (i = (int) len; i > 0; i -= 8) { \
 		*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
 		*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
@@ -122,11 +122,11 @@ static int
 common_crypt(key, buf, len, mode, desp)	
 	char *key;	
 	char *buf;
-	register unsigned len;
+	unsigned len;
 	unsigned mode;
-	register struct desparams *desp;
+	struct desparams *desp;
 {
-	register int desdev;
+	int desdev;
 
 	if ((len % 8) != 0 || len > DES_MAXDATA) {
 		return(DESERR_BADPARAM);
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index ab5957c913..a8dbe0430b 100644
--- a/lib/libc/rpc/getrpcent.c
+++ b/lib/libc/rpc/getrpcent.c
@@ -29,7 +29,7 @@
  *
  * @(#)getrpcent.c 1.14 91/03/11 Copyr 1984 Sun Micro
  * $FreeBSD: src/lib/libc/rpc/getrpcent.c,v 1.10 1999/08/28 00:00:39 peter Exp $
- * $DragonFly: src/lib/libc/rpc/getrpcent.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/getrpcent.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -77,7 +77,7 @@ static char RPCDB[] = "/etc/rpc";
 static struct rpcdata *
 _rpcdata()
 {
-	register struct rpcdata *d = rpcdata;
+	struct rpcdata *d = rpcdata;
 
 	if (d == 0) {
 		d = (struct rpcdata *)calloc(1, sizeof (struct rpcdata));
@@ -88,10 +88,10 @@ _rpcdata()
 
 struct rpcent *
 getrpcbynumber(number)
-	register int number;
+	int number;
 {
-	register struct rpcdata *d = _rpcdata();
-	register struct rpcent *p;
+	struct rpcdata *d = _rpcdata();
+	struct rpcent *p;
 #ifdef	YP
 	int reason;
 	char adrstr[16];
@@ -156,7 +156,7 @@ void
 setrpcent(f)
 	int f;
 {
-	register struct rpcdata *d = _rpcdata();
+	struct rpcdata *d = _rpcdata();
 
 	if (d == 0)
 		return;
@@ -180,7 +180,7 @@ setrpcent(f)
 void
 endrpcent()
 {
-	register struct rpcdata *d = _rpcdata();
+	struct rpcdata *d = _rpcdata();
 
 	if (d == 0)
 		return;
@@ -203,7 +203,7 @@ endrpcent()
 struct rpcent *
 getrpcent()
 {
-	register struct rpcdata *d = _rpcdata();
+	struct rpcdata *d = _rpcdata();
 #ifdef	YP
 	struct rpcent *hp;
 	int reason;
@@ -256,9 +256,9 @@ interpret(val, len)
 	char *val;
 	int len;
 {
-	register struct rpcdata *d = _rpcdata();
+	struct rpcdata *d = _rpcdata();
 	char *p;
-	register char *cp, **q;
+	char *cp, **q;
 
 	if (d == 0)
 		return (0);
diff --git a/lib/libc/rpc/key_call.c b/lib/libc/rpc/key_call.c
index f522772e9f..6a310e95fc 100644
--- a/lib/libc/rpc/key_call.c
+++ b/lib/libc/rpc/key_call.c
@@ -30,7 +30,7 @@
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
  *
  * $FreeBSD: src/lib/libc/rpc/key_call.c,v 1.3 2000/01/27 23:06:39 jasone Exp $
- * $DragonFly: src/lib/libc/rpc/key_call.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $
+ * $DragonFly: src/lib/libc/rpc/key_call.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  */
 
 #ident	"@(#)key_call.c	1.25	94/04/24 SMI"
@@ -279,7 +279,7 @@ static struct key_call_private *key_call_private_main = NULL;
 static void
 key_call_destroy(void *vp)
 {
-	register struct key_call_private *kcp = (struct key_call_private *)vp;
+	struct key_call_private *kcp = (struct key_call_private *)vp;
 
 	if (kcp) {
 		if (kcp->client)
diff --git a/lib/libc/rpc/key_prot_xdr.c b/lib/libc/rpc/key_prot_xdr.c
index 8cd6b6b067..0291c6c2e5 100644
--- a/lib/libc/rpc/key_prot_xdr.c
+++ b/lib/libc/rpc/key_prot_xdr.c
@@ -2,6 +2,7 @@
  * Please do not edit this file.
  * It was generated using rpcgen.
  */
+/* $DragonFly: src/lib/libc/rpc/key_prot_xdr.c,v 1.2 2004/10/25 19:38:01 drhodus Exp $								*/
 
 #include <rpc/key_prot.h>
 /*
@@ -43,7 +44,7 @@
  */
 
 bool_t
-xdr_keystatus(register XDR *xdrs, keystatus *objp)
+xdr_keystatus(XDR *xdrs, keystatus *objp)
 {
 
 	if (!xdr_enum(xdrs, (enum_t *)objp))
@@ -52,7 +53,7 @@ xdr_keystatus(register XDR *xdrs, keystatus *objp)
 }
 
 bool_t
-xdr_keybuf(register XDR *xdrs, keybuf objp)
+xdr_keybuf(XDR *xdrs, keybuf objp)
 {
 
 	if (!xdr_opaque(xdrs, objp, HEXKEYBYTES))
@@ -61,7 +62,7 @@ xdr_keybuf(register XDR *xdrs, keybuf objp)
 }
 
 bool_t
-xdr_netnamestr(register XDR *xdrs, netnamestr *objp)
+xdr_netnamestr(XDR *xdrs, netnamestr *objp)
 {
 
 	if (!xdr_string(xdrs, objp, MAXNETNAMELEN))
@@ -70,7 +71,7 @@ xdr_netnamestr(register XDR *xdrs, netnamestr *objp)
 }
 
 bool_t
-xdr_cryptkeyarg(register XDR *xdrs, cryptkeyarg *objp)
+xdr_cryptkeyarg(XDR *xdrs, cryptkeyarg *objp)
 {
 
 	if (!xdr_netnamestr(xdrs, &objp->remotename))
@@ -81,7 +82,7 @@ xdr_cryptkeyarg(register XDR *xdrs, cryptkeyarg *objp)
 }
 
 bool_t
-xdr_cryptkeyarg2(register XDR *xdrs, cryptkeyarg2 *objp)
+xdr_cryptkeyarg2(XDR *xdrs, cryptkeyarg2 *objp)
 {
 
 	if (!xdr_netnamestr(xdrs, &objp->remotename))
@@ -94,7 +95,7 @@ xdr_cryptkeyarg2(register XDR *xdrs, cryptkeyarg2 *objp)
 }
 
 bool_t
-xdr_cryptkeyres(register XDR *xdrs, cryptkeyres *objp)
+xdr_cryptkeyres(XDR *xdrs, cryptkeyres *objp)
 {
 
 	if (!xdr_keystatus(xdrs, &objp->status))
@@ -109,7 +110,7 @@ xdr_cryptkeyres(register XDR *xdrs, cryptkeyres *objp)
 }
 
 bool_t
-xdr_unixcred(register XDR *xdrs, unixcred *objp)
+xdr_unixcred(XDR *xdrs, unixcred *objp)
 {
 
 	if (!xdr_u_int(xdrs, &objp->uid))
@@ -123,7 +124,7 @@ xdr_unixcred(register XDR *xdrs, unixcred *objp)
 }
 
 bool_t
-xdr_getcredres(register XDR *xdrs, getcredres *objp)
+xdr_getcredres(XDR *xdrs, getcredres *objp)
 {
 
 	if (!xdr_keystatus(xdrs, &objp->status))
@@ -138,7 +139,7 @@ xdr_getcredres(register XDR *xdrs, getcredres *objp)
 }
 
 bool_t
-xdr_key_netstarg(register XDR *xdrs, key_netstarg *objp)
+xdr_key_netstarg(XDR *xdrs, key_netstarg *objp)
 {
 
 	if (!xdr_keybuf(xdrs, objp->st_priv_key))
@@ -151,7 +152,7 @@ xdr_key_netstarg(register XDR *xdrs, key_netstarg *objp)
 }
 
 bool_t
-xdr_key_netstres(register XDR *xdrs, key_netstres *objp)
+xdr_key_netstres(XDR *xdrs, key_netstres *objp)
 {
 
 	if (!xdr_keystatus(xdrs, &objp->status))
diff --git a/lib/libc/rpc/netnamer.c b/lib/libc/rpc/netnamer.c
index b5c5891d24..e5b6a0f13b 100644
--- a/lib/libc/rpc/netnamer.c
+++ b/lib/libc/rpc/netnamer.c
@@ -28,7 +28,7 @@
  * Mountain View, California  94043
  *
  * $FreeBSD: src/lib/libc/rpc/netnamer.c,v 1.3.6.1 2000/09/20 04:43:11 jkh Exp $
- * $DragonFly: src/lib/libc/rpc/netnamer.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $
+ * $DragonFly: src/lib/libc/rpc/netnamer.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  *
  * @(#)netnamer.c 1.13 91/03/11 Copyr 1986 Sun Micro
  */
@@ -155,9 +155,9 @@ _getgroups(uname, groups)
 	gid_t          groups[NGROUPS];
 {
 	gid_t           ngroups = 0;
-	register struct group *grp;
-	register int    i;
-	register int    j;
+	struct group *grp;
+	int    i;
+	int    j;
 	int             filter;
 
 	setgrent();
diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c
index 972daa18e4..10153646db 100644
--- a/lib/libc/rpc/pmap_clnt.c
+++ b/lib/libc/rpc/pmap_clnt.c
@@ -29,7 +29,7 @@
  * @(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro
  * @(#)pmap_clnt.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/pmap_clnt.c,v 1.11 2000/01/27 23:06:39 jasone Exp $
- * $DragonFly: src/lib/libc/rpc/pmap_clnt.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/pmap_clnt.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -69,7 +69,7 @@ pmap_set(program, version, protocol, port)
 {
 	struct sockaddr_in myaddress;
 	int socket = -1;
-	register CLIENT *client;
+	CLIENT *client;
 	struct pmap parms;
 	bool_t rslt;
 	struct stat st;
@@ -116,7 +116,7 @@ pmap_unset(program, version)
 {
 	struct sockaddr_in myaddress;
 	int socket = -1;
-	register CLIENT *client;
+	CLIENT *client;
 	struct pmap parms;
 	bool_t rslt;
 	struct stat st;
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
index 6573fb2fb5..a08647844e 100644
--- a/lib/libc/rpc/pmap_getmaps.c
+++ b/lib/libc/rpc/pmap_getmaps.c
@@ -29,7 +29,7 @@
  * @(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro
  * @(#)pmap_getmaps.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/pmap_getmaps.c,v 1.11 2000/01/27 23:06:39 jasone Exp $
- * $DragonFly: src/lib/libc/rpc/pmap_getmaps.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/pmap_getmaps.c,v 1.3 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -64,7 +64,7 @@ pmap_getmaps(address)
 	struct pmaplist *head = (struct pmaplist *)NULL;
 	int socket = -1;
 	struct timeval minutetimeout;
-	register CLIENT *client;
+	CLIENT *client;
 
 	minutetimeout.tv_sec = 60;
 	minutetimeout.tv_usec = 0;
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
index 0414b30eb0..4d1a777dcb 100644
--- a/lib/libc/rpc/pmap_getport.c
+++ b/lib/libc/rpc/pmap_getport.c
@@ -29,7 +29,7 @@
  * @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro
  * @(#)pmap_getport.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/pmap_getport.c,v 1.10 2000/01/27 23:06:40 jasone Exp $
- * $DragonFly: src/lib/libc/rpc/pmap_getport.c,v 1.3 2003/11/09 07:10:16 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/pmap_getport.c,v 1.4 2004/10/25 19:38:01 drhodus Exp $
  */
 
 /*
@@ -75,7 +75,7 @@ pmap_getport(address, program, version, protocol)
 {
 	u_short port = 0;
 	int socket = -1;
-	register CLIENT *client;
+	CLIENT *client;
 	struct pmap parms;
 
 	address->sin_port = htons(PMAPPORT);
diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c
index bdf6521cb1..ad4ec31908 100644
--- a/lib/libc/rpc/pmap_prot2.c
+++ b/lib/libc/rpc/pmap_prot2.c
@@ -29,7 +29,7 @@
  * @(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro
  * @(#)pmap_prot2.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/pmap_prot2.c,v 1.7 1999/08/28 00:00:42 peter Exp $
- * $DragonFly: src/lib/libc/rpc/pmap_prot2.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/pmap_prot2.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -84,8 +84,8 @@
  */
 bool_t
 xdr_pmaplist(xdrs, rp)
-	register XDR *xdrs;
-	register struct pmaplist **rp;
+	XDR *xdrs;
+	struct pmaplist **rp;
 {
 	/*
 	 * more_elements is pre-computed in case the direction is
@@ -93,8 +93,8 @@ xdr_pmaplist(xdrs, rp)
 	 * xdr_bool when the direction is XDR_DECODE.
 	 */
 	bool_t more_elements;
-	register int freeing = (xdrs->x_op == XDR_FREE);
-	register struct pmaplist **next = NULL;
+	int freeing = (xdrs->x_op == XDR_FREE);
+	struct pmaplist **next = NULL;
 
 	while (TRUE) {
 		more_elements = (bool_t)(*rp != NULL);
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
index 47ec8fe6b2..c852cd5022 100644
--- a/lib/libc/rpc/pmap_rmt.c
+++ b/lib/libc/rpc/pmap_rmt.c
@@ -29,7 +29,7 @@
  * @(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro
  * @(#)pmap_rmt.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/pmap_rmt.c,v 1.16.2.1 2002/06/30 23:34:58 iedowse Exp $
- * $DragonFly: src/lib/libc/rpc/pmap_rmt.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/pmap_rmt.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -74,7 +74,7 @@ pmap_rmtcall(addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, port_pt
 	u_long *port_ptr;
 {
 	int socket = -1;
-	register CLIENT *client;
+	CLIENT *client;
 	struct rmtcallargs a;
 	struct rmtcallres r;
 	enum clnt_stat stat;
@@ -109,8 +109,8 @@ pmap_rmtcall(addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, port_pt
  */
 bool_t
 xdr_rmtcall_args(xdrs, cap)
-	register XDR *xdrs;
-	register struct rmtcallargs *cap;
+	XDR *xdrs;
+	struct rmtcallargs *cap;
 {
 	u_int lenposition, argposition, position;
 
@@ -140,8 +140,8 @@ xdr_rmtcall_args(xdrs, cap)
  */
 bool_t
 xdr_rmtcallres(xdrs, crp)
-	register XDR *xdrs;
-	register struct rmtcallres *crp;
+	XDR *xdrs;
+	struct rmtcallres *crp;
 {
 	caddr_t port_ptr;
 
@@ -237,14 +237,14 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)
 	enum clnt_stat stat;
 	AUTH *unix_auth = authunix_create_default();
 	XDR xdr_stream;
-	register XDR *xdrs = &xdr_stream;
+	XDR *xdrs = &xdr_stream;
 	int outlen, inlen, fromlen, nets;
-	register int sock;
+	int sock;
 	int on = 1;
 	fd_set *fds, readfds;
-	register int i;
+	int i;
 	bool_t done = FALSE;
-	register u_long xid;
+	u_long xid;
 	u_long port;
 	struct in_addr addrs[20];
 	struct sockaddr_in baddr, raddr; /* broadcast and response addresses */
diff --git a/lib/libc/rpc/rpc_callmsg.c b/lib/libc/rpc/rpc_callmsg.c
index 04f62d26d8..23658cdfcd 100644
--- a/lib/libc/rpc/rpc_callmsg.c
+++ b/lib/libc/rpc/rpc_callmsg.c
@@ -29,7 +29,7 @@
  * @(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro
  * @(#)rpc_callmsg.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/rpc_callmsg.c,v 1.9 1999/08/28 00:00:45 peter Exp $
- * $DragonFly: src/lib/libc/rpc/rpc_callmsg.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/rpc_callmsg.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -49,11 +49,11 @@
  */
 bool_t
 xdr_callmsg(xdrs, cmsg)
-	register XDR *xdrs;
-	register struct rpc_msg *cmsg;
+	XDR *xdrs;
+	struct rpc_msg *cmsg;
 {
-	register int32_t *buf;
-	register struct opaque_auth *oa;
+	int32_t *buf;
+	struct opaque_auth *oa;
 
 	if (xdrs->x_op == XDR_ENCODE) {
 		if (cmsg->rm_call.cb_cred.oa_length > MAX_AUTH_BYTES) {
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c
index c08f91306f..c47b5c60f0 100644
--- a/lib/libc/rpc/rpc_prot.c
+++ b/lib/libc/rpc/rpc_prot.c
@@ -29,7 +29,7 @@
  * @(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro
  * @(#)rpc_prot.c	2.3 88/08/07 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/rpc_prot.c,v 1.8 1999/08/28 00:00:46 peter Exp $
- * $DragonFly: src/lib/libc/rpc/rpc_prot.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/rpc_prot.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -59,8 +59,8 @@ struct opaque_auth _null_auth;
  */
 bool_t
 xdr_opaque_auth(xdrs, ap)
-	register XDR *xdrs;
-	register struct opaque_auth *ap;
+	XDR *xdrs;
+	struct opaque_auth *ap;
 {
 
 	if (xdr_enum(xdrs, &(ap->oa_flavor)))
@@ -74,8 +74,8 @@ xdr_opaque_auth(xdrs, ap)
  */
 bool_t
 xdr_des_block(xdrs, blkp)
-	register XDR *xdrs;
-	register des_block *blkp;
+	XDR *xdrs;
+	des_block *blkp;
 {
 	return (xdr_opaque(xdrs, (caddr_t)blkp, sizeof(des_block)));
 }
@@ -87,8 +87,8 @@ xdr_des_block(xdrs, blkp)
  */
 bool_t
 xdr_accepted_reply(xdrs, ar)
-	register XDR *xdrs;
-	register struct accepted_reply *ar;
+	XDR *xdrs;
+	struct accepted_reply *ar;
 {
 
 	/* personalized union, rather than calling xdr_union */
@@ -116,8 +116,8 @@ xdr_accepted_reply(xdrs, ar)
  */
 bool_t
 xdr_rejected_reply(xdrs, rr)
-	register XDR *xdrs;
-	register struct rejected_reply *rr;
+	XDR *xdrs;
+	struct rejected_reply *rr;
 {
 
 	/* personalized union, rather than calling xdr_union */
@@ -146,8 +146,8 @@ static struct xdr_discrim reply_dscrm[3] = {
  */
 bool_t
 xdr_replymsg(xdrs, rmsg)
-	register XDR *xdrs;
-	register struct rpc_msg *rmsg;
+	XDR *xdrs;
+	struct rpc_msg *rmsg;
 {
 	if (
 	    xdr_u_int32_t(xdrs, &(rmsg->rm_xid)) &&
@@ -166,8 +166,8 @@ xdr_replymsg(xdrs, rmsg)
  */
 bool_t
 xdr_callhdr(xdrs, cmsg)
-	register XDR *xdrs;
-	register struct rpc_msg *cmsg;
+	XDR *xdrs;
+	struct rpc_msg *cmsg;
 {
 
 	cmsg->rm_direction = CALL;
@@ -186,8 +186,8 @@ xdr_callhdr(xdrs, cmsg)
 
 static void
 accepted(acpt_stat, error)
-	register enum accept_stat acpt_stat;
-	register struct rpc_err *error;
+	enum accept_stat acpt_stat;
+	struct rpc_err *error;
 {
 
 	switch (acpt_stat) {
@@ -224,8 +224,8 @@ accepted(acpt_stat, error)
 
 static void
 rejected(rjct_stat, error)
-	register enum reject_stat rjct_stat;
-	register struct rpc_err *error;
+	enum reject_stat rjct_stat;
+	struct rpc_err *error;
 {
 
 	switch (rjct_stat) {
@@ -251,8 +251,8 @@ rejected(rjct_stat, error)
  */
 void
 _seterr_reply(msg, error)
-	register struct rpc_msg *msg;
-	register struct rpc_err *error;
+	struct rpc_msg *msg;
+	struct rpc_err *error;
 {
 
 	/* optimized for normal, SUCCESSful case */
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index 3c8c52f142..e99110f027 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -29,7 +29,7 @@
  * @(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro
  * @(#)svc.c	2.4 88/08/11 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/svc.c,v 1.14.2.1 2001/03/05 10:50:36 obrien Exp $
- * $DragonFly: src/lib/libc/rpc/svc.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/svc.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -82,7 +82,7 @@ void
 xprt_register(xprt)
 	SVCXPRT *xprt;
 {
-	register int sock = xprt->xp_sock;
+	int sock = xprt->xp_sock;
 
 	if (sock + 1 > __svc_fdsetsize) {
 		int bytes = howmany(sock + 1, NFDBITS) * sizeof(fd_mask);
@@ -129,7 +129,7 @@ void
 xprt_unregister(xprt)
 	SVCXPRT *xprt;
 {
-	register int sock = xprt->xp_sock;
+	int sock = xprt->xp_sock;
 
 	if (xports[sock] == xprt) {
 		xports[sock] = (SVCXPRT *)0;
@@ -165,7 +165,7 @@ svc_register(xprt, prog, vers, dispatch, protocol)
 	int protocol;
 {
 	struct svc_callout *prev;
-	register struct svc_callout *s;
+	struct svc_callout *s;
 
 	if ((s = svc_find(prog, vers, &prev)) != NULL_SVC) {
 		if (s->sc_dispatch == dispatch)
@@ -198,7 +198,7 @@ svc_unregister(prog, vers)
 	u_long vers;
 {
 	struct svc_callout *prev;
-	register struct svc_callout *s;
+	struct svc_callout *s;
 
 	if ((s = svc_find(prog, vers, &prev)) == NULL_SVC)
 		return;
@@ -223,7 +223,7 @@ svc_find(prog, vers, prev)
 	u_long vers;
 	struct svc_callout **prev;
 {
-	register struct svc_callout *s, *p;
+	struct svc_callout *s, *p;
 
 	p = NULL_SVC;
 	for (s = svc_head; s != NULL_SVC; s = s->sc_next) {
@@ -243,7 +243,7 @@ done:
  */
 bool_t
 svc_sendreply(xprt, xdr_results, xdr_location)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	xdrproc_t xdr_results;
 	caddr_t xdr_location;
 {
@@ -263,7 +263,7 @@ svc_sendreply(xprt, xdr_results, xdr_location)
  */
 void
 svcerr_noproc(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
 	struct rpc_msg rply;
 
@@ -279,7 +279,7 @@ svcerr_noproc(xprt)
  */
 void
 svcerr_decode(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
 	struct rpc_msg rply;
 
@@ -295,7 +295,7 @@ svcerr_decode(xprt)
  */
 void
 svcerr_systemerr(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
 	struct rpc_msg rply;
 
@@ -339,7 +339,7 @@ svcerr_weakauth(xprt)
  */
 void
 svcerr_noprog(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
 	struct rpc_msg rply;
 
@@ -355,7 +355,7 @@ svcerr_noprog(xprt)
  */
 void
 svcerr_progvers(xprt, low_vers, high_vers)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	u_long low_vers;
 	u_long high_vers;
 {
@@ -417,10 +417,10 @@ svc_getreqset2(readfds, width)
 	u_long low_vers;
 	u_long high_vers;
 	struct svc_req r;
-	register SVCXPRT *xprt;
-	register int bit;
-	register int sock;
-	register fd_mask mask, *maskp;
+	SVCXPRT *xprt;
+	int bit;
+	int sock;
+	fd_mask mask, *maskp;
 	char cred_area[2*MAX_AUTH_BYTES + RQCRED_SIZE];
 	msg.rm_call.cb_cred.oa_base = cred_area;
 	msg.rm_call.cb_verf.oa_base = &(cred_area[MAX_AUTH_BYTES]);
@@ -440,7 +440,7 @@ svc_getreqset2(readfds, width)
 			if (SVC_RECV(xprt, &msg)) {
 
 				/* now find the exported program and call it */
-				register struct svc_callout *s;
+				struct svc_callout *s;
 				enum auth_stat why;
 
 				r.rq_xprt = xprt;
diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
index 34b3f6a11c..10f717f520 100644
--- a/lib/libc/rpc/svc_auth.c
+++ b/lib/libc/rpc/svc_auth.c
@@ -28,7 +28,7 @@
  *
  * @(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro
  * $FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.7 1999/12/29 05:04:16 peter Exp $
- * $DragonFly: src/lib/libc/rpc/svc_auth.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/svc_auth.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
@@ -66,8 +66,8 @@
  *
  *	enum auth_stat
  *	flavorx_auth(rqst, msg)
- *		register struct svc_req *rqst;
- *		register struct rpc_msg *msg;
+ *		struct svc_req *rqst;
+ *		struct rpc_msg *msg;
  *
  */
 
@@ -104,11 +104,11 @@ static struct authsvc *Auths = NULL;
  */
 enum auth_stat
 _authenticate(rqst, msg)
-	register struct svc_req *rqst;
+	struct svc_req *rqst;
 	struct rpc_msg *msg;
 {
-	register int cred_flavor;
-	register struct authsvc *asp;
+	int cred_flavor;
+	struct authsvc *asp;
 
 	rqst->rq_cred = msg->rm_call.cb_cred;
 	rqst->rq_xprt->xp_verf.oa_flavor = _null_auth.oa_flavor;
@@ -173,10 +173,10 @@ _svcauth_null(rqst, msg)
 
 int
 svc_auth_reg(cred_flavor, handler)
-	register int cred_flavor;
+	int cred_flavor;
 	enum auth_stat (*handler)();
 {
-	register struct authsvc *asp;
+	struct authsvc *asp;
 
 	switch (cred_flavor) {
 	    case AUTH_NULL:
diff --git a/lib/libc/rpc/svc_auth_des.c b/lib/libc/rpc/svc_auth_des.c
index 34f4a1eccb..2fd6ea19df 100644
--- a/lib/libc/rpc/svc_auth_des.c
+++ b/lib/libc/rpc/svc_auth_des.c
@@ -4,7 +4,7 @@
  *
  * @(#)svcauth_des.c	2.3 89/07/11 4.0 RPCSRC; from 1.15 88/02/08 SMI
  * $FreeBSD: src/lib/libc/rpc/svc_auth_des.c,v 1.3 1999/08/28 00:00:48 peter Exp $
- * $DragonFly: src/lib/libc/rpc/svc_auth_des.c,v 1.3 2004/02/03 07:34:09 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/svc_auth_des.c,v 1.4 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -103,16 +103,16 @@ static struct {
  */
 enum auth_stat
 _svcauth_des(rqst, msg)
-	register struct svc_req *rqst;
-	register struct rpc_msg *msg;
+	struct svc_req *rqst;
+	struct rpc_msg *msg;
 {
 
-	register long *ixdr;
+	long *ixdr;
 	des_block cryptbuf[2];
-	register struct authdes_cred *cred;
+	struct authdes_cred *cred;
 	struct authdes_verf verf;
 	int status;
-	register struct cache_entry *entry;
+	struct cache_entry *entry;
 	short sid = 0;
 	des_block *sessionkey;
 	des_block ivec;
@@ -350,7 +350,7 @@ _svcauth_des(rqst, msg)
 static void
 cache_init()
 {
-	register int i;
+	int i;
 
 	authdes_cache = (struct cache_entry *)
 		mem_alloc(sizeof(struct cache_entry) * AUTHDES_CACHESZ);	
@@ -381,11 +381,11 @@ cache_victim()
  */
 static void
 cache_ref(sid)
-	register short sid;
+	short sid;
 {
-	register int i;
-	register short curr;
-	register short prev;
+	int i;
+	short curr;
+	short prev;
 
 	prev = authdes_lru[0];
 	authdes_lru[0] = sid;
@@ -404,13 +404,13 @@ cache_ref(sid)
  */
 static short
 cache_spot(key, name, timestamp)
-	register des_block *key;
+	des_block *key;
 	char *name;
 	struct timeval *timestamp;
 {
-	register struct cache_entry *cp;
-	register int i;
-	register u_long hi;
+	struct cache_entry *cp;
+	int i;
+	u_long hi;
 
 	hi = key->key.high;
 	for (cp = authdes_cache, i = 0; i < AUTHDES_CACHESZ; i++, cp++) {
@@ -460,10 +460,10 @@ authdes_getucred(adc, uid, gid, grouplen, groups)
 	uid_t *uid;
 	gid_t *gid;
 	int *grouplen;
-	register gid_t *groups;
+	gid_t *groups;
 {
 	unsigned sid;
-	register int i;
+	int i;
 	uid_t i_uid;	
 	gid_t i_gid;
 	int i_grouplen;
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
index d0b917be79..227beb0607 100644
--- a/lib/libc/rpc/svc_auth_unix.c
+++ b/lib/libc/rpc/svc_auth_unix.c
@@ -29,7 +29,7 @@
  * @(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro
  * @(#)svc_auth_unix.c	2.3 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/svc_auth_unix.c,v 1.8 1999/08/28 00:00:49 peter Exp $
- * $DragonFly: src/lib/libc/rpc/svc_auth_unix.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/svc_auth_unix.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -52,13 +52,13 @@
  */
 enum auth_stat
 _svcauth_unix(rqst, msg)
-	register struct svc_req *rqst;
-	register struct rpc_msg *msg;
+	struct svc_req *rqst;
+	struct rpc_msg *msg;
 {
-	register enum auth_stat stat;
+	enum auth_stat stat;
 	XDR xdrs;
-	register struct authunix_parms *aup;
-	register int32_t *buf;
+	struct authunix_parms *aup;
+	int32_t *buf;
 	struct area {
 		struct authunix_parms area_aup;
 		char area_machname[MAX_MACHINE_NAME+1];
@@ -66,7 +66,7 @@ _svcauth_unix(rqst, msg)
 	} *area;
 	u_int auth_len;
 	int str_len, gid_len;
-	register int i;
+	int i;
 
 	area = (struct area *) rqst->rq_clntcred;
 	aup = &area->area_aup;
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
index efd284c158..7b57f98dbd 100644
--- a/lib/libc/rpc/svc_raw.c
+++ b/lib/libc/rpc/svc_raw.c
@@ -29,7 +29,7 @@
  * @(#)svc_raw.c 1.15 87/08/11 Copyr 1984 Sun Micro
  * @(#)svc_raw.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/svc_raw.c,v 1.7 1999/08/28 00:00:49 peter Exp $
- * $DragonFly: src/lib/libc/rpc/svc_raw.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/svc_raw.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -73,7 +73,7 @@ static struct xp_ops server_ops = {
 SVCXPRT *
 svcraw_create()
 {
-	register struct svcraw_private *srp = svcraw_private;
+	struct svcraw_private *srp = svcraw_private;
 
 	if (srp == 0) {
 		srp = (struct svcraw_private *)calloc(1, sizeof (*srp));
@@ -100,8 +100,8 @@ svcraw_recv(xprt, msg)
 	SVCXPRT *xprt;
 	struct rpc_msg *msg;
 {
-	register struct svcraw_private *srp = svcraw_private;
-	register XDR *xdrs;
+	struct svcraw_private *srp = svcraw_private;
+	XDR *xdrs;
 
 	if (srp == 0)
 		return (0);
@@ -118,8 +118,8 @@ svcraw_reply(xprt, msg)
 	SVCXPRT *xprt;
 	struct rpc_msg *msg;
 {
-	register struct svcraw_private *srp = svcraw_private;
-	register XDR *xdrs;
+	struct svcraw_private *srp = svcraw_private;
+	XDR *xdrs;
 
 	if (srp == 0)
 		return (FALSE);
@@ -138,7 +138,7 @@ svcraw_getargs(xprt, xdr_args, args_ptr)
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
 {
-	register struct svcraw_private *srp = svcraw_private;
+	struct svcraw_private *srp = svcraw_private;
 
 	if (srp == 0)
 		return (FALSE);
@@ -151,8 +151,8 @@ svcraw_freeargs(xprt, xdr_args, args_ptr)
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
 {
-	register struct svcraw_private *srp = svcraw_private;
-	register XDR *xdrs;
+	struct svcraw_private *srp = svcraw_private;
+	XDR *xdrs;
 
 	if (srp == 0)
 		return (FALSE);
diff --git a/lib/libc/rpc/svc_tcp.c b/lib/libc/rpc/svc_tcp.c
index f6e5c2700f..bcc4831a45 100644
--- a/lib/libc/rpc/svc_tcp.c
+++ b/lib/libc/rpc/svc_tcp.c
@@ -29,7 +29,7 @@
  * @(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro
  * @(#)svc_tcp.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/svc_tcp.c,v 1.18.2.3 2001/09/05 22:29:23 dec Exp $
- * $DragonFly: src/lib/libc/rpc/svc_tcp.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/svc_tcp.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -122,13 +122,13 @@ struct tcp_conn {  /* kept in xprt->xp_p1 */
  */
 SVCXPRT *
 svctcp_create(sock, sendsize, recvsize)
-	register int sock;
+	int sock;
 	u_int sendsize;
 	u_int recvsize;
 {
 	bool_t madesock = FALSE;
-	register SVCXPRT *xprt;
-	register struct tcp_rendezvous *r;
+	SVCXPRT *xprt;
+	struct tcp_rendezvous *r;
 	struct sockaddr_in addr;
 	int len = sizeof(struct sockaddr_in);
 	int on;
@@ -203,8 +203,8 @@ makefd_xprt(fd, sendsize, recvsize)
 	u_int sendsize;
 	u_int recvsize;
 {
-	register SVCXPRT *xprt;
-	register struct tcp_conn *cd;
+	SVCXPRT *xprt;
+	struct tcp_conn *cd;
 
 	xprt = (SVCXPRT *)mem_alloc(sizeof(SVCXPRT));
 	if (xprt == (SVCXPRT *)NULL) {
@@ -235,7 +235,7 @@ makefd_xprt(fd, sendsize, recvsize)
 
 static bool_t
 rendezvous_request(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
 	int sock;
 	struct tcp_rendezvous *r;
@@ -285,9 +285,9 @@ rendezvous_stat()
 
 static void
 svctcp_destroy(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
-	register struct tcp_conn *cd = (struct tcp_conn *)xprt->xp_p1;
+	struct tcp_conn *cd = (struct tcp_conn *)xprt->xp_p1;
 
 	xprt_unregister(xprt);
 	(void)_close(xprt->xp_sock);
@@ -322,11 +322,11 @@ static struct timeval wait_per_try = { 35, 0 };
  */
 static int
 readtcp(xprt, buf, len)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	caddr_t buf;
-	register int len;
+	int len;
 {
-	register int sock = xprt->xp_sock;
+	int sock = xprt->xp_sock;
 	struct timeval start, delta, tv;
 	struct timeval tmp1, tmp2;
 	fd_set *fds;
@@ -394,11 +394,11 @@ fatal_err:
  */
 static int
 writetcp(xprt, buf, len)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	caddr_t buf;
 	int len;
 {
-	register int i, cnt;
+	int i, cnt;
 
 	for (cnt = len; cnt > 0; cnt -= i, buf += i) {
 		if ((i = _write(xprt->xp_sock, buf, cnt)) < 0) {
@@ -414,7 +414,7 @@ static enum xprt_stat
 svctcp_stat(xprt)
 	SVCXPRT *xprt;
 {
-	register struct tcp_conn *cd =
+	struct tcp_conn *cd =
 	    (struct tcp_conn *)(xprt->xp_p1);
 
 	if (cd->strm_stat == XPRT_DIED)
@@ -427,11 +427,11 @@ svctcp_stat(xprt)
 static bool_t
 svctcp_recv(xprt, msg)
 	SVCXPRT *xprt;
-	register struct rpc_msg *msg;
+	struct rpc_msg *msg;
 {
-	register struct tcp_conn *cd =
+	struct tcp_conn *cd =
 	    (struct tcp_conn *)(xprt->xp_p1);
-	register XDR *xdrs = &(cd->xdrs);
+	XDR *xdrs = &(cd->xdrs);
 
 	xdrs->x_op = XDR_DECODE;
 	(void)xdrrec_skiprecord(xdrs);
@@ -459,7 +459,7 @@ svctcp_freeargs(xprt, xdr_args, args_ptr)
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
 {
-	register XDR *xdrs =
+	XDR *xdrs =
 	    &(((struct tcp_conn *)(xprt->xp_p1))->xdrs);
 
 	xdrs->x_op = XDR_FREE;
@@ -469,12 +469,12 @@ svctcp_freeargs(xprt, xdr_args, args_ptr)
 static bool_t
 svctcp_reply(xprt, msg)
 	SVCXPRT *xprt;
-	register struct rpc_msg *msg;
+	struct rpc_msg *msg;
 {
-	register struct tcp_conn *cd =
+	struct tcp_conn *cd =
 	    (struct tcp_conn *)(xprt->xp_p1);
-	register XDR *xdrs = &(cd->xdrs);
-	register bool_t stat;
+	XDR *xdrs = &(cd->xdrs);
+	bool_t stat;
 
 	xdrs->x_op = XDR_ENCODE;
 	msg->rm_xid = cd->x_id;
diff --git a/lib/libc/rpc/svc_udp.c b/lib/libc/rpc/svc_udp.c
index 5db97eb2de..33d3d4e3ff 100644
--- a/lib/libc/rpc/svc_udp.c
+++ b/lib/libc/rpc/svc_udp.c
@@ -29,7 +29,7 @@
  * @(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro
  * @(#)svc_udp.c	2.2 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/svc_udp.c,v 1.13 2000/01/27 23:06:41 jasone Exp $
- * $DragonFly: src/lib/libc/rpc/svc_udp.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $
+ * $DragonFly: src/lib/libc/rpc/svc_udp.c,v 1.4 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -96,12 +96,12 @@ struct svcudp_data {
  */
 SVCXPRT *
 svcudp_bufcreate(sock, sendsz, recvsz)
-	register int sock;
+	int sock;
 	u_int sendsz, recvsz;
 {
 	bool_t madesock = FALSE;
-	register SVCXPRT *xprt;
-	register struct svcudp_data *su;
+	SVCXPRT *xprt;
+	struct svcudp_data *su;
 	struct sockaddr_in addr;
 	int len = sizeof(struct sockaddr_in);
 
@@ -170,12 +170,12 @@ svcudp_stat(xprt)
 
 static bool_t
 svcudp_recv(xprt, msg)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	struct rpc_msg *msg;
 {
-	register struct svcudp_data *su = su_data(xprt);
-	register XDR *xdrs = &(su->su_xdrs);
-	register int rlen;
+	struct svcudp_data *su = su_data(xprt);
+	XDR *xdrs = &(su->su_xdrs);
+	int rlen;
 	char *reply;
 	u_long replylen;
 
@@ -204,13 +204,13 @@ svcudp_recv(xprt, msg)
 
 static bool_t
 svcudp_reply(xprt, msg)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	struct rpc_msg *msg;
 {
-	register struct svcudp_data *su = su_data(xprt);
-	register XDR *xdrs = &(su->su_xdrs);
-	register int slen;
-	register bool_t stat = FALSE;
+	struct svcudp_data *su = su_data(xprt);
+	XDR *xdrs = &(su->su_xdrs);
+	int slen;
+	bool_t stat = FALSE;
 
 	xdrs->x_op = XDR_ENCODE;
 	XDR_SETPOS(xdrs, 0);
@@ -245,7 +245,7 @@ svcudp_freeargs(xprt, xdr_args, args_ptr)
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
 {
-	register XDR *xdrs = &(su_data(xprt)->su_xdrs);
+	XDR *xdrs = &(su_data(xprt)->su_xdrs);
 
 	xdrs->x_op = XDR_FREE;
 	return ((*xdr_args)(xdrs, args_ptr));
@@ -253,9 +253,9 @@ svcudp_freeargs(xprt, xdr_args, args_ptr)
 
 static void
 svcudp_destroy(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
-	register struct svcudp_data *su = su_data(xprt);
+	struct svcudp_data *su = su_data(xprt);
 
 	xprt_unregister(xprt);
 	(void)_close(xprt->xp_sock);
@@ -380,9 +380,9 @@ cache_set(xprt, replylen)
 	SVCXPRT *xprt;
 	u_long replylen;
 {
-	register cache_ptr victim;
-	register cache_ptr *vicp;
-	register struct svcudp_data *su = su_data(xprt);
+	cache_ptr victim;
+	cache_ptr *vicp;
+	struct svcudp_data *su = su_data(xprt);
 	struct udp_cache *uc = (struct udp_cache *) su->su_cache;
 	u_int loc;
 	char *newbuf;
@@ -448,9 +448,9 @@ cache_get(xprt, msg, replyp, replylenp)
 	u_long *replylenp;
 {
 	u_int loc;
-	register cache_ptr ent;
-	register struct svcudp_data *su = su_data(xprt);
-	register struct udp_cache *uc = (struct udp_cache *) su->su_cache;
+	cache_ptr ent;
+	struct svcudp_data *su = su_data(xprt);
+	struct udp_cache *uc = (struct udp_cache *) su->su_cache;
 
 #	define EQADDR(a1, a2)	(memcmp(&a1, &a2, sizeof(a1)) == 0)
 
diff --git a/lib/libc/rpc/svc_unix.c b/lib/libc/rpc/svc_unix.c
index b991fe46f1..8cb630a580 100644
--- a/lib/libc/rpc/svc_unix.c
+++ b/lib/libc/rpc/svc_unix.c
@@ -29,7 +29,7 @@
  * @(#)svc_unix.c 1.21 87/08/11 Copyr 1984 Sun Micro
  * @(#)svc_unix.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/svc_unix.c,v 1.7.2.2 2001/09/05 22:29:23 dec Exp $
- * $DragonFly: src/lib/libc/rpc/svc_unix.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libc/rpc/svc_unix.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -181,14 +181,14 @@ static int __msgwrite(sock, buf, cnt)
  */
 SVCXPRT *
 svcunix_create(sock, sendsize, recvsize, path)
-	register int sock;
+	int sock;
 	u_int sendsize;
 	u_int recvsize;
 	char *path;
 {
 	bool_t madesock = FALSE;
-	register SVCXPRT *xprt;
-	register struct unix_rendezvous *r;
+	SVCXPRT *xprt;
+	struct unix_rendezvous *r;
 	struct sockaddr_un addr;
 	int len = sizeof(struct sockaddr_un);
 
@@ -257,8 +257,8 @@ makefd_xprt(fd, sendsize, recvsize)
 	u_int sendsize;
 	u_int recvsize;
 {
-	register SVCXPRT *xprt;
-	register struct unix_conn *cd;
+	SVCXPRT *xprt;
+	struct unix_conn *cd;
 
 	xprt = (SVCXPRT *)mem_alloc(sizeof(SVCXPRT));
 	if (xprt == (SVCXPRT *)NULL) {
@@ -289,7 +289,7 @@ makefd_xprt(fd, sendsize, recvsize)
 
 static bool_t
 rendezvous_request(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
 	int sock;
 	struct unix_rendezvous *r;
@@ -327,9 +327,9 @@ rendezvous_stat()
 
 static void
 svcunix_destroy(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
-	register struct unix_conn *cd = (struct unix_conn *)xprt->xp_p1;
+	struct unix_conn *cd = (struct unix_conn *)xprt->xp_p1;
 
 	xprt_unregister(xprt);
 	(void)_close(xprt->xp_sock);
@@ -364,11 +364,11 @@ static struct timeval wait_per_try = { 35, 0 };
  */
 static int
 readunix(xprt, buf, len)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	caddr_t buf;
-	register int len;
+	int len;
 {
-	register int sock = xprt->xp_sock;
+	int sock = xprt->xp_sock;
 	struct timeval start, delta, tv;
 	struct timeval tmp1, tmp2;
 	fd_set *fds;
@@ -436,11 +436,11 @@ fatal_err:
  */
 static int
 writeunix(xprt, buf, len)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	caddr_t buf;
 	int len;
 {
-	register int i, cnt;
+	int i, cnt;
 
 	for (cnt = len; cnt > 0; cnt -= i, buf += i) {
 		if ((i = __msgwrite(xprt->xp_sock, buf, cnt)) < 0) {
@@ -456,7 +456,7 @@ static enum xprt_stat
 svcunix_stat(xprt)
 	SVCXPRT *xprt;
 {
-	register struct unix_conn *cd =
+	struct unix_conn *cd =
 	    (struct unix_conn *)(xprt->xp_p1);
 
 	if (cd->strm_stat == XPRT_DIED)
@@ -469,11 +469,11 @@ svcunix_stat(xprt)
 static bool_t
 svcunix_recv(xprt, msg)
 	SVCXPRT *xprt;
-	register struct rpc_msg *msg;
+	struct rpc_msg *msg;
 {
-	register struct unix_conn *cd =
+	struct unix_conn *cd =
 	    (struct unix_conn *)(xprt->xp_p1);
-	register XDR *xdrs = &(cd->xdrs);
+	XDR *xdrs = &(cd->xdrs);
 
 	xdrs->x_op = XDR_DECODE;
 	(void)xdrrec_skiprecord(xdrs);
@@ -505,7 +505,7 @@ svcunix_freeargs(xprt, xdr_args, args_ptr)
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
 {
-	register XDR *xdrs =
+	XDR *xdrs =
 	    &(((struct unix_conn *)(xprt->xp_p1))->xdrs);
 
 	xdrs->x_op = XDR_FREE;
@@ -515,12 +515,12 @@ svcunix_freeargs(xprt, xdr_args, args_ptr)
 static bool_t
 svcunix_reply(xprt, msg)
 	SVCXPRT *xprt;
-	register struct rpc_msg *msg;
+	struct rpc_msg *msg;
 {
-	register struct unix_conn *cd =
+	struct unix_conn *cd =
 	    (struct unix_conn *)(xprt->xp_p1);
-	register XDR *xdrs = &(cd->xdrs);
-	register bool_t stat;
+	XDR *xdrs = &(cd->xdrs);
+	bool_t stat;
 
 	xdrs->x_op = XDR_ENCODE;
 	msg->rm_xid = cd->x_id;
diff --git a/lib/libc/stdtime/asctime.c b/lib/libc/stdtime/asctime.c
index ef6f3a87db..1ce2a3b4ae 100644
--- a/lib/libc/stdtime/asctime.c
+++ b/lib/libc/stdtime/asctime.c
@@ -3,7 +3,7 @@
 ** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
 **
 ** $FreeBSD: src/lib/libc/stdtime/asctime.c,v 1.7.6.1 2001/03/05 11:37:20 obrien Exp $
-** $DragonFly: src/lib/libc/stdtime/asctime.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+** $DragonFly: src/lib/libc/stdtime/asctime.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
 */
 
 /*
@@ -47,8 +47,8 @@ char *result;
 	** three explicit spaces, two explicit colons, a newline,
 	** and a trailing ASCII nul).
 	*/
-	register const char *	wn;
-	register const char *	mn;
+	const char *	wn;
+	const char *	mn;
 
 	if (timeptr->tm_wday < 0 || timeptr->tm_wday >= DAYSPERWEEK)
 		wn = "???";
diff --git a/lib/libc/stdtime/localtime.c b/lib/libc/stdtime/localtime.c
index 08265538b6..5261120486 100644
--- a/lib/libc/stdtime/localtime.c
+++ b/lib/libc/stdtime/localtime.c
@@ -3,7 +3,7 @@
 ** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
 **
 ** $FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.25.2.2 2002/08/13 16:08:07 bmilekic Exp $
-** $DragonFly: src/lib/libc/stdtime/localtime.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+** $DragonFly: src/lib/libc/stdtime/localtime.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
 */
 
 /*
@@ -204,8 +204,8 @@ static long
 detzcode(codep)
 const char * const	codep;
 {
-	register long	result;
-	register int	i;
+	long	result;
+	int	i;
 
 	result = (codep[0] & 0x80) ? ~0L : 0L;
 	for (i = 0; i < 4; ++i)
@@ -216,8 +216,8 @@ const char * const	codep;
 static void
 settzname P((void))
 {
-	register struct state * 	sp = lclptr;
-	register int			i;
+	struct state * 	sp = lclptr;
+	int			i;
 
 	tzname[0] = wildabbr;
 	tzname[1] = wildabbr;
@@ -235,7 +235,7 @@ settzname P((void))
 	}
 #endif /* defined ALL_STATE */
 	for (i = 0; i < sp->typecnt; ++i) {
-		register const struct ttinfo * const	ttisp = &sp->ttis[i];
+		const struct ttinfo * const	ttisp = &sp->ttis[i];
 
 		tzname[ttisp->tt_isdst] =
 			&sp->chars[ttisp->tt_abbrind];
@@ -254,7 +254,7 @@ settzname P((void))
 	** And to get the latest zone names into tzname. . .
 	*/
 	for (i = 0; i < sp->timecnt; ++i) {
-		register const struct ttinfo * const	ttisp =
+		const struct ttinfo * const	ttisp =
 							&sp->ttis[
 								sp->types[i]];
 
@@ -265,12 +265,12 @@ settzname P((void))
 
 static int
 tzload(name, sp)
-register const char *		name;
-register struct state * const	sp;
+const char *		name;
+struct state * const	sp;
 {
-	register const char *	p;
-	register int		i;
-	register int		fid;
+	const char *	p;
+	int		i;
+	int		fid;
 
 	/* XXX The following is from OpenBSD, and I'm not sure it is correct */
 	if (name != NULL && issetugid() != 0)
@@ -280,7 +280,7 @@ register struct state * const	sp;
 	if (name == NULL && (name = TZDEFAULT) == NULL)
 		return -1;
 	{
-		register int	doaccess;
+		int	doaccess;
 		struct stat	stab;
 		/*
 		** Section 4.9.1 of the C standard says that
@@ -366,7 +366,7 @@ register struct state * const	sp;
 				return -1;
 		}
 		for (i = 0; i < sp->typecnt; ++i) {
-			register struct ttinfo *	ttisp;
+			struct ttinfo *	ttisp;
 
 			ttisp = &sp->ttis[i];
 			ttisp->tt_gmtoff = detzcode(p);
@@ -383,7 +383,7 @@ register struct state * const	sp;
 			sp->chars[i] = *p++;
 		sp->chars[i] = '\0';	/* ensure '\0' at end */
 		for (i = 0; i < sp->leapcnt; ++i) {
-			register struct lsinfo *	lsisp;
+			struct lsinfo *	lsisp;
 
 			lsisp = &sp->lsis[i];
 			lsisp->ls_trans = detzcode(p);
@@ -392,7 +392,7 @@ register struct state * const	sp;
 			p += 4;
 		}
 		for (i = 0; i < sp->typecnt; ++i) {
-			register struct ttinfo *	ttisp;
+			struct ttinfo *	ttisp;
 
 			ttisp = &sp->ttis[i];
 			if (ttisstdcnt == 0)
@@ -405,7 +405,7 @@ register struct state * const	sp;
 			}
 		}
 		for (i = 0; i < sp->typecnt; ++i) {
-			register struct ttinfo *	ttisp;
+			struct ttinfo *	ttisp;
 
 			ttisp = &sp->ttis[i];
 			if (ttisgmtcnt == 0)
@@ -438,9 +438,9 @@ static const int	year_lengths[2] = {
 
 static const char *
 getzname(strp)
-register const char *	strp;
+const char *	strp;
 {
-	register char	c;
+	char	c;
 
 	while ((c = *strp) != '\0' && !is_digit(c) && c != ',' && c != '-' &&
 		c != '+')
@@ -457,13 +457,13 @@ register const char *	strp;
 
 static const char *
 getnum(strp, nump, min, max)
-register const char *	strp;
+const char *	strp;
 int * const		nump;
 const int		min;
 const int		max;
 {
-	register char	c;
-	register int	num;
+	char	c;
+	int	num;
 
 	if (strp == NULL || !is_digit(c = *strp))
 		return NULL;
@@ -490,7 +490,7 @@ const int		max;
 
 static const char *
 getsecs(strp, secsp)
-register const char *	strp;
+const char *	strp;
 long * const		secsp;
 {
 	int	num;
@@ -532,10 +532,10 @@ long * const		secsp;
 
 static const char *
 getoffset(strp, offsetp)
-register const char *	strp;
+const char *	strp;
 long * const		offsetp;
 {
-	register int	neg = 0;
+	int	neg = 0;
 
 	if (*strp == '-') {
 		neg = 1;
@@ -560,7 +560,7 @@ long * const		offsetp;
 static const char *
 getrule(strp, rulep)
 const char *			strp;
-register struct rule * const	rulep;
+struct rule * const	rulep;
 {
 	if (*strp == 'J') {
 		/*
@@ -615,12 +615,12 @@ static time_t
 transtime(janfirst, year, rulep, offset)
 const time_t				janfirst;
 const int				year;
-register const struct rule * const	rulep;
+const struct rule * const	rulep;
 const long				offset;
 {
-	register int	leapyear;
-	register time_t	value;
-	register int	i;
+	int	leapyear;
+	time_t	value;
+	int	i;
 	int		d, m1, yy0, yy1, yy2, dow;
 
 	INITIALIZE(value);
@@ -709,7 +709,7 @@ const long				offset;
 static int
 tzparse(name, sp, lastditch)
 const char *			name;
-register struct state * const	sp;
+struct state * const	sp;
 const int			lastditch;
 {
 	const char *			stdname;
@@ -718,10 +718,10 @@ const int			lastditch;
 	size_t				dstlen;
 	long				stdoffset;
 	long				dstoffset;
-	register time_t *		atp;
-	register unsigned char *	typep;
-	register char *			cp;
-	register int			load_result;
+	time_t *		atp;
+	unsigned char *	typep;
+	char *			cp;
+	int			load_result;
 
 	INITIALIZE(dstname);
 	stdname = name;
@@ -761,8 +761,8 @@ const int			lastditch;
 		if (*name == ',' || *name == ';') {
 			struct rule	start;
 			struct rule	end;
-			register int	year;
-			register time_t	janfirst;
+			int	year;
+			time_t	janfirst;
 			time_t		starttime;
 			time_t		endtime;
 
@@ -811,12 +811,12 @@ const int			lastditch;
 					SECSPERDAY;
 			}
 		} else {
-			register long	theirstdoffset;
-			register long	theirdstoffset;
-			register long	theiroffset;
-			register int	isdst;
-			register int	i;
-			register int	j;
+			long	theirstdoffset;
+			long	theirdstoffset;
+			long	theiroffset;
+			int	isdst;
+			int	i;
+			int	j;
 
 			if (*name != '\0')
 				return -1;
@@ -979,7 +979,7 @@ void
 tzset P((void))
 #endif
 {
-	register const char *	name;
+	const char *	name;
 
 	name = getenv("TZ");
 	if (name == NULL) {
@@ -1043,9 +1043,9 @@ const time_t * const	timep;
 const long		offset;
 struct tm * const	tmp;
 {
-	register struct state *		sp;
-	register const struct ttinfo *	ttisp;
-	register int			i;
+	struct state *		sp;
+	const struct ttinfo *	ttisp;
+	int			i;
 	const time_t			t = *timep;
 
 	sp = lclptr;
@@ -1241,18 +1241,18 @@ static void
 timesub(timep, offset, sp, tmp)
 const time_t * const			timep;
 const long				offset;
-register const struct state * const	sp;
-register struct tm * const		tmp;
+const struct state * const	sp;
+struct tm * const		tmp;
 {
-	register const struct lsinfo *	lp;
-	register long			days;
-	register long			rem;
-	register int			y;
-	register int			yleap;
-	register const int *		ip;
-	register long			corr;
-	register int			hit;
-	register int			i;
+	const struct lsinfo *	lp;
+	long			days;
+	long			rem;
+	int			y;
+	int			yleap;
+	const int *		ip;
+	long			corr;
+	int			hit;
+	int			i;
 
 	corr = 0;
 	hit = 0;
@@ -1316,7 +1316,7 @@ register struct tm * const		tmp;
 	y = EPOCH_YEAR;
 #define LEAPS_THRU_END_OF(y)	((y) / 4 - (y) / 100 + (y) / 400)
 	while (days < 0 || days >= (long) year_lengths[yleap = isleap(y)]) {
-		register int	newy;
+		int	newy;
 
 		newy = y + days / DAYSPERNYEAR;
 		if (days < 0)
@@ -1396,7 +1396,7 @@ int * const	tensptr;
 int * const	unitsptr;
 const int	base;
 {
-	register int	tensdelta;
+	int	tensdelta;
 
 	tensdelta = (*unitsptr >= 0) ?
 		(*unitsptr / base) :
@@ -1407,10 +1407,10 @@ const int	base;
 
 static int
 tmcomp(atmp, btmp)
-register const struct tm * const atmp;
-register const struct tm * const btmp;
+const struct tm * const atmp;
+const struct tm * const btmp;
 {
-	register int	result;
+	int	result;
 
 	if ((result = (atmp->tm_year - btmp->tm_year)) == 0 &&
 		(result = (atmp->tm_mon - btmp->tm_mon)) == 0 &&
@@ -1428,11 +1428,11 @@ void (* const		funcp) P((const time_t*, long, struct tm*));
 const long		offset;
 int * const		okayp;
 {
-	register const struct state *	sp;
-	register int			dir;
-	register int			bits;
-	register int			i, j ;
-	register int			saved_seconds;
+	const struct state *	sp;
+	int			dir;
+	int			bits;
+	int			i, j ;
+	int			saved_seconds;
 	time_t				newt;
 	time_t				t;
 	struct tm			yourtm, mytm;
@@ -1573,9 +1573,9 @@ struct tm * const	tmp;
 void (* const		funcp) P((const time_t *, long, struct tm *));
 const long		offset;
 {
-	register time_t			t;
-	register const struct state *	sp;
-	register int			samei, otheri;
+	time_t			t;
+	const struct state *	sp;
+	int			samei, otheri;
 	int				okay;
 
 	if (tmp->tm_isdst > 1)
@@ -1712,9 +1712,9 @@ static long
 leapcorr(timep)
 time_t *	timep;
 {
-	register struct state *		sp;
-	register struct lsinfo *	lp;
-	register int			i;
+	struct state *		sp;
+	struct lsinfo *	lp;
+	int			i;
 
 	sp = lclptr;
 	i = sp->leapcnt;
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
index 9b40d8550c..9a295a3665 100644
--- a/lib/libc/string/bcmp.c
+++ b/lib/libc/string/bcmp.c
@@ -32,7 +32,7 @@
  *
  * @(#)bcmp.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/bcmp.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libc/string/bcmp.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/bcmp.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <string.h>
@@ -43,9 +43,9 @@
 int
 bcmp(b1, b2, length)
 	const void *b1, *b2;
-	register size_t length;
+	size_t length;
 {
-	register char *p1, *p2;
+	char *p1, *p2;
 
 	if (length == 0)
 		return(0);
diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c
index 1bb85de360..b458229792 100644
--- a/lib/libc/string/bcopy.c
+++ b/lib/libc/string/bcopy.c
@@ -35,7 +35,7 @@
  *
  * @(#)bcopy.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/bcopy.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libc/string/bcopy.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/bcopy.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
  
 #include <sys/cdefs.h>
@@ -69,11 +69,11 @@ bcopy(src0, dst0, length)
 #endif
 	void *dst0;
 	const void *src0;
-	register size_t length;
+	size_t length;
 {
-	register char *dst = dst0;
-	register const char *src = src0;
-	register size_t t;
+	char *dst = dst0;
+	const char *src = src0;
+	size_t t;
 
 	if (length == 0 || dst == src)		/* nothing to do */
 		goto done;
diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c
index 8840ce8df0..acda6fe4c8 100644
--- a/lib/libc/string/ffs.c
+++ b/lib/libc/string/ffs.c
@@ -32,7 +32,7 @@
  *
  * @(#)ffs.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/ffs.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libc/string/ffs.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/ffs.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <string.h>
@@ -42,9 +42,9 @@
  */
 int
 ffs(mask)
-	register int mask;
+	int mask;
 {
-	register int bit;
+	int bit;
 
 	if (mask == 0)
 		return(0);
diff --git a/lib/libc/string/index.c b/lib/libc/string/index.c
index 8e3e74e20f..896cf3aa65 100644
--- a/lib/libc/string/index.c
+++ b/lib/libc/string/index.c
@@ -32,7 +32,7 @@
  *
  * @(#)index.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/index.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libc/string/index.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/index.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -45,7 +45,7 @@ strchr(p, ch)
 #else
 index(p, ch)
 #endif
-	register const char *p, ch;
+	const char *p, ch;
 {
 	for (;; ++p) {
 		if (*p == ch)
diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c
index 53e61b1456..acbe3bd236 100644
--- a/lib/libc/string/memccpy.c
+++ b/lib/libc/string/memccpy.c
@@ -32,7 +32,7 @@
  *
  * @(#)memccpy.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/memccpy.c,v 1.2.12.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libc/string/memccpy.c,v 1.3 2003/11/09 02:34:02 dillon Exp $
+ * $DragonFly: src/lib/libc/string/memccpy.c,v 1.4 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -47,9 +47,9 @@ memccpy(t, f, c, n)
 {
 
 	if (n) {
-		register unsigned char *tp = t;
-		register const unsigned char *fp = f;
-		register unsigned char uc = c;
+		unsigned char *tp = t;
+		const unsigned char *fp = f;
+		unsigned char uc = c;
 		do {
 			if ((*tp++ = *fp++) == uc)
 				return (tp);
diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c
index 03c9d28ecc..21472e2fe1 100644
--- a/lib/libc/string/memchr.c
+++ b/lib/libc/string/memchr.c
@@ -35,7 +35,7 @@
  *
  * @(#)memchr.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/memchr.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libc/string/memchr.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/memchr.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -44,11 +44,11 @@
 void *
 memchr(s, c, n)
 	const void *s;
-	register unsigned char c;
-	register size_t n;
+	unsigned char c;
+	size_t n;
 {
 	if (n != 0) {
-		register const unsigned char *p = s;
+		const unsigned char *p = s;
 
 		do {
 			if (*p++ == c)
diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c
index d9a50fef19..441c328de4 100644
--- a/lib/libc/string/memcmp.c
+++ b/lib/libc/string/memcmp.c
@@ -35,7 +35,7 @@
  *
  * @(#)memcmp.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/memcmp.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libc/string/memcmp.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/memcmp.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -50,7 +50,7 @@ memcmp(s1, s2, n)
 	size_t n;
 {
 	if (n != 0) {
-		register const unsigned char *p1 = s1, *p2 = s2;
+		const unsigned char *p1 = s1, *p2 = s2;
 
 		do {
 			if (*p1++ != *p2++)
diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c
index 42a6ae6272..1c39ae8971 100644
--- a/lib/libc/string/memset.c
+++ b/lib/libc/string/memset.c
@@ -35,7 +35,7 @@
  *
  * @(#)memset.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/memset.c,v 1.4.2.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libc/string/memset.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/memset.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -54,7 +54,7 @@
 void
 bzero(dst0, length)
 	void *dst0;
-	register size_t length;
+	size_t length;
 #else
 #define	RETURN	return (dst0)
 #define	VAL	c0
@@ -63,15 +63,15 @@ bzero(dst0, length)
 void *
 memset(dst0, c0, length)
 	void *dst0;
-	register int c0;
-	register size_t length;
+	int c0;
+	size_t length;
 #endif
 {
-	register size_t t;
+	size_t t;
 #ifndef BZERO
-	register u_int c;
+	u_int c;
 #endif
-	register u_char *dst;
+	u_char *dst;
 
 	dst = dst0;
 	/*
diff --git a/lib/libc/string/rindex.c b/lib/libc/string/rindex.c
index 04075d27b0..1d9d24b4b2 100644
--- a/lib/libc/string/rindex.c
+++ b/lib/libc/string/rindex.c
@@ -32,7 +32,7 @@
  *
  * @(#)rindex.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/rindex.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libc/string/rindex.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/rindex.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <stddef.h>
@@ -44,10 +44,10 @@ strrchr(p, ch)
 #else
 rindex(p, ch)
 #endif
-	register const char *p;
-	register int ch;
+	const char *p;
+	int ch;
 {
-	register char *save;
+	char *save;
 
 	for (save = NULL;; ++p) {
 		if (*p == ch)
diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c
index c8929145bc..63488dcd8a 100644
--- a/lib/libc/string/strcasecmp.c
+++ b/lib/libc/string/strcasecmp.c
@@ -32,7 +32,7 @@
  *
  * @(#)strcasecmp.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strcasecmp.c,v 1.2.8.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libc/string/strcasecmp.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strcasecmp.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -45,7 +45,7 @@ int
 strcasecmp(s1, s2)
 	const char *s1, *s2;
 {
-	register const u_char
+	const u_char
 			*us1 = (const u_char *)s1,
 			*us2 = (const u_char *)s2;
 
@@ -58,10 +58,10 @@ strcasecmp(s1, s2)
 int
 strncasecmp(s1, s2, n)
 	const char *s1, *s2;
-	register size_t n;
+	size_t n;
 {
 	if (n != 0) {
-		register const u_char
+		const u_char
 				*us1 = (const u_char *)s1,
 				*us2 = (const u_char *)s2;
 
diff --git a/lib/libc/string/strcasestr.c b/lib/libc/string/strcasestr.c
index f84714f842..ddd240b58e 100644
--- a/lib/libc/string/strcasestr.c
+++ b/lib/libc/string/strcasestr.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/string/strcasestr.c,v 1.2.2.1 2001/12/25 00:36:53 ache Exp $
- * $DragonFly: src/lib/libc/string/strcasestr.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strcasestr.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <ctype.h>
@@ -45,10 +45,10 @@
  */
 char *
 strcasestr(s, find)
-	register const char *s, *find;
+	const char *s, *find;
 {
-	register char c, sc;
-	register size_t len;
+	char c, sc;
+	size_t len;
 
 	if ((c = *find++) != 0) {
 		c = tolower((unsigned char)c);
diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c
index 895e182c65..1610d660bc 100644
--- a/lib/libc/string/strcat.c
+++ b/lib/libc/string/strcat.c
@@ -32,15 +32,15 @@
  *
  * @(#)strcat.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strcat.c,v 1.2.2.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libc/string/strcat.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strcat.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <string.h>
 
 char *
 strcat(s, append)
-	register char *s;
-	register const char *append;
+	char *s;
+	const char *append;
 {
 	char *save = s;
 
diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c
index 67f632eb76..74e4d11f79 100644
--- a/lib/libc/string/strcmp.c
+++ b/lib/libc/string/strcmp.c
@@ -35,7 +35,7 @@
  *
  * @(#)strcmp.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strcmp.c,v 1.2.8.1 2001/07/09 23:30:05 obrien Exp $
- * $DragonFly: src/lib/libc/string/strcmp.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strcmp.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -46,7 +46,7 @@
  */
 int
 strcmp(s1, s2)
-	register const char *s1, *s2;
+	const char *s1, *s2;
 {
 	while (*s1 == *s2++)
 		if (*s1++ == 0)
diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c
index 4bc6f92e8b..27ccfc6a21 100644
--- a/lib/libc/string/strcpy.c
+++ b/lib/libc/string/strcpy.c
@@ -32,7 +32,7 @@
  *
  * @(#)strcpy.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strcpy.c,v 1.2.2.1 2001/07/09 23:30:06 obrien Exp $
- * $DragonFly: src/lib/libc/string/strcpy.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strcpy.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -40,8 +40,8 @@
 
 char *
 strcpy(to, from)
-	register char *to;
-	register const char *from;
+	char *to;
+	const char *from;
 {
 	char *save = to;
 
diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c
index 2583e8a382..7693fa7b01 100644
--- a/lib/libc/string/strcspn.c
+++ b/lib/libc/string/strcspn.c
@@ -35,7 +35,7 @@
  *
  * @(#)strcspn.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strcspn.c,v 1.1.1.1.14.1 2001/07/09 23:30:06 obrien Exp $
- * $DragonFly: src/lib/libc/string/strcspn.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strcspn.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -47,10 +47,10 @@
 size_t
 strcspn(s1, s2)
 	const char *s1;
-	register const char *s2;
+	const char *s2;
 {
-	register const char *p, *spanp;
-	register char c, sc;
+	const char *p, *spanp;
+	char c, sc;
 
 	/*
 	 * Stop as soon as we find any character from s2.  Note that there
diff --git a/lib/libc/string/strlcat.c b/lib/libc/string/strlcat.c
index 338a5a99d6..0ff6aebf1b 100644
--- a/lib/libc/string/strlcat.c
+++ b/lib/libc/string/strlcat.c
@@ -26,7 +26,7 @@
  *
  * $OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $
  * $FreeBSD: src/lib/libc/string/strlcat.c,v 1.2.4.2 2001/07/09 23:30:06 obrien Exp $
- * $DragonFly: src/lib/libc/string/strlcat.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strlcat.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -44,9 +44,9 @@ size_t strlcat(dst, src, siz)
 	const char *src;
 	size_t siz;
 {
-	register char *d = dst;
-	register const char *s = src;
-	register size_t n = siz;
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
 	size_t dlen;
 
 	/* Find the end of dst and adjust bytes left but don't go past end */
diff --git a/lib/libc/string/strlcpy.c b/lib/libc/string/strlcpy.c
index f1d2e2d86b..01b63e43fd 100644
--- a/lib/libc/string/strlcpy.c
+++ b/lib/libc/string/strlcpy.c
@@ -28,7 +28,7 @@
  *
  * $OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $
  * $FreeBSD: src/lib/libc/string/strlcpy.c,v 1.2.4.1 2001/07/09 23:30:06 obrien Exp $
- * $DragonFly: src/lib/libc/string/strlcpy.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strlcpy.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -44,9 +44,9 @@ size_t strlcpy(dst, src, siz)
 	const char *src;
 	size_t siz;
 {
-	register char *d = dst;
-	register const char *s = src;
-	register size_t n = siz;
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
 
 	/* Copy as many bytes as will fit */
 	if (n != 0 && --n != 0) {
diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c
index 4de89e96c6..9367ca343e 100644
--- a/lib/libc/string/strlen.c
+++ b/lib/libc/string/strlen.c
@@ -32,7 +32,7 @@
  *
  * @(#)strlen.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strlen.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libc/string/strlen.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strlen.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -42,7 +42,7 @@ size_t
 strlen(str)
 	const char *str;
 {
-	register const char *s;
+	const char *s;
 
 	for (s = str; *s; ++s);
 	return(s - str);
diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c
index 3e75c3ee0d..d21d38bb78 100644
--- a/lib/libc/string/strmode.c
+++ b/lib/libc/string/strmode.c
@@ -32,7 +32,7 @@
  *
  * @(#)strmode.c	8.3 (Berkeley) 8/15/94
  * $FreeBSD: src/lib/libc/string/strmode.c,v 1.1.1.2.6.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libc/string/strmode.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strmode.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -41,8 +41,8 @@
 
 void
 strmode(mode, p)
-	register mode_t mode;
-	register char *p;
+	mode_t mode;
+	char *p;
 {
 	 /* print type */
 	switch (mode & S_IFMT) {
diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c
index 9fb541b439..e4bf5138c5 100644
--- a/lib/libc/string/strncat.c
+++ b/lib/libc/string/strncat.c
@@ -35,7 +35,7 @@
  *
  * @(#)strncat.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strncat.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libc/string/strncat.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strncat.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -49,11 +49,11 @@ char *
 strncat(dst, src, n)
 	char *dst;
 	const char *src;
-	register size_t n;
+	size_t n;
 {
 	if (n != 0) {
-		register char *d = dst;
-		register const char *s = src;
+		char *d = dst;
+		const char *s = src;
 
 		while (*d != 0)
 			d++;
diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c
index 0fc1cfb3da..ba3f869b7a 100644
--- a/lib/libc/string/strncmp.c
+++ b/lib/libc/string/strncmp.c
@@ -32,7 +32,7 @@
  *
  * @(#)strncmp.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strncmp.c,v 1.2.8.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libc/string/strncmp.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strncmp.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -40,8 +40,8 @@
 
 int
 strncmp(s1, s2, n)
-	register const char *s1, *s2;
-	register size_t n;
+	const char *s1, *s2;
+	size_t n;
 {
 
 	if (n == 0)
diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c
index 1e3afc1bf0..23a0f59b4f 100644
--- a/lib/libc/string/strncpy.c
+++ b/lib/libc/string/strncpy.c
@@ -35,7 +35,7 @@
  *
  * @(#)strncpy.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strncpy.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libc/string/strncpy.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strncpy.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -49,11 +49,11 @@ char *
 strncpy(dst, src, n)
 	char *dst;
 	const char *src;
-	register size_t n;
+	size_t n;
 {
 	if (n != 0) {
-		register char *d = dst;
-		register const char *s = src;
+		char *d = dst;
+		const char *s = src;
 
 		do {
 			if ((*d++ = *s++) == 0) {
diff --git a/lib/libc/string/strpbrk.c b/lib/libc/string/strpbrk.c
index 4c68110965..b366cabad1 100644
--- a/lib/libc/string/strpbrk.c
+++ b/lib/libc/string/strpbrk.c
@@ -32,7 +32,7 @@
  *
  * @(#)strpbrk.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strpbrk.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libc/string/strpbrk.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strpbrk.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -43,10 +43,10 @@
  */
 char *
 strpbrk(s1, s2)
-	register const char *s1, *s2;
+	const char *s1, *s2;
 {
-	register const char *scanp;
-	register int c, sc;
+	const char *scanp;
+	int c, sc;
 
 	while ((c = *s1++) != 0) {
 		for (scanp = s2; (sc = *scanp++) != 0;)
diff --git a/lib/libc/string/strsep.c b/lib/libc/string/strsep.c
index d8125bd3cd..991f5aa525 100644
--- a/lib/libc/string/strsep.c
+++ b/lib/libc/string/strsep.c
@@ -32,7 +32,7 @@
  *
  * @(#)strsep.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strsep.c,v 1.2.12.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libc/string/strsep.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strsep.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -52,12 +52,12 @@
  */
 char *
 strsep(stringp, delim)
-	register char **stringp;
-	register const char *delim;
+	char **stringp;
+	const char *delim;
 {
-	register char *s;
-	register const char *spanp;
-	register int c, sc;
+	char *s;
+	const char *spanp;
+	int c, sc;
 	char *tok;
 
 	if ((s = *stringp) == NULL)
diff --git a/lib/libc/string/strsignal.c b/lib/libc/string/strsignal.c
index 32f372768c..6bb44fc129 100644
--- a/lib/libc/string/strsignal.c
+++ b/lib/libc/string/strsignal.c
@@ -32,7 +32,7 @@
  *
  * @(#)strerror.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strsignal.c,v 1.1.2.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libc/string/strsignal.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strsignal.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <stdio.h>
@@ -45,8 +45,8 @@ strsignal(num)
 {
 #define	UPREFIX	"Unknown signal: "
 	static char ebuf[40] = UPREFIX;		/* 64-bit number + slop */
-	register unsigned int signum;
-	register char *p, *t;
+	unsigned int signum;
+	char *p, *t;
 	char tmp[40];
 
 	signum = num;				/* convert to unsigned */
diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c
index 54c2af9d85..d0d35ccc1e 100644
--- a/lib/libc/string/strspn.c
+++ b/lib/libc/string/strspn.c
@@ -32,7 +32,7 @@
  *
  * @(#)strspn.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strspn.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libc/string/strspn.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strspn.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -44,10 +44,10 @@
 size_t
 strspn(s1, s2)
 	const char *s1;
-	register const char *s2;
+	const char *s2;
 {
-	register const char *p = s1, *spanp;
-	register char c, sc;
+	const char *p = s1, *spanp;
+	char c, sc;
 
 	/*
 	 * Skip any characters in s2, excluding the terminating \0.
diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c
index 5a513fbcd3..17e96cb672 100644
--- a/lib/libc/string/strstr.c
+++ b/lib/libc/string/strstr.c
@@ -35,7 +35,7 @@
  *
  * @(#)strstr.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strstr.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libc/string/strstr.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libc/string/strstr.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -46,10 +46,10 @@
  */
 char *
 strstr(s, find)
-	register const char *s, *find;
+	const char *s, *find;
 {
-	register char c, sc;
-	register size_t len;
+	char c, sc;
+	size_t len;
 
 	if ((c = *find++) != 0) {
 		len = strlen(find);
diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c
index c112ae02fe..5c55e2c00e 100644
--- a/lib/libc/string/swab.c
+++ b/lib/libc/string/swab.c
@@ -35,7 +35,7 @@
  *
  * @(#)swab.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/swab.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libc/string/swab.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libc/string/swab.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <string.h>
@@ -46,9 +46,9 @@ swab(from, to, len)
 	void *to;
 	size_t len;
 {
-	register unsigned long temp;
-	register int n;
-	register char *fp, *tp;
+	unsigned long temp;
+	int n;
+	char *fp, *tp;
 
 	n = (len >> 1) + 1;
 	fp = (char *)from;
diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c
index 5643d66971..5c886b9e94 100644
--- a/lib/libc/xdr/xdr.c
+++ b/lib/libc/xdr/xdr.c
@@ -29,7 +29,7 @@
  * @(#)xdr.c 1.35 87/08/12
  * @(#)xdr.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr.c,v 1.9.2.1 2000/05/06 21:16:04 dec Exp $
- * $DragonFly: src/lib/libc/xdr/xdr.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libc/xdr/xdr.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -154,7 +154,7 @@ xdr_u_int(xdrs, up)
  */
 bool_t
 xdr_long(xdrs, lp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	long *lp;
 {
 	switch (xdrs->x_op) {
@@ -175,7 +175,7 @@ xdr_long(xdrs, lp)
  */
 bool_t
 xdr_u_long(xdrs, ulp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_long *ulp;
 {
 	switch (xdrs->x_op) {
@@ -196,7 +196,7 @@ xdr_u_long(xdrs, ulp)
  */
 bool_t
 xdr_int32_t(xdrs, int32_p)
-	register XDR *xdrs;
+	XDR *xdrs;
 	int32_t *int32_p;
 {
 	long l;
@@ -226,7 +226,7 @@ xdr_int32_t(xdrs, int32_p)
  */
 bool_t
 xdr_u_int32_t(xdrs, u_int32_p)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_int32_t *u_int32_p;
 {
 	u_long l;
@@ -255,7 +255,7 @@ xdr_u_int32_t(xdrs, u_int32_p)
  */
 bool_t
 xdr_int64_t(xdrs, int64_p)
-	register XDR *xdrs;
+	XDR *xdrs;
 	int64_t *int64_p;
 {
 	u_long ul[2];
@@ -287,7 +287,7 @@ xdr_int64_t(xdrs, int64_p)
  */
 bool_t
 xdr_u_int64_t(xdrs, uint64_p)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_int64_t *uint64_p;
 {
 	u_long ul[2];
@@ -321,7 +321,7 @@ xdr_u_int64_t(xdrs, uint64_p)
  */
 bool_t
 xdr_short(xdrs, sp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	short *sp;
 {
 	long l;
@@ -350,7 +350,7 @@ xdr_short(xdrs, sp)
  */
 bool_t
 xdr_u_short(xdrs, usp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_short *usp;
 {
 	u_long l;
@@ -380,7 +380,7 @@ xdr_u_short(xdrs, usp)
  */
 bool_t
 xdr_int16_t(xdrs, int16_p)
-	register XDR *xdrs;
+	XDR *xdrs;
 	int16_t *int16_p;
 {
 	long l;
@@ -409,7 +409,7 @@ xdr_int16_t(xdrs, int16_p)
  */
 bool_t
 xdr_u_int16_t(xdrs, u_int16_p)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_int16_t *u_int16_p;
 {
 	u_long l;
@@ -475,7 +475,7 @@ xdr_u_char(xdrs, cp)
  */
 bool_t
 xdr_bool(xdrs, bp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	bool_t *bp;
 {
 	long lb;
@@ -536,11 +536,11 @@ xdr_enum(xdrs, ep)
  */
 bool_t
 xdr_opaque(xdrs, cp, cnt)
-	register XDR *xdrs;
+	XDR *xdrs;
 	caddr_t cp;
-	register u_int cnt;
+	u_int cnt;
 {
-	register u_int rndup;
+	u_int rndup;
 	static crud[BYTES_PER_XDR_UNIT];
 
 	/*
@@ -588,13 +588,13 @@ xdr_opaque(xdrs, cp, cnt)
  */
 bool_t
 xdr_bytes(xdrs, cpp, sizep, maxsize)
-	register XDR *xdrs;
+	XDR *xdrs;
 	char **cpp;
-	register u_int *sizep;
+	u_int *sizep;
 	u_int maxsize;
 {
-	register char *sp = *cpp;  /* sp is the actual string pointer */
-	register u_int nodesize;
+	char *sp = *cpp;  /* sp is the actual string pointer */
+	u_int nodesize;
 
 	/*
 	 * first deal with the length since xdr bytes are counted
@@ -663,13 +663,13 @@ xdr_netobj(xdrs, np)
  */
 bool_t
 xdr_union(xdrs, dscmp, unp, choices, dfault)
-	register XDR *xdrs;
+	XDR *xdrs;
 	enum_t *dscmp;		/* enum to decide which arm to work on */
 	char *unp;		/* the union itself */
 	struct xdr_discrim *choices;	/* [value, xdr proc] for each arm */
 	xdrproc_t dfault;	/* default xdr routine */
 {
-	register enum_t dscm;
+	enum_t dscm;
 
 	/*
 	 * we deal with the discriminator;  it's an enum
@@ -712,11 +712,11 @@ xdr_union(xdrs, dscmp, unp, choices, dfault)
  */
 bool_t
 xdr_string(xdrs, cpp, maxsize)
-	register XDR *xdrs;
+	XDR *xdrs;
 	char **cpp;
 	u_int maxsize;
 {
-	register char *sp = *cpp;  /* sp is the actual string pointer */
+	char *sp = *cpp;  /* sp is the actual string pointer */
 	u_int size;
 	u_int nodesize;
 
diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c
index 8237fb1aab..2f70f7606f 100644
--- a/lib/libc/xdr/xdr_array.c
+++ b/lib/libc/xdr/xdr_array.c
@@ -29,7 +29,7 @@
  * @(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro
  * @(#)xdr_array.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.8.2.3 2002/08/01 12:23:20 nectar Exp $
- * $DragonFly: src/lib/libc/xdr/xdr_array.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libc/xdr/xdr_array.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -59,18 +59,18 @@
  */
 bool_t
 xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc)
-	register XDR *xdrs;
+	XDR *xdrs;
 	caddr_t *addrp;		/* array pointer */
 	u_int *sizep;		/* number of elements */
 	u_int maxsize;		/* max numberof elements */
 	u_int elsize;		/* size in bytes of each element */
 	xdrproc_t elproc;	/* xdr routine to handle each element */
 {
-	register u_int i;
-	register caddr_t target = *addrp;
-	register u_int c;  /* the actual element count */
-	register bool_t stat = TRUE;
-	register u_int nodesize;
+	u_int i;
+	caddr_t target = *addrp;
+	u_int c;  /* the actual element count */
+	bool_t stat = TRUE;
+	u_int nodesize;
 
 	/* like strings, arrays are really counted arrays */
 	if (!xdr_u_int(xdrs, sizep)) {
@@ -135,14 +135,14 @@ xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc)
  */
 bool_t
 xdr_vector(xdrs, basep, nelem, elemsize, xdr_elem)
-	register XDR *xdrs;
-	register char *basep;
-	register u_int nelem;
-	register u_int elemsize;
-	register xdrproc_t xdr_elem;
+	XDR *xdrs;
+	char *basep;
+	u_int nelem;
+	u_int elemsize;
+	xdrproc_t xdr_elem;
 {
-	register u_int i;
-	register char *elptr;
+	u_int i;
+	char *elptr;
 
 	elptr = basep;
 	for (i = 0; i < nelem; i++) {
diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c
index 35f1b7f788..84b66a9a83 100644
--- a/lib/libc/xdr/xdr_float.c
+++ b/lib/libc/xdr/xdr_float.c
@@ -29,7 +29,7 @@
  * @(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro
  * @(#)xdr_float.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.7 1999/08/28 00:02:55 peter Exp $
- * $DragonFly: src/lib/libc/xdr/xdr_float.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libc/xdr/xdr_float.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -93,8 +93,8 @@ static struct sgl_limits {
 
 bool_t
 xdr_float(xdrs, fp)
-	register XDR *xdrs;
-	register float *fp;
+	XDR *xdrs;
+	float *fp;
 {
 #ifdef IEEEFP
 	bool_t rv;
@@ -200,18 +200,18 @@ static struct dbl_limits {
 
 bool_t
 xdr_double(xdrs, dp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	double *dp;
 {
 #ifdef IEEEFP
-	register int32_t *i32p;
+	int32_t *i32p;
 	bool_t rv;
 	long tmpl;
 #else
-	register long *lp;
+	long *lp;
 	struct	ieee_double id;
 	struct	vax_double vd;
-	register struct dbl_limits *lim;
+	struct dbl_limits *lim;
 	int i;
 #endif
 
diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c
index a36f6939ff..64ff91ff1d 100644
--- a/lib/libc/xdr/xdr_mem.c
+++ b/lib/libc/xdr/xdr_mem.c
@@ -29,7 +29,7 @@
  * @(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro
  * @(#)xdr_mem.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr_mem.c,v 1.8.2.1 2003/03/20 12:59:55 jedgar Exp $
- * $DragonFly: src/lib/libc/xdr/xdr_mem.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libc/xdr/xdr_mem.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -88,7 +88,7 @@ static struct	xdr_ops xdrmem_ops_unaligned = {
  */
 void
 xdrmem_create(xdrs, addr, size, op)
-	register XDR *xdrs;
+	XDR *xdrs;
 	caddr_t addr;
 	u_int size;
 	enum xdr_op op;
@@ -110,7 +110,7 @@ xdrmem_destroy(/*xdrs*/)
 
 static bool_t
 xdrmem_getlong_aligned(xdrs, lp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	long *lp;
 {
 
@@ -124,7 +124,7 @@ xdrmem_getlong_aligned(xdrs, lp)
 
 static bool_t
 xdrmem_putlong_aligned(xdrs, lp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	long *lp;
 {
 
@@ -138,7 +138,7 @@ xdrmem_putlong_aligned(xdrs, lp)
 
 static bool_t
 xdrmem_getlong_unaligned(xdrs, lp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	long *lp;
 {
 	int32_t l;
@@ -154,7 +154,7 @@ xdrmem_getlong_unaligned(xdrs, lp)
 
 static bool_t
 xdrmem_putlong_unaligned(xdrs, lp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	long *lp;
 {
 	int32_t l;
@@ -170,9 +170,9 @@ xdrmem_putlong_unaligned(xdrs, lp)
 
 static bool_t
 xdrmem_getbytes(xdrs, addr, len)
-	register XDR *xdrs;
+	XDR *xdrs;
 	caddr_t addr;
-	register u_int len;
+	u_int len;
 {
 
 	if (xdrs->x_handy < len)
@@ -185,9 +185,9 @@ xdrmem_getbytes(xdrs, addr, len)
 
 static bool_t
 xdrmem_putbytes(xdrs, addr, len)
-	register XDR *xdrs;
+	XDR *xdrs;
 	caddr_t addr;
-	register u_int len;
+	u_int len;
 {
 
 	if (xdrs->x_handy < len)
@@ -200,7 +200,7 @@ xdrmem_putbytes(xdrs, addr, len)
 
 static u_int
 xdrmem_getpos(xdrs)
-	register XDR *xdrs;
+	XDR *xdrs;
 {
 
 	/* XXX w/64-bit pointers, u_int not enough! */
@@ -209,11 +209,11 @@ xdrmem_getpos(xdrs)
 
 static bool_t
 xdrmem_setpos(xdrs, pos)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_int pos;
 {
-	register caddr_t newaddr = xdrs->x_base + pos;
-	register caddr_t lastaddr = xdrs->x_private + xdrs->x_handy;
+	caddr_t newaddr = xdrs->x_base + pos;
+	caddr_t lastaddr = xdrs->x_private + xdrs->x_handy;
 
 	if (newaddr > lastaddr)
 		return (FALSE);
@@ -224,7 +224,7 @@ xdrmem_setpos(xdrs, pos)
 
 static int32_t *
 xdrmem_inline_aligned(xdrs, len)
-	register XDR *xdrs;
+	XDR *xdrs;
 	int len;
 {
 	int32_t *buf = 0;
@@ -239,7 +239,7 @@ xdrmem_inline_aligned(xdrs, len)
 
 static int32_t *
 xdrmem_inline_unaligned(xdrs, len)
-	register XDR *xdrs;
+	XDR *xdrs;
 	int len;
 {
 	
diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c
index 65dd50fce6..d5bc18da89 100644
--- a/lib/libc/xdr/xdr_rec.c
+++ b/lib/libc/xdr/xdr_rec.c
@@ -29,7 +29,7 @@
  * @(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro
  * @(#)xdr_rec.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr_rec.c,v 1.12 2000/01/19 06:12:32 wpaul Exp $
- * $DragonFly: src/lib/libc/xdr/xdr_rec.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $
+ * $DragonFly: src/lib/libc/xdr/xdr_rec.c,v 1.4 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -135,14 +135,14 @@ typedef struct rec_strm {
  */
 void
 xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit)
-	register XDR *xdrs;
-	register u_int sendsize;
-	register u_int recvsize;
+	XDR *xdrs;
+	u_int sendsize;
+	u_int recvsize;
 	caddr_t tcp_handle;
 	int (*readit)();  /* like read, but pass it a tcp_handle, not sock */
 	int (*writeit)();  /* like write, but pass it a tcp_handle, not sock */
 {
-	register RECSTREAM *rstrm =
+	RECSTREAM *rstrm =
 		(RECSTREAM *)mem_alloc(sizeof(RECSTREAM));
 
 	if (rstrm == NULL) {
@@ -198,8 +198,8 @@ xdrrec_getlong(xdrs, lp)
 	XDR *xdrs;
 	long *lp;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	register int32_t *buflp = (int32_t *)(rstrm->in_finger);
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	int32_t *buflp = (int32_t *)(rstrm->in_finger);
 	int32_t mylong;
 
 	/* first try the inline, fast case */
@@ -221,8 +221,8 @@ xdrrec_putlong(xdrs, lp)
 	XDR *xdrs;
 	long *lp;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	register int32_t *dest_lp = ((int32_t *)(rstrm->out_finger));
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	int32_t *dest_lp = ((int32_t *)(rstrm->out_finger));
 
 	if ((rstrm->out_finger += sizeof(int32_t)) > rstrm->out_boundry) {
 		/*
@@ -243,11 +243,11 @@ xdrrec_putlong(xdrs, lp)
 static bool_t  /* must manage buffers, fragments, and records */
 xdrrec_getbytes(xdrs, addr, len)
 	XDR *xdrs;
-	register caddr_t addr;
-	register u_int len;
+	caddr_t addr;
+	u_int len;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	register int current;
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	int current;
 
 	while (len > 0) {
 		current = rstrm->fbtbc;
@@ -271,11 +271,11 @@ xdrrec_getbytes(xdrs, addr, len)
 static bool_t
 xdrrec_putbytes(xdrs, addr, len)
 	XDR *xdrs;
-	register caddr_t addr;
-	register u_int len;
+	caddr_t addr;
+	u_int len;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	register long current;
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	long current;
 
 	while (len > 0) {
 		current = (u_long)rstrm->out_boundry -
@@ -296,10 +296,10 @@ xdrrec_putbytes(xdrs, addr, len)
 
 static u_int
 xdrrec_getpos(xdrs)
-	register XDR *xdrs;
+	XDR *xdrs;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-	register long pos;
+	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
+	long pos;
 
 	pos = lseek((int)(long)rstrm->tcp_handle, (off_t) 0, 1);
 	if (pos != -1)
@@ -322,10 +322,10 @@ xdrrec_getpos(xdrs)
 
 static bool_t
 xdrrec_setpos(xdrs, pos)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_int pos;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
+	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
 	u_int currpos = xdrrec_getpos(xdrs);
 	int delta = currpos - pos;
 	caddr_t newpos;
@@ -358,10 +358,10 @@ xdrrec_setpos(xdrs, pos)
 
 static int32_t *
 xdrrec_inline(xdrs, len)
-	register XDR *xdrs;
+	XDR *xdrs;
 	int len;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
+	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
 	int32_t * buf = NULL;
 
 	switch (xdrs->x_op) {
@@ -387,9 +387,9 @@ xdrrec_inline(xdrs, len)
 
 static void
 xdrrec_destroy(xdrs)
-	register XDR *xdrs;
+	XDR *xdrs;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
+	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
 
 	mem_free(rstrm->the_buffer,
 		rstrm->sendsize + rstrm->recvsize + BYTES_PER_XDR_UNIT);
@@ -409,7 +409,7 @@ bool_t
 xdrrec_skiprecord(xdrs)
 	XDR *xdrs;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
 
 	while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
 		if (! skip_input_bytes(rstrm, rstrm->fbtbc))
@@ -431,7 +431,7 @@ bool_t
 xdrrec_eof(xdrs)
 	XDR *xdrs;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
 
 	while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
 		if (! skip_input_bytes(rstrm, rstrm->fbtbc))
@@ -456,8 +456,8 @@ xdrrec_endofrecord(xdrs, sendnow)
 	XDR *xdrs;
 	bool_t sendnow;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	register u_long len;  /* fragment length */
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	u_long len;  /* fragment length */
 
 	if (sendnow || rstrm->frag_sent ||
 		((u_long)rstrm->out_finger + sizeof(u_int32_t) >=
@@ -479,11 +479,11 @@ xdrrec_endofrecord(xdrs, sendnow)
  */
 static bool_t
 flush_out(rstrm, eor)
-	register RECSTREAM *rstrm;
+	RECSTREAM *rstrm;
 	bool_t eor;
 {
-	register u_long eormask = (eor == TRUE) ? LAST_FRAG : 0;
-	register u_int32_t len = (u_long)(rstrm->out_finger) -
+	u_long eormask = (eor == TRUE) ? LAST_FRAG : 0;
+	u_int32_t len = (u_long)(rstrm->out_finger) -
 		(u_long)(rstrm->frag_header) - sizeof(u_int32_t);
 
 	*(rstrm->frag_header) = htonl(len | eormask);
@@ -498,11 +498,11 @@ flush_out(rstrm, eor)
 
 static bool_t  /* knows nothing about records!  Only about input buffers */
 fill_input_buf(rstrm)
-	register RECSTREAM *rstrm;
+	RECSTREAM *rstrm;
 {
-	register caddr_t where;
+	caddr_t where;
 	u_long i;
-	register long len;
+	long len;
 
 	where = rstrm->in_base;
 	i = (u_long)rstrm->in_boundry % BYTES_PER_XDR_UNIT;
@@ -518,11 +518,11 @@ fill_input_buf(rstrm)
 
 static bool_t  /* knows nothing about records!  Only about input buffers */
 get_input_bytes(rstrm, addr, len)
-	register RECSTREAM *rstrm;
-	register caddr_t addr;
-	register int len;
+	RECSTREAM *rstrm;
+	caddr_t addr;
+	int len;
 {
-	register long current;
+	long current;
 
 	while (len > 0) {
 		current = (long)rstrm->in_boundry - (long)rstrm->in_finger;
@@ -542,7 +542,7 @@ get_input_bytes(rstrm, addr, len)
 
 static bool_t  /* next two bytes of the input stream are treated as a header */
 set_input_fragment(rstrm)
-	register RECSTREAM *rstrm;
+	RECSTREAM *rstrm;
 {
 	u_int32_t header;
 
@@ -566,10 +566,10 @@ set_input_fragment(rstrm)
 
 static bool_t  /* consumes input bytes; knows nothing about records! */
 skip_input_bytes(rstrm, cnt)
-	register RECSTREAM *rstrm;
+	RECSTREAM *rstrm;
 	long cnt;
 {
-	register long current;
+	long current;
 
 	while (cnt > 0) {
 		current = (long)rstrm->in_boundry - (long)rstrm->in_finger;
@@ -587,7 +587,7 @@ skip_input_bytes(rstrm, cnt)
 
 static u_int
 fix_buf_size(s)
-	register u_int s;
+	u_int s;
 {
 
 	if (s < 100)
diff --git a/lib/libc/xdr/xdr_reference.c b/lib/libc/xdr/xdr_reference.c
index f15e572eae..d492eefa59 100644
--- a/lib/libc/xdr/xdr_reference.c
+++ b/lib/libc/xdr/xdr_reference.c
@@ -29,7 +29,7 @@
  * @(#)xdr_reference.c 1.11 87/08/11 SMI
  * @(#)xdr_reference.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr_reference.c,v 1.8 1999/08/28 00:02:56 peter Exp $
- * $DragonFly: src/lib/libc/xdr/xdr_reference.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libc/xdr/xdr_reference.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -60,13 +60,13 @@
  */
 bool_t
 xdr_reference(xdrs, pp, size, proc)
-	register XDR *xdrs;
+	XDR *xdrs;
 	caddr_t *pp;		/* the pointer to work on */
 	u_int size;		/* size of the object pointed to */
 	xdrproc_t proc;		/* xdr routine to handle the object */
 {
-	register caddr_t loc = *pp;
-	register bool_t stat;
+	caddr_t loc = *pp;
+	bool_t stat;
 
 	if (loc == NULL)
 		switch (xdrs->x_op) {
@@ -115,7 +115,7 @@ xdr_reference(xdrs, pp, size, proc)
  */
 bool_t
 xdr_pointer(xdrs,objpp,obj_size,xdr_obj)
-	register XDR *xdrs;
+	XDR *xdrs;
 	char **objpp;
 	u_int obj_size;
 	xdrproc_t xdr_obj;
diff --git a/lib/libc/xdr/xdr_stdio.c b/lib/libc/xdr/xdr_stdio.c
index de69afd69a..e1768b6cc6 100644
--- a/lib/libc/xdr/xdr_stdio.c
+++ b/lib/libc/xdr/xdr_stdio.c
@@ -29,7 +29,7 @@
  * @(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro
  * @(#)xdr_stdio.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr_stdio.c,v 1.7 1999/08/28 00:02:56 peter Exp $
- * $DragonFly: src/lib/libc/xdr/xdr_stdio.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libc/xdr/xdr_stdio.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -76,7 +76,7 @@ static struct xdr_ops	xdrstdio_ops = {
  */
 void
 xdrstdio_create(xdrs, file, op)
-	register XDR *xdrs;
+	XDR *xdrs;
 	FILE *file;
 	enum xdr_op op;
 {
@@ -94,7 +94,7 @@ xdrstdio_create(xdrs, file, op)
  */
 static void
 xdrstdio_destroy(xdrs)
-	register XDR *xdrs;
+	XDR *xdrs;
 {
 	(void)fflush((FILE *)xdrs->x_private);
 	/* xx should we close the file ?? */
@@ -103,7 +103,7 @@ xdrstdio_destroy(xdrs)
 static bool_t
 xdrstdio_getlong(xdrs, lp)
 	XDR *xdrs;
-	register long *lp;
+	long *lp;
 {
 
 	if (fread((caddr_t)lp, sizeof(int32_t), 1,
diff --git a/lib/libcompat/4.3/insque.c b/lib/libcompat/4.3/insque.c
index d0d7ebe653..3c5a83f12b 100644
--- a/lib/libcompat/4.3/insque.c
+++ b/lib/libcompat/4.3/insque.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)insque.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcompat/4.3/insque.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -46,7 +47,7 @@ struct vaxque {		/* queue format expected by VAX queue instructions */
 
 void
 insque(e, prev)
-	register struct vaxque *e, *prev;
+	struct vaxque *e, *prev;
 {
 	e->vq_prev = prev;
 	e->vq_next = prev->vq_next;
diff --git a/lib/libcompat/4.3/lsearch.c b/lib/libcompat/4.3/lsearch.c
index 3a23bf37cc..7cd88f73e5 100644
--- a/lib/libcompat/4.3/lsearch.c
+++ b/lib/libcompat/4.3/lsearch.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)lsearch.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcompat/4.3/Attic/lsearch.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -66,7 +67,7 @@ linear_base(key, base, nelp, width, compar, add_flag)
 	u_int *nelp, width;
 	int (*compar)(), add_flag;
 {
-	register char *element, *end;
+	char *element, *end;
 
 	end = base + *nelp * width;
 	for (element = base; element < end; element += width)
diff --git a/lib/libcompat/4.3/remque.c b/lib/libcompat/4.3/remque.c
index e695068ac7..a395e22f5c 100644
--- a/lib/libcompat/4.3/remque.c
+++ b/lib/libcompat/4.3/remque.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)remque.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcompat/4.3/remque.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /*
@@ -46,7 +47,7 @@ struct vaxque {		/* queue format expected by VAX queue instructions */
 
 void
 remque(e)
-	register struct vaxque *e;
+	struct vaxque *e;
 {
 	e->vq_prev->vq_next = e->vq_next;
 	e->vq_next->vq_prev = e->vq_prev;
diff --git a/lib/libcompat/4.4/cuserid.c b/lib/libcompat/4.4/cuserid.c
index 10600a4127..6ce6a3c0f3 100644
--- a/lib/libcompat/4.4/cuserid.c
+++ b/lib/libcompat/4.4/cuserid.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)cuserid.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcompat/4.4/cuserid.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <pwd.h>
@@ -42,7 +43,7 @@ char *
 cuserid(s)
 	char *s;
 {
-	register struct passwd *pwd;
+	struct passwd *pwd;
 
 	if ((pwd = getpwuid(geteuid())) == NULL) {
 		if (s)
diff --git a/lib/libcompat/regexp/regexp.c b/lib/libcompat/regexp/regexp.c
index fc97378f75..3bc388bec4 100644
--- a/lib/libcompat/regexp/regexp.c
+++ b/lib/libcompat/regexp/regexp.c
@@ -1,3 +1,4 @@
+/* $DragonFly: src/lib/libcompat/regexp/regexp.c,v 1.2 2004/10/25 19:38:02 drhodus Exp $								*/
 /*
  * regcomp and regexec -- regsub and regerror are elsewhere
  *
@@ -205,10 +206,10 @@ regexp *
 regcomp(exp)
 const char *exp;
 {
-	register regexp *r;
-	register char *scan;
-	register char *longest;
-	register int len;
+	regexp *r;
+	char *scan;
+	char *longest;
+	int len;
 	int flags;
 
 	if (exp == NULL)
@@ -296,10 +297,10 @@ reg(paren, flagp)
 int paren;			/* Parenthesized? */
 int *flagp;
 {
-	register char *ret;
-	register char *br;
-	register char *ender;
-	register int parno;
+	char *ret;
+	char *br;
+	char *ender;
+	int parno;
 	int flags;
 
 	*flagp = HASWIDTH;	/* Tentatively. */
@@ -367,9 +368,9 @@ static char *
 regbranch(flagp)
 int *flagp;
 {
-	register char *ret;
-	register char *chain;
-	register char *latest;
+	char *ret;
+	char *chain;
+	char *latest;
 	int flags;
 
 	*flagp = WORST;		/* Tentatively. */
@@ -407,9 +408,9 @@ static char *
 regpiece(flagp)
 int *flagp;
 {
-	register char *ret;
-	register char op;
-	register char *next;
+	char *ret;
+	char op;
+	char *next;
 	int flags;
 
 	ret = regatom(&flags);
@@ -471,7 +472,7 @@ static char *
 regatom(flagp)
 int *flagp;
 {
-	register char *ret;
+	char *ret;
 	int flags;
 
 	*flagp = WORST;		/* Tentatively. */
@@ -489,8 +490,8 @@ int *flagp;
 		*flagp |= HASWIDTH|SIMPLE;
 		break;
 	case '[': {
-			register int class;
-			register int classend;
+			int class;
+			int classend;
 			int i;
 
 			if (*regparse == '^') {	/* Complement of range. */
@@ -597,7 +598,7 @@ int *flagp;
 		 */
 		{
 			char *regprev;
-			register char ch;
+			char ch;
 
 			regparse--;			/* Look at cur char */
 			ret = regnode(EXACTLY);
@@ -661,8 +662,8 @@ static char *			/* Location. */
 regnode(op)
 char op;
 {
-	register char *ret;
-	register char *ptr;
+	char *ret;
+	char *ptr;
 
 	ret = regcode;
 	if (ret == &regdummy) {
@@ -702,9 +703,9 @@ reginsert(op, opnd)
 char op;
 char *opnd;
 {
-	register char *src;
-	register char *dst;
-	register char *place;
+	char *src;
+	char *dst;
+	char *place;
 
 	if (regcode == &regdummy) {
 		regsize += 3;
@@ -731,9 +732,9 @@ regtail(p, val)
 char *p;
 char *val;
 {
-	register char *scan;
-	register char *temp;
-	register int offset;
+	char *scan;
+	char *temp;
+	int offset;
 
 	if (p == &regdummy)
 		return;
@@ -799,10 +800,10 @@ STATIC char *regprop();
  */
 int
 regexec(prog, string)
-register const regexp *prog;
-register const char *string;
+const regexp *prog;
+const char *string;
 {
-	register char *s;
+	char *s;
 	extern char *strchr();
 
 	/* Be paranoid... */
@@ -864,9 +865,9 @@ regtry(prog, string)
 regexp *prog;
 char *string;
 {
-	register int i;
-	register char **sp;
-	register char **ep;
+	int i;
+	char **sp;
+	char **ep;
 
 	reginput = string;
 	regstartp = prog->startp;
@@ -900,7 +901,7 @@ static int			/* 0 failure, 1 success */
 regmatch(prog)
 char *prog;
 {
-	register char *scan;	/* Current node. */
+	char *scan;	/* Current node. */
 	char *next;		/* Next node. */
 
 	scan = prog;
@@ -945,8 +946,8 @@ char *prog;
 			reginput++;
 			break;
 		case EXACTLY: {
-				register int len;
-				register char *opnd;
+				int len;
+				char *opnd;
 
 				opnd = OPERAND(scan);
 				/* Inline the first character, for speed. */
@@ -981,8 +982,8 @@ char *prog;
 		case OPEN+7:
 		case OPEN+8:
 		case OPEN+9: {
-				register int no;
-				register char *save;
+				int no;
+				char *save;
 
 				no = OP(scan) - OPEN;
 				save = reginput;
@@ -1009,8 +1010,8 @@ char *prog;
 		case CLOSE+7:
 		case CLOSE+8:
 		case CLOSE+9: {
-				register int no;
-				register char *save;
+				int no;
+				char *save;
 
 				no = OP(scan) - CLOSE;
 				save = reginput;
@@ -1029,7 +1030,7 @@ char *prog;
 			}
 			break;
 		case BRANCH: {
-				register char *save;
+				char *save;
 
 				if (OP(next) != BRANCH)		/* No choice. */
 					next = OPERAND(scan);	/* Avoid recursion. */
@@ -1048,10 +1049,10 @@ char *prog;
 			break;
 		case STAR:
 		case PLUS: {
-				register char nextch;
-				register int no;
-				register char *save;
-				register int min;
+				char nextch;
+				int no;
+				char *save;
+				int min;
 
 				/*
 				 * Lookahead to avoid useless match attempts
@@ -1102,9 +1103,9 @@ static int
 regrepeat(p)
 char *p;
 {
-	register int count = 0;
-	register char *scan;
-	register char *opnd;
+	int count = 0;
+	char *scan;
+	char *opnd;
 
 	scan = reginput;
 	opnd = OPERAND(p);
@@ -1146,9 +1147,9 @@ char *p;
  */
 static char *
 regnext(p)
-register char *p;
+char *p;
 {
-	register int offset;
+	int offset;
 
 	if (p == &regdummy)
 		return(NULL);
@@ -1174,9 +1175,9 @@ void
 regdump(r)
 regexp *r;
 {
-	register char *s;
-	register char op = EXACTLY;	/* Arbitrary non-END op. */
-	register char *next;
+	char *s;
+	char op = EXACTLY;	/* Arbitrary non-END op. */
+	char *next;
 	extern char *strchr();
 
 
@@ -1218,7 +1219,7 @@ static char *
 regprop(op)
 char *op;
 {
-	register char *p;
+	char *p;
 	static char buf[50];
 
 	(void) strcpy(buf, ":");
@@ -1317,9 +1318,9 @@ strcspn(s1, s2)
 char *s1;
 char *s2;
 {
-	register char *scan1;
-	register char *scan2;
-	register int count;
+	char *scan1;
+	char *scan2;
+	int count;
 
 	count = 0;
 	for (scan1 = s1; *scan1 != '\0'; scan1++) {
diff --git a/lib/libcompat/regexp/regsub.c b/lib/libcompat/regexp/regsub.c
index e55b9b624d..57b9eb0fcb 100644
--- a/lib/libcompat/regexp/regsub.c
+++ b/lib/libcompat/regexp/regsub.c
@@ -1,3 +1,4 @@
+/* $DragonFly: src/lib/libcompat/regexp/regsub.c,v 1.2 2004/10/25 19:38:02 drhodus Exp $								*/
 /*
  * regsub
  *
@@ -38,11 +39,11 @@ const regexp *prog;
 const char *source;
 char *dest;
 {
-	register char *src;
-	register char *dst;
-	register char c;
-	register int no;
-	register int len;
+	char *src;
+	char *dst;
+	char c;
+	int no;
+	int len;
 	extern char *strncpy();
 
 	if (prog == NULL || source == NULL || dest == NULL) {
diff --git a/lib/libcr/alpha/gen/isinf.c b/lib/libcr/alpha/gen/isinf.c
index 9e1a5472be..0a64852df1 100644
--- a/lib/libcr/alpha/gen/isinf.c
+++ b/lib/libcr/alpha/gen/isinf.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: isinf.c,v 1.1 1995/02/10 17:50:23 cgd Exp $	*/
 /* $FreeBSD: src/lib/libc/alpha/gen/isinf.c,v 1.1.1.1.6.1 2000/08/21 21:09:29 jhb Exp $ */
-/* $DragonFly: src/lib/libcr/alpha/gen/Attic/isinf.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ */
+/* $DragonFly: src/lib/libcr/alpha/gen/Attic/isinf.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -37,7 +37,7 @@ int
 isnan(d)
 	double d;
 {
-	register struct ieee_double *p = (struct ieee_double *)&d;
+	struct ieee_double *p = (struct ieee_double *)&d;
 
 	return (p->dbl_exp == DBL_EXP_INFNAN &&
 	    (p->dbl_frach || p->dbl_fracl));
@@ -47,7 +47,7 @@ int
 isinf(d)
 	double d;
 {
-	register struct ieee_double *p = (struct ieee_double *)&d;
+	struct ieee_double *p = (struct ieee_double *)&d;
 
 	return (p->dbl_exp == DBL_EXP_INFNAN &&
 	    !p->dbl_frach && !p->dbl_fracl);
diff --git a/lib/libcr/alpha/gen/ldexp.c b/lib/libcr/alpha/gen/ldexp.c
index b207c9fd1f..29c808b70b 100644
--- a/lib/libcr/alpha/gen/ldexp.c
+++ b/lib/libcr/alpha/gen/ldexp.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: ldexp.c,v 1.1 1995/02/10 17:50:24 cgd Exp $	*/
 /* $FreeBSD: src/lib/libc/alpha/gen/ldexp.c,v 1.1.1.1.6.1 2000/08/21 21:09:29 jhb Exp $ */
-/* $DragonFly: src/lib/libcr/alpha/gen/Attic/ldexp.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ */
+/* $DragonFly: src/lib/libcr/alpha/gen/Attic/ldexp.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -43,7 +43,7 @@ ldexp(val, exp)
 	double val;
 	int exp;
 {
-	register int oldexp, newexp, mulexp;
+	int oldexp, newexp, mulexp;
 	union doub {
 		double v;
 		struct ieee_double s;
diff --git a/lib/libcr/amd64/gen/isinf.c b/lib/libcr/amd64/gen/isinf.c
index faac5408b2..5638a6c0b7 100644
--- a/lib/libcr/amd64/gen/isinf.c
+++ b/lib/libcr/amd64/gen/isinf.c
@@ -32,10 +32,11 @@
  *
  * @(#)isinf.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/amd64/gen/isinf.c,v 1.10 2003/02/12 20:03:41 mike Exp $
- * $DragonFly: src/lib/libcr/amd64/gen/Attic/isinf.c,v 1.1 2004/03/13 19:46:55 eirikn Exp $
+ * $DragonFly: src/lib/libcr/amd64/gen/Attic/isinf.c,v 1.2 2004/10/25 19:38:02 drhodus Exp $
  */
 
 /* For binary compat; to be removed in FreeBSD 6.0. */
+/* XXX: What about in DragonFlyBSD ? */
 
 #include <sys/types.h>
 
@@ -43,7 +44,7 @@ int
 isnan(d)
 	double d;
 {
-	register struct IEEEdp {
+	struct IEEEdp {
 		u_int manl : 32;
 		u_int manh : 20;
 		u_int  exp : 11;
@@ -57,7 +58,7 @@ int
 isinf(d)
 	double d;
 {
-	register struct IEEEdp {
+	struct IEEEdp {
 		u_int manl : 32;
 		u_int manh : 20;
 		u_int  exp : 11;
diff --git a/lib/libcr/db/btree/bt_utils.c b/lib/libcr/db/btree/bt_utils.c
index 67980df98d..5cedbe4e21 100644
--- a/lib/libcr/db/btree/bt_utils.c
+++ b/lib/libcr/db/btree/bt_utils.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)bt_utils.c	8.8 (Berkeley) 7/20/94
+ * $DragonFly: src/lib/libcr/db/btree/Attic/bt_utils.c,v 1.3 2004/10/25 19:38:02 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -214,8 +215,8 @@ int
 __bt_defcmp(a, b)
 	const DBT *a, *b;
 {
-	register size_t len;
-	register u_char *p1, *p2;
+	size_t len;
+	u_char *p1, *p2;
 
 	/*
 	 * XXX
@@ -244,8 +245,8 @@ size_t
 __bt_defpfx(a, b)
 	const DBT *a, *b;
 {
-	register u_char *p1, *p2;
-	register size_t cnt, len;
+	u_char *p1, *p2;
+	size_t cnt, len;
 
 	cnt = 1;
 	len = MIN(a->size, b->size);
diff --git a/lib/libcr/db/hash/hash.c b/lib/libcr/db/hash/hash.c
index fa0af9e99c..32ccd0da31 100644
--- a/lib/libcr/db/hash/hash.c
+++ b/lib/libcr/db/hash/hash.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/db/hash/hash.c,v 1.8 2000/01/27 23:06:08 jasone Exp $
- * $DragonFly: src/lib/libcr/db/hash/Attic/hash.c,v 1.3 2003/11/12 20:21:26 eirikn Exp $
+ * $DragonFly: src/lib/libcr/db/hash/Attic/hash.c,v 1.4 2004/10/25 19:38:03 drhodus Exp $
  *
  * @(#)hash.c	8.9 (Berkeley) 6/16/94
  */
@@ -355,7 +355,7 @@ init_htab(hashp, nelem)
 	HTAB *hashp;
 	int nelem;
 {
-	register int nbuckets, nsegs;
+	int nbuckets, nsegs;
 	int l2;
 
 	/*
@@ -601,11 +601,11 @@ hash_access(hashp, action, key, val)
 	ACTION action;
 	DBT *key, *val;
 {
-	register BUFHEAD *rbufp;
+	BUFHEAD *rbufp;
 	BUFHEAD *bufp, *save_bufp;
-	register u_int16_t *bp;
-	register int n, ndx, off, size;
-	register char *kp;
+	u_int16_t *bp;
+	int n, ndx, off, size;
+	char *kp;
 	u_int16_t pageno;
 
 #ifdef HASH_STATISTICS
@@ -730,8 +730,8 @@ hash_seq(dbp, key, data, flag)
 	DBT *key, *data;
 	u_int32_t flag;
 {
-	register u_int32_t bucket;
-	register BUFHEAD *bufp;
+	u_int32_t bucket;
+	BUFHEAD *bufp;
 	HTAB *hashp;
 	u_int16_t *bp, ndx;
 
@@ -874,7 +874,7 @@ hash_realloc(p_ptr, oldsize, newsize)
 	SEGMENT **p_ptr;
 	int oldsize, newsize;
 {
-	register void *p;
+	void *p;
 
 	if ( (p = malloc(newsize)) ) {
 		memmove(p, *p_ptr, oldsize);
@@ -910,8 +910,8 @@ alloc_segs(hashp, nsegs)
 	HTAB *hashp;
 	int nsegs;
 {
-	register int i;
-	register SEGMENT store;
+	int i;
+	SEGMENT store;
 
 	int save_errno;
 
diff --git a/lib/libcr/db/hash/hash_bigkey.c b/lib/libcr/db/hash/hash_bigkey.c
index ec7aa103c0..07089bc922 100644
--- a/lib/libcr/db/hash/hash_bigkey.c
+++ b/lib/libcr/db/hash/hash_bigkey.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94
- * $DragonFly: src/lib/libcr/db/hash/Attic/hash_bigkey.c,v 1.4 2003/11/12 20:21:26 eirikn Exp $
+ * $DragonFly: src/lib/libcr/db/hash/Attic/hash_bigkey.c,v 1.5 2004/10/25 19:38:03 drhodus Exp $
  */
 
 /*
@@ -89,7 +89,7 @@ __big_insert(hashp, bufp, key, val)
 	BUFHEAD *bufp;
 	const DBT *key, *val;
 {
-	register u_int16_t *p;
+	u_int16_t *p;
 	int key_size, n, val_size;
 	u_int16_t space, move_bytes, off;
 	char *cp, *key_data, *val_data;
@@ -187,7 +187,7 @@ __big_delete(hashp, bufp)
 	HTAB *hashp;
 	BUFHEAD *bufp;
 {
-	register BUFHEAD *last_bfp, *rbufp;
+	BUFHEAD *last_bfp, *rbufp;
 	u_int16_t *bp, pageno;
 	int key_done, n;
 
@@ -269,8 +269,8 @@ __find_bigpair(hashp, bufp, ndx, key, size)
 	char *key;
 	int size;
 {
-	register u_int16_t *bp;
-	register char *p;
+	u_int16_t *bp;
+	char *p;
 	int ksize;
 	u_int16_t bytes;
 	char *kkey;
@@ -451,8 +451,8 @@ collect_data(hashp, bufp, len, set)
 	BUFHEAD *bufp;
 	int len, set;
 {
-	register u_int16_t *bp;
-	register char *p;
+	u_int16_t *bp;
+	char *p;
 	BUFHEAD *xbp;
 	u_int16_t save_addr;
 	int mylen, totlen;
@@ -575,8 +575,8 @@ __big_split(hashp, op, np, big_keyp, addr, obucket, ret)
 	u_int32_t   obucket;/* Old Bucket */
 	SPLIT_RETURN *ret;
 {
-	register BUFHEAD *tmpp;
-	register u_int16_t *tp;
+	BUFHEAD *tmpp;
+	u_int16_t *tp;
 	BUFHEAD *bp;
 	DBT key, val;
 	u_int32_t change;
diff --git a/lib/libcr/db/hash/hash_buf.c b/lib/libcr/db/hash/hash_buf.c
index 18fd5e5cc9..456eaa1b58 100644
--- a/lib/libcr/db/hash/hash_buf.c
+++ b/lib/libcr/db/hash/hash_buf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/db/hash/hash_buf.c,v 1.4.8.1 2001/03/05 07:38:05 obrien Exp $
- * $DragonFly: src/lib/libcr/db/hash/Attic/hash_buf.c,v 1.3 2003/11/12 20:21:26 eirikn Exp $
+ * $DragonFly: src/lib/libcr/db/hash/Attic/hash_buf.c,v 1.4 2004/10/25 19:38:03 drhodus Exp $
  *
  * @(#)hash_buf.c	8.5 (Berkeley) 7/15/94
  */
@@ -108,9 +108,9 @@ __get_buf(hashp, addr, prev_bp, newpage)
 	BUFHEAD *prev_bp;
 	int newpage;	/* If prev_bp set, indicates a new overflow page. */
 {
-	register BUFHEAD *bp;
-	register u_int32_t is_disk_mask;
-	register int is_disk, segment_ndx;
+	BUFHEAD *bp;
+	u_int32_t is_disk_mask;
+	int is_disk, segment_ndx;
 	SEGMENT segp;
 
 	is_disk = 0;
@@ -162,9 +162,9 @@ newbuf(hashp, addr, prev_bp)
 	u_int32_t addr;
 	BUFHEAD *prev_bp;
 {
-	register BUFHEAD *bp;		/* The buffer we're going to use */
-	register BUFHEAD *xbp;		/* Temp pointer */
-	register BUFHEAD *next_xbp;
+	BUFHEAD *bp;		/* The buffer we're going to use */
+	BUFHEAD *xbp;		/* Temp pointer */
+	BUFHEAD *next_xbp;
 	SEGMENT segp;
 	int segment_ndx;
 	u_int16_t oaddr, *shortp;
diff --git a/lib/libcr/db/hash/hash_func.c b/lib/libcr/db/hash/hash_func.c
index 2cd57059fe..c47390241b 100644
--- a/lib/libcr/db/hash/hash_func.c
+++ b/lib/libcr/db/hash/hash_func.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)hash_func.c	8.2 (Berkeley) 2/21/94
- * $DragonFly: src/lib/libcr/db/hash/Attic/hash_func.c,v 1.4 2003/11/12 20:21:26 eirikn Exp $
+ * $DragonFly: src/lib/libcr/db/hash/Attic/hash_func.c,v 1.5 2004/10/25 19:38:03 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -67,10 +67,10 @@ u_int32_t (*__default_hash) (const void *, size_t) = hash4;
 static u_int32_t
 hash1(keyarg, len)
 	const void *keyarg;
-	register size_t len;
+	size_t len;
 {
-	register const u_char *key;
-	register u_int32_t h;
+	const u_char *key;
+	u_int32_t h;
 
 	/* Convert string to integer */
 	for (key = keyarg, h = 0; len--;)
@@ -89,9 +89,9 @@ hash2(keyarg, len)
 	const void *keyarg;
 	size_t len;
 {
-	register const u_char *e, *key;
-	register u_int32_t h;
-	register u_char c;
+	const u_char *e, *key;
+	u_int32_t h;
+	u_char c;
 
 	key = keyarg;
 	e = key + len;
@@ -116,11 +116,11 @@ hash2(keyarg, len)
 static u_int32_t
 hash3(keyarg, len)
 	const void *keyarg;
-	register size_t len;
+	size_t len;
 {
-	register const u_char *key;
-	register size_t loop;
-	register u_int32_t h;
+	const u_char *key;
+	size_t loop;
+	u_int32_t h;
 
 #define HASHC   h = *key++ + 65599 * h
 
@@ -164,11 +164,11 @@ hash3(keyarg, len)
 static u_int32_t
 hash4(keyarg, len)
 	const void *keyarg;
-	register size_t len;
+	size_t len;
 {
-	register const u_char *key;
-	register size_t loop;
-	register u_int32_t h;
+	const u_char *key;
+	size_t loop;
+	u_int32_t h;
 
 #define HASH4a   h = (h << 5) - h + *key++;
 #define HASH4b   h = (h << 5) + h + *key++;
diff --git a/lib/libcr/db/hash/hash_log2.c b/lib/libcr/db/hash/hash_log2.c
index 473a7eecb2..1736f15666 100644
--- a/lib/libcr/db/hash/hash_log2.c
+++ b/lib/libcr/db/hash/hash_log2.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)hash_log2.c	8.2 (Berkeley) 5/31/94
+ * $DragonFly: src/lib/libcr/db/hash/Attic/hash_log2.c,v 1.3 2004/10/25 19:38:03 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -44,7 +45,7 @@ u_int32_t
 __log2(num)
 	u_int32_t num;
 {
-	register u_int32_t i, limit;
+	u_int32_t i, limit;
 
 	limit = 1;
 	for (i = 0; limit < num; limit = limit << 1, i++);
diff --git a/lib/libcr/db/hash/hash_page.c b/lib/libcr/db/hash/hash_page.c
index 3f24095ae5..3fde438309 100644
--- a/lib/libcr/db/hash/hash_page.c
+++ b/lib/libcr/db/hash/hash_page.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/db/hash/hash_page.c,v 1.5 2000/01/27 23:06:08 jasone Exp $
- * $DragonFly: src/lib/libcr/db/hash/Attic/hash_page.c,v 1.3 2003/11/12 20:21:26 eirikn Exp $
+ * $DragonFly: src/lib/libcr/db/hash/Attic/hash_page.c,v 1.4 2004/10/25 19:38:03 drhodus Exp $
  *
  * @(#)hash_page.c	8.7 (Berkeley) 8/16/94
  */
@@ -98,7 +98,7 @@ putpair(p, key, val)
 	char *p;
 	const DBT *key, *val;
 {
-	register u_int16_t *bp, n, off;
+	u_int16_t *bp, n, off;
 
 	bp = (u_int16_t *)p;
 
@@ -129,10 +129,10 @@ extern int
 __delpair(hashp, bufp, ndx)
 	HTAB *hashp;
 	BUFHEAD *bufp;
-	register int ndx;
+	int ndx;
 {
-	register u_int16_t *bp, newoff;
-	register int n;
+	u_int16_t *bp, newoff;
+	int n;
 	u_int16_t pairlen;
 
 	bp = (u_int16_t *)bufp->page;
@@ -148,9 +148,9 @@ __delpair(hashp, bufp, ndx)
 
 	if (ndx != (n - 1)) {
 		/* Hard Case -- need to shuffle keys */
-		register int i;
-		register char *src = bufp->page + (int)OFFSET(bp);
-		register char *dst = src + (int)pairlen;
+		int i;
+		char *src = bufp->page + (int)OFFSET(bp);
+		char *dst = src + (int)pairlen;
 		memmove(dst, src, bp[ndx + 1] - OFFSET(bp));
 
 		/* Now adjust the pointers */
@@ -183,9 +183,9 @@ __split_page(hashp, obucket, nbucket)
 	HTAB *hashp;
 	u_int32_t obucket, nbucket;
 {
-	register BUFHEAD *new_bufp, *old_bufp;
-	register u_int16_t *ino;
-	register char *np;
+	BUFHEAD *new_bufp, *old_bufp;
+	u_int16_t *ino;
+	char *np;
 	DBT key, val;
 	int n, ndx, retval;
 	u_int16_t copyto, diff, off, moved;
@@ -282,10 +282,10 @@ ugly_split(hashp, obucket, old_bufp, new_bufp, copyto, moved)
 	int copyto;	/* First byte on page which contains key/data values. */
 	int moved;	/* Number of pairs moved to new page. */
 {
-	register BUFHEAD *bufp;	/* Buffer header for ino */
-	register u_int16_t *ino;	/* Page keys come off of */
-	register u_int16_t *np;	/* New page */
-	register u_int16_t *op;	/* Page keys go on to if they aren't moving */
+	BUFHEAD *bufp;	/* Buffer header for ino */
+	u_int16_t *ino;	/* Page keys come off of */
+	u_int16_t *np;	/* New page */
+	u_int16_t *op;	/* Page keys go on to if they aren't moving */
 
 	BUFHEAD *last_bfp;	/* Last buf header OVFL needing to be freed */
 	DBT key, val;
@@ -401,7 +401,7 @@ __addel(hashp, bufp, key, val)
 	BUFHEAD *bufp;
 	const DBT *key, *val;
 {
-	register u_int16_t *bp, *sop;
+	u_int16_t *bp, *sop;
 	int do_expand;
 
 	bp = (u_int16_t *)bufp->page;
@@ -467,7 +467,7 @@ __add_ovflpage(hashp, bufp)
 	HTAB *hashp;
 	BUFHEAD *bufp;
 {
-	register u_int16_t *sp;
+	u_int16_t *sp;
 	u_int16_t ndx, ovfl_num;
 #ifdef DEBUG1
 	int tmp1, tmp2;
@@ -522,7 +522,7 @@ __get_page(hashp, p, bucket, is_bucket, is_disk, is_bitmap)
 	u_int32_t bucket;
 	int is_bucket, is_disk, is_bitmap;
 {
-	register int fd, page, size;
+	int fd, page, size;
 	int rsize;
 	u_int16_t *bp;
 
@@ -552,7 +552,7 @@ __get_page(hashp, p, bucket, is_bucket, is_disk, is_bitmap)
 		PAGE_INIT(p);
 	} else
 		if (hashp->LORDER != BYTE_ORDER) {
-			register int i, max;
+			int i, max;
 
 			if (is_bitmap) {
 				max = hashp->BSIZE >> 2; /* divide by 4 */
@@ -582,7 +582,7 @@ __put_page(hashp, p, bucket, is_bucket, is_bitmap)
 	u_int32_t bucket;
 	int is_bucket, is_bitmap;
 {
-	register int fd, page, size;
+	int fd, page, size;
 	int wsize;
 
 	size = hashp->BSIZE;
@@ -591,8 +591,8 @@ __put_page(hashp, p, bucket, is_bucket, is_bitmap)
 	fd = hashp->fp;
 
 	if (hashp->LORDER != BYTE_ORDER) {
-		register int i;
-		register int max;
+		int i;
+		int max;
 
 		if (is_bitmap) {
 			max = hashp->BSIZE >> 2;	/* divide by 4 */
@@ -651,7 +651,7 @@ static u_int32_t
 first_free(map)
 	u_int32_t map;
 {
-	register u_int32_t i, mask;
+	u_int32_t i, mask;
 
 	mask = 0x1;
 	for (i = 0; i < BITS_PER_MAP; i++) {
@@ -666,8 +666,8 @@ static u_int16_t
 overflow_page(hashp)
 	HTAB *hashp;
 {
-	register u_int32_t *freep;
-	register int max_free, offset, splitnum;
+	u_int32_t *freep;
+	int max_free, offset, splitnum;
 	u_int16_t addr;
 	int bit, first_page, free_bit, free_page, i, in_use_bits, j;
 #ifdef DEBUG2
@@ -815,7 +815,7 @@ __free_ovflpage(hashp, obufp)
 	HTAB *hashp;
 	BUFHEAD *obufp;
 {
-	register u_int16_t addr;
+	u_int16_t addr;
 	u_int32_t *freep;
 	int bit_address, free_page, free_bit;
 	u_int16_t ndx;
@@ -883,7 +883,7 @@ squeeze_key(sp, key, val)
 	u_int16_t *sp;
 	const DBT *key, *val;
 {
-	register char *p;
+	char *p;
 	u_int16_t free_space, n, off, pageno;
 
 	p = (char *)sp;
diff --git a/lib/libcr/db/recno/rec_search.c b/lib/libcr/db/recno/rec_search.c
index 97d6274333..be40686a51 100644
--- a/lib/libcr/db/recno/rec_search.c
+++ b/lib/libcr/db/recno/rec_search.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)rec_search.c	8.4 (Berkeley) 7/14/94
- * $DragonFly: src/lib/libcr/db/recno/Attic/rec_search.c,v 1.2 2003/06/17 04:26:42 dillon Exp $
+ * $DragonFly: src/lib/libcr/db/recno/Attic/rec_search.c,v 1.3 2004/10/25 19:38:24 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -65,8 +65,8 @@ __rec_search(t, recno, op)
 	recno_t recno;
 	enum SRCHOP op;
 {
-	register indx_t index;
-	register PAGE *h;
+	indx_t index;
+	PAGE *h;
 	EPGNO *parent;
 	RINTERNAL *r;
 	pgno_t pg;
diff --git a/lib/libcr/db/test/btree.tests/main.c b/lib/libcr/db/test/btree.tests/main.c
index f76f066b5e..34c3aace6f 100644
--- a/lib/libcr/db/test/btree.tests/main.c
+++ b/lib/libcr/db/test/btree.tests/main.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)main.c	8.1 (Berkeley) 6/4/93
- * $DragonFly: src/lib/libcr/db/test/btree.tests/Attic/main.c,v 1.4 2003/11/12 20:21:27 eirikn Exp $
+ * $DragonFly: src/lib/libcr/db/test/btree.tests/Attic/main.c,v 1.5 2004/10/25 19:38:24 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -607,7 +607,7 @@ load(db, argv)
 	DB *db;
 	char **argv;
 {
-	register char *p, *t;
+	char *p, *t;
 	FILE *fp;
 	DBT data, key;
 	recno_t cnt;
diff --git a/lib/libcr/db/test/dbtest.c b/lib/libcr/db/test/dbtest.c
index 073293029c..f0e8386491 100644
--- a/lib/libcr/db/test/dbtest.c
+++ b/lib/libcr/db/test/dbtest.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)dbtest.c	8.17 (Berkeley) 9/1/94
  * $FreeBSD: src/lib/libc/db/test/dbtest.c,v 1.3.8.1 2000/08/21 22:44:47 jhb Exp $
- * $DragonFly: src/lib/libcr/db/test/Attic/dbtest.c,v 1.4 2004/07/27 10:20:21 asmodai Exp $
+ * $DragonFly: src/lib/libcr/db/test/Attic/dbtest.c,v 1.5 2004/10/25 19:38:24 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -335,8 +335,8 @@ void
 compare(db1, db2)
 	DBT *db1, *db2;
 {
-	register size_t len;
-	register u_char *p1, *p2;
+	size_t len;
+	u_char *p1, *p2;
 
 	if (db1->size != db2->size)
 		printf("compare failed: key->data len %lu != data len %lu\n",
diff --git a/lib/libcr/gmon/gmon.c b/lib/libcr/gmon/gmon.c
index c31ce1d714..e37ba78d3d 100644
--- a/lib/libcr/gmon/gmon.c
+++ b/lib/libcr/gmon/gmon.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/gmon/gmon.c,v 1.8 2000/01/27 23:06:25 jasone Exp $
- * $DragonFly: src/lib/libcr/gmon/Attic/gmon.c,v 1.4 2004/04/25 12:40:48 joerg Exp $
+ * $DragonFly: src/lib/libcr/gmon/Attic/gmon.c,v 1.5 2004/10/25 19:38:24 drhodus Exp $
  *
  * @(#)gmon.c	8.1 (Berkeley) 6/4/93
  */
@@ -71,7 +71,7 @@ monstartup(lowpc, highpc)
 	u_long lowpc;
 	u_long highpc;
 {
-	register int o;
+	int o;
 	char *cp;
 	struct gmonparam *p = &_gmonparam;
 
diff --git a/lib/libcr/gmon/mcount.c b/lib/libcr/gmon/mcount.c
index ac3d5672ab..8f333367aa 100644
--- a/lib/libcr/gmon/mcount.c
+++ b/lib/libcr/gmon/mcount.c
@@ -32,7 +32,7 @@
  *
  * @(#)mcount.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/gmon/mcount.c,v 1.17 1999/12/29 05:04:13 peter Exp $
- * $DragonFly: src/lib/libcr/gmon/Attic/mcount.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $
+ * $DragonFly: src/lib/libcr/gmon/Attic/mcount.c,v 1.4 2004/10/25 19:38:24 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -64,16 +64,16 @@ void	user (void);
  * perform this optimization.
  */
 _MCOUNT_DECL(frompc, selfpc)	/* _mcount; may be static, inline, etc */
-	register uintfptr_t frompc, selfpc;
+	uintfptr_t frompc, selfpc;
 {
 #ifdef GUPROF
 	u_int delta;
 #endif
-	register fptrdiff_t frompci;
-	register u_short *frompcindex;
-	register struct tostruct *top, *prevtop;
-	register struct gmonparam *p;
-	register long toindex;
+	fptrdiff_t frompci;
+	u_short *frompcindex;
+	struct tostruct *top, *prevtop;
+	struct gmonparam *p;
+	long toindex;
 #ifdef _KERNEL
 	MCOUNT_DECL(s)
 #endif
diff --git a/lib/libcr/i386/gen/isinf.c b/lib/libcr/i386/gen/isinf.c
index fbcdc0dc98..3b47f958ea 100644
--- a/lib/libcr/i386/gen/isinf.c
+++ b/lib/libcr/i386/gen/isinf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/i386/gen/isinf.c,v 1.6 1999/08/27 23:59:21 peter Exp $
- * $DragonFly: src/lib/libcr/i386/gen/Attic/isinf.c,v 1.3 2004/04/25 12:40:48 joerg Exp $
+ * $DragonFly: src/lib/libcr/i386/gen/Attic/isinf.c,v 1.4 2004/10/25 19:38:24 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -40,7 +40,7 @@ int
 isnan(d)
 	double d;
 {
-	register struct IEEEdp {
+	struct IEEEdp {
 		u_int manl : 32;
 		u_int manh : 20;
 		u_int  exp : 11;
@@ -54,7 +54,7 @@ int
 isinf(d)
 	double d;
 {
-	register struct IEEEdp {
+	struct IEEEdp {
 		u_int manl : 32;
 		u_int manh : 20;
 		u_int  exp : 11;
diff --git a/lib/libcr/net/gethostbydns.c b/lib/libcr/net/gethostbydns.c
index 9ffcd9d10f..d9ed426a0b 100644
--- a/lib/libcr/net/gethostbydns.c
+++ b/lib/libcr/net/gethostbydns.c
@@ -55,7 +55,7 @@
  * @(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93
  * $From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $
  * $FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.27.2.5 2002/11/02 18:54:57 ume Exp $
- * $DragonFly: src/lib/libcr/net/Attic/gethostbydns.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/gethostbydns.c,v 1.4 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -152,9 +152,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;
@@ -377,7 +377,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 */
@@ -477,7 +477,7 @@ _gethostbydnsname(name, af)
 	int af;
 {
 	querybuf *buf;
-	register const char *cp;
+	const char *cp;
 	char *bp;
 	int n, size, type, len;
 	struct hostent *hp;
@@ -610,10 +610,10 @@ _gethostbydnsaddr(addr, len, af)
 	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/libcr/net/gethostbyht.c b/lib/libcr/net/gethostbyht.c
index 047666657c..7ec80ff270 100644
--- a/lib/libcr/net/gethostbyht.c
+++ b/lib/libcr/net/gethostbyht.c
@@ -52,7 +52,7 @@
  *
  * @(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/net/gethostbyht.c,v 1.12 1999/08/28 00:00:05 peter Exp $
- * $DragonFly: src/lib/libcr/net/Attic/gethostbyht.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/gethostbyht.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -101,7 +101,7 @@ struct hostent *
 gethostent()
 {
 	char *p;
-	register char *cp, **q;
+	char *cp, **q;
 	int af, len;
 
 	if (!hostf && !(hostf = fopen(_PATH_HOSTS, "r" ))) {
@@ -167,8 +167,8 @@ _gethostbyhtname(name, af)
 	const char *name;
 	int af;
 {
-	register struct hostent *p;
-	register char **cp;
+	struct hostent *p;
+	char **cp;
 	
 	sethostent(0);
 	while ((p = gethostent()) != NULL) {
@@ -190,7 +190,7 @@ _gethostbyhtaddr(addr, len, af)
 	const char *addr;
 	int len, af;
 {
-	register struct hostent *p;
+	struct hostent *p;
 
 	sethostent(0);
 	while ((p = gethostent()) != NULL)
diff --git a/lib/libcr/net/gethostbynis.c b/lib/libcr/net/gethostbynis.c
index f1b1d23d04..481095389c 100644
--- a/lib/libcr/net/gethostbynis.c
+++ b/lib/libcr/net/gethostbynis.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/gethostbynis.c,v 1.10.2.1 2000/10/01 16:39:47 nectar Exp $
- * $DragonFly: src/lib/libcr/net/Attic/gethostbynis.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/gethostbynis.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -61,7 +61,7 @@ _gethostbynis(name, map, af)
 	int af;
 {
 #ifdef YP
-	register char *cp, **q;
+	char *cp, **q;
 	char *result;
 	int resultlen,size;
 	static struct hostent h;
diff --git a/lib/libcr/net/gethostnamadr.c b/lib/libcr/net/gethostnamadr.c
index 875106261a..fcbf1269c5 100644
--- a/lib/libcr/net/gethostnamadr.c
+++ b/lib/libcr/net/gethostnamadr.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.15.2.2 2001/03/05 10:40:42 obrien Exp $
- * $DragonFly: src/lib/libcr/net/Attic/gethostnamadr.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/gethostnamadr.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -81,7 +81,7 @@ static void
 init_services()
 {
 	char *cp, *p, buf[BUFSIZ];
-	register int cc = 0;
+	int cc = 0;
 	FILE *fd;
 
 	if ((fd = (FILE *)fopen(_PATH_HOSTCONF, "r")) == NULL) {
diff --git a/lib/libcr/net/getnetbydns.c b/lib/libcr/net/getnetbydns.c
index c722c34b29..0930a0667d 100644
--- a/lib/libcr/net/getnetbydns.c
+++ b/lib/libcr/net/getnetbydns.c
@@ -52,7 +52,7 @@
  *
  * @(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/net/getnetbydns.c,v 1.13.2.4 2002/10/11 11:07:13 ume Exp $
- * $DragonFly: src/lib/libcr/net/Attic/getnetbydns.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/getnetbydns.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 /* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
  *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
@@ -104,9 +104,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];
@@ -217,8 +217,8 @@ static	char *net_aliases[MAXALIASES], netbuf[PACKETSZ];
 
 struct netent *
 _getnetbydnsaddr(net, net_type)
-	register unsigned long net;
-	register int net_type;
+	unsigned long net;
+	int net_type;
 {
 	unsigned int netbr[4];
 	int nn, anslen;
@@ -284,7 +284,7 @@ _getnetbydnsaddr(net, net_type)
 
 struct netent *
 _getnetbydnsname(net)
-	register const char *net;
+	const char *net;
 {
 	int anslen;
 	querybuf *buf;
diff --git a/lib/libcr/net/getnetbyht.c b/lib/libcr/net/getnetbyht.c
index 577b48524c..2dd30b1834 100644
--- a/lib/libcr/net/getnetbyht.c
+++ b/lib/libcr/net/getnetbyht.c
@@ -32,7 +32,7 @@
  *
  * @(#)getnetent.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/net/getnetbyht.c,v 1.7.2.1 2002/07/07 11:34:42 robert Exp $
- * $DragonFly: src/lib/libcr/net/Attic/getnetbyht.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/getnetbyht.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
@@ -89,7 +89,7 @@ struct netent *
 getnetent()
 {
 	char *p;
-	register char *cp, **q;
+	char *cp, **q;
 
 	if (netf == NULL && (netf = fopen(_PATH_NETWORKS, "r" )) == NULL)
 		return (NULL);
@@ -135,10 +135,10 @@ again:
 
 struct netent *
 _getnetbyhtname(name)
-	register const char *name;
+	const char *name;
 {
-	register struct netent *p;
-	register char **cp;
+	struct netent *p;
+	char **cp;
 
 	setnetent(_net_stayopen);
 	while ( (p = getnetent()) ) {
@@ -156,10 +156,10 @@ found:
 
 struct netent *
 _getnetbyhtaddr(net, type)
-	register unsigned long net;
-	register int type;
+	unsigned long net;
+	int type;
 {
-	register struct netent *p;
+	struct netent *p;
 
 	setnetent(_net_stayopen);
 	while ( (p = getnetent()) )
diff --git a/lib/libcr/net/getnetbynis.c b/lib/libcr/net/getnetbynis.c
index 227de8fce2..735cc029fd 100644
--- a/lib/libcr/net/getnetbynis.c
+++ b/lib/libcr/net/getnetbynis.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/getnetbynis.c,v 1.11 1999/08/28 00:00:07 peter Exp $
- * $DragonFly: src/lib/libcr/net/Attic/getnetbynis.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/getnetbynis.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -57,7 +57,7 @@ _getnetbynis(name, map, af)
 	int af;
 {
 #ifdef YP
-	register char *cp, **q;
+	char *cp, **q;
 	static char *result;
 	int resultlen;
 	static struct netent h;
diff --git a/lib/libcr/net/getnetnamadr.c b/lib/libcr/net/getnetnamadr.c
index d6c300b613..a5d8f8f53d 100644
--- a/lib/libcr/net/getnetnamadr.c
+++ b/lib/libcr/net/getnetnamadr.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/getnetnamadr.c,v 1.12.2.1 2001/03/05 10:47:08 obrien Exp $
- * $DragonFly: src/lib/libcr/net/Attic/getnetnamadr.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/getnetnamadr.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -81,7 +81,7 @@ static void
 init_services()
 {
 	char *cp, *p, buf[BUFSIZ];
-	register int cc = 0;
+	int cc = 0;
 	FILE *fd;
 
 	if ((fd = (FILE *)fopen(_PATH_NETCONF, "r")) == NULL) {
diff --git a/lib/libcr/net/getproto.c b/lib/libcr/net/getproto.c
index 3d704a86f6..c48784a4b2 100644
--- a/lib/libcr/net/getproto.c
+++ b/lib/libcr/net/getproto.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)getproto.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcr/net/Attic/getproto.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <netdb.h>
@@ -39,9 +40,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/libcr/net/getprotoent.c b/lib/libcr/net/getprotoent.c
index 7093ec4b0f..97862fb310 100644
--- a/lib/libcr/net/getprotoent.c
+++ b/lib/libcr/net/getprotoent.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)getprotoent.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcr/net/Attic/getprotoent.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -73,7 +74,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/libcr/net/getprotoname.c b/lib/libcr/net/getprotoname.c
index fd539158c0..2dbed860ec 100644
--- a/lib/libcr/net/getprotoname.c
+++ b/lib/libcr/net/getprotoname.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)getprotoname.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcr/net/Attic/getprotoname.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <netdb.h>
@@ -40,10 +41,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/libcr/net/getservbyname.c b/lib/libcr/net/getservbyname.c
index 397df6080a..e8448431fe 100644
--- a/lib/libcr/net/getservbyname.c
+++ b/lib/libcr/net/getservbyname.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)getservbyname.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcr/net/Attic/getservbyname.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <netdb.h>
@@ -42,8 +43,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/libcr/net/getservbyport.c b/lib/libcr/net/getservbyport.c
index 6ead8d0c0b..12d2bf2d52 100644
--- a/lib/libcr/net/getservbyport.c
+++ b/lib/libcr/net/getservbyport.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)getservbyport.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcr/net/Attic/getservbyport.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <netdb.h>
@@ -43,7 +44,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/libcr/net/getservent.c b/lib/libcr/net/getservent.c
index e69e7948d7..374eb79506 100644
--- a/lib/libcr/net/getservent.c
+++ b/lib/libcr/net/getservent.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)getservent.c	8.1 (Berkeley) 6/4/93
- * $DragonFly: src/lib/libcr/net/Attic/getservent.c,v 1.4 2003/11/12 20:21:28 eirikn Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/getservent.c,v 1.5 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -209,7 +209,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/libcr/net/herror.c b/lib/libcr/net/herror.c
index 7ba2ed34e4..7638f387c9 100644
--- a/lib/libcr/net/herror.c
+++ b/lib/libcr/net/herror.c
@@ -32,7 +32,7 @@
  *
  * @(#)herror.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/net/herror.c,v 1.8 1999/08/28 00:00:09 peter Exp $
- * $DragonFly: src/lib/libcr/net/Attic/herror.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/herror.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -78,7 +78,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/libcr/net/inet_addr.c b/lib/libcr/net/inet_addr.c
index 2ca68a5d3c..2c8df3f841 100644
--- a/lib/libcr/net/inet_addr.c
+++ b/lib/libcr/net/inet_addr.c
@@ -56,7 +56,7 @@
  *
  * @(#)inet_addr.c	8.1 (Berkeley) 6/17/93
  * $FreeBSD: src/lib/libc/net/inet_addr.c,v 1.12.2.2 2002/04/28 05:40:24 suz Exp $
- * $DragonFly: src/lib/libcr/net/Attic/inet_addr.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/inet_addr.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -75,7 +75,7 @@
  */
 in_addr_t		/* XXX should be struct in_addr :( */
 inet_addr(cp)
-	register const char *cp;
+	const char *cp;
 {
 	struct in_addr val;
 
@@ -93,7 +93,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/libcr/net/inet_lnaof.c b/lib/libcr/net/inet_lnaof.c
index 0d65fb13b8..ef64beec59 100644
--- a/lib/libcr/net/inet_lnaof.c
+++ b/lib/libcr/net/inet_lnaof.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/inet_lnaof.c,v 1.2.6.1 2001/04/21 14:53:04 ume Exp $
- * $DragonFly: src/lib/libcr/net/Attic/inet_lnaof.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/inet_lnaof.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  *
  * @(#)inet_lnaof.c	8.1 (Berkeley) 6/4/93
  */
@@ -49,7 +49,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/libcr/net/inet_netof.c b/lib/libcr/net/inet_netof.c
index 5d7b181c73..140c63e39b 100644
--- a/lib/libcr/net/inet_netof.c
+++ b/lib/libcr/net/inet_netof.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/inet_netof.c,v 1.2.6.1 2001/04/21 14:53:04 ume Exp $
- * $DragonFly: src/lib/libcr/net/Attic/inet_netof.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/inet_netof.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  *
  * @(#)inet_netof.c	8.1 (Berkeley) 6/4/93
  */
@@ -48,7 +48,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/libcr/net/inet_network.c b/lib/libcr/net/inet_network.c
index e2f71ed6e5..b977754217 100644
--- a/lib/libcr/net/inet_network.c
+++ b/lib/libcr/net/inet_network.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/inet_network.c,v 1.6.2.1 2001/04/21 14:53:04 ume Exp $
- * $DragonFly: src/lib/libcr/net/Attic/inet_network.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/inet_network.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  *
  * @(#)inet_network.c	8.1 (Berkeley) 6/4/93
  */
@@ -48,12 +48,12 @@
  */
 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/libcr/net/ip6opt.c b/lib/libcr/net/ip6opt.c
index 6da8556733..8d8f233488 100644
--- a/lib/libcr/net/ip6opt.c
+++ b/lib/libcr/net/ip6opt.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/ip6opt.c,v 1.1 1999/12/16 18:32:01 shin Exp $
- * $DragonFly: src/lib/libcr/net/Attic/ip6opt.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/ip6opt.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -71,7 +71,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)
@@ -103,7 +103,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 */
@@ -177,7 +177,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/libcr/net/iso_addr.c b/lib/libcr/net/iso_addr.c
index a4832c790c..445c20dd22 100644
--- a/lib/libcr/net/iso_addr.c
+++ b/lib/libcr/net/iso_addr.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)iso_addr.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcr/net/Attic/iso_addr.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -48,12 +49,12 @@
 
 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/libcr/net/linkaddr.c b/lib/libcr/net/linkaddr.c
index e2179303d6..3446ab09a7 100644
--- a/lib/libcr/net/linkaddr.c
+++ b/lib/libcr/net/linkaddr.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)linkaddr.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcr/net/Attic/linkaddr.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -51,12 +52,12 @@
 
 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;
@@ -122,12 +123,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/libcr/net/name6.c b/lib/libcr/net/name6.c
index 6de935506e..69d842c864 100644
--- a/lib/libcr/net/name6.c
+++ b/lib/libcr/net/name6.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/lib/libc/net/name6.c,v 1.6.2.9 2002/11/02 18:54:57 ume Exp $	*/
-/*	$DragonFly: src/lib/libcr/net/Attic/name6.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $	*/
+/*	$DragonFly: src/lib/libcr/net/Attic/name6.c,v 1.4 2004/10/25 19:38:25 drhodus Exp $	*/
 /*	$KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $	*/
 
 /*
@@ -1040,9 +1040,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, *obp;
 	int type, class, buflen, ancount, qdcount;
@@ -1251,7 +1251,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/libcr/net/ns_addr.c b/lib/libcr/net/ns_addr.c
index 068f7d770a..d689f6c9c5 100644
--- a/lib/libcr/net/ns_addr.c
+++ b/lib/libcr/net/ns_addr.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/ns_addr.c,v 1.3.6.2 2001/07/04 22:34:51 kris Exp $
- * $DragonFly: src/lib/libcr/net/Attic/ns_addr.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/ns_addr.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  *
  * @(#)ns_addr.c	8.1 (Berkeley) 6/7/93
  */
@@ -101,7 +101,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;
 	char *fmt;
diff --git a/lib/libcr/net/ns_ntoa.c b/lib/libcr/net/ns_ntoa.c
index 374597da05..16162c1b63 100644
--- a/lib/libcr/net/ns_ntoa.c
+++ b/lib/libcr/net/ns_ntoa.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)ns_ntoa.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcr/net/Attic/ns_ntoa.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -44,9 +45,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();
 
@@ -81,7 +82,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/libcr/net/nsap_addr.c b/lib/libcr/net/nsap_addr.c
index f665b83ec9..5c09ccf42d 100644
--- a/lib/libcr/net/nsap_addr.c
+++ b/lib/libcr/net/nsap_addr.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  *
  * $FreeBSD: src/lib/libc/net/nsap_addr.c,v 1.7 1999/08/28 00:00:15 peter Exp $
- * $DragonFly: src/lib/libcr/net/Attic/nsap_addr.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/nsap_addr.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -29,7 +29,7 @@
 
 static char
 xtob(c)
-	register int c;
+	int c;
 {
 	return (c - (((c >= '0') && (c <= '9')) ? '0' : '7'));
 }
@@ -73,10 +73,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/libcr/net/rcmd.c b/lib/libcr/net/rcmd.c
index 77e218fb9a..2c63877354 100644
--- a/lib/libcr/net/rcmd.c
+++ b/lib/libcr/net/rcmd.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/rcmd.c,v 1.23.2.7 2002/08/26 16:17:49 jdp Exp $
- * $DragonFly: src/lib/libcr/net/Attic/rcmd.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/rcmd.c,v 1.4 2004/10/25 19:38:25 drhodus Exp $
  *
  * @(#)rcmd.c	8.3 (Berkeley) 3/26/94
  */
@@ -450,7 +450,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;
@@ -601,7 +601,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/libcr/net/res_init.c b/lib/libcr/net/res_init.c
index 0a4c97bfa7..2393bbf428 100644
--- a/lib/libcr/net/res_init.c
+++ b/lib/libcr/net/res_init.c
@@ -33,7 +33,7 @@
  * @(#)res_init.c	8.1 (Berkeley) 6/7/93
  * $From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $
  * $FreeBSD: src/lib/libc/net/res_init.c,v 1.19.2.7 2002/02/04 18:30:55 ume Exp $
- * $DragonFly: src/lib/libcr/net/Attic/res_init.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/res_init.c,v 1.4 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -138,9 +138,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;
@@ -555,7 +555,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/libcr/net/res_mkquery.c b/lib/libcr/net/res_mkquery.c
index 0843404efb..687c1e24b7 100644
--- a/lib/libcr/net/res_mkquery.c
+++ b/lib/libcr/net/res_mkquery.c
@@ -33,7 +33,7 @@
  * @(#)res_mkquery.c	8.1 (Berkeley) 6/4/93
  * $From: Id: res_mkquery.c,v 8.9 1997/04/24 22:22:36 vixie Exp $
  * $FreeBSD: src/lib/libc/net/res_mkquery.c,v 1.15.2.2 2002/09/20 10:45:35 nectar Exp $
- * $DragonFly: src/lib/libcr/net/Attic/res_mkquery.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/res_mkquery.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -99,9 +99,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) {
@@ -212,8 +212,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/libcr/net/res_query.c b/lib/libcr/net/res_query.c
index 0983b33a3e..20f445b296 100644
--- a/lib/libcr/net/res_query.c
+++ b/lib/libcr/net/res_query.c
@@ -33,7 +33,7 @@
  * @(#)res_query.c	8.1 (Berkeley) 6/4/93
  * $From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $
  * $FreeBSD: src/lib/libc/net/res_query.c,v 1.19.2.2 2002/07/07 11:34:42 robert Exp $
- * $DragonFly: src/lib/libcr/net/Attic/res_query.c,v 1.3 2004/04/25 12:40:50 joerg Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/res_query.c,v 1.4 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -385,7 +385,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/libcr/net/rthdr.c b/lib/libcr/net/rthdr.c
index 5c2d6c5b67..540e41d74e 100644
--- a/lib/libcr/net/rthdr.c
+++ b/lib/libcr/net/rthdr.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/net/rthdr.c,v 1.2.2.1 2002/04/28 05:40:24 suz Exp $
- * $DragonFly: src/lib/libcr/net/Attic/rthdr.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/net/Attic/rthdr.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -65,8 +65,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);
 
@@ -93,7 +93,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);
 
@@ -142,7 +142,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);
 
@@ -198,7 +198,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);
 
@@ -232,7 +232,7 @@ inet6_rthdr_getaddr(cmsg, idx)
     struct cmsghdr *cmsg;
     int idx;
 {
-    register struct ip6_rthdr *rthdr;
+    struct ip6_rthdr *rthdr;
 
     rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
 
@@ -273,7 +273,7 @@ inet6_rthdr_getflags(cmsg, idx)
     const struct cmsghdr *cmsg;
     int idx;
 {
-    register struct ip6_rthdr *rthdr;
+    struct ip6_rthdr *rthdr;
 
     rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
 
diff --git a/lib/libcr/quad/muldi3.c b/lib/libcr/quad/muldi3.c
index 46e536de84..71294022f4 100644
--- a/lib/libcr/quad/muldi3.c
+++ b/lib/libcr/quad/muldi3.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  * @(#)muldi3.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcr/quad/Attic/muldi3.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #include "quad.h"
@@ -103,8 +104,8 @@ __muldi3(a, b)
 	quad_t a, b;
 {
 	union uu u, v, low, prod;
-	register u_long high, mid, udiff, vdiff;
-	register int negall, negmid;
+	u_long high, mid, udiff, vdiff;
+	int negall, negmid;
 #define	u1	u.ul[H]
 #define	u0	u.ul[L]
 #define	v1	v.ul[H]
diff --git a/lib/libcr/quad/qdivrem.c b/lib/libcr/quad/qdivrem.c
index e5dea9df57..cdc0c1cfbe 100644
--- a/lib/libcr/quad/qdivrem.c
+++ b/lib/libcr/quad/qdivrem.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  * @(#)qdivrem.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libcr/quad/Attic/qdivrem.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -62,9 +63,9 @@ typedef u_long digit;
  * We may assume len >= 0.  NOTE THAT THIS WRITES len+1 DIGITS.
  */
 static void
-shl(register digit *p, register int len, register int sh)
+shl(digit *p, int len, int sh)
 {
-	register int i;
+	int i;
 
 	for (i = 0; i < len; i++)
 		p[i] = LHALF(p[i] << sh) | (p[i + 1] >> (HALF_BITS - sh));
@@ -85,7 +86,7 @@ __qdivrem(uq, vq, arq)
 {
 	union uu tmp;
 	digit *u, *v, *q;
-	register digit v1, v2;
+	digit v1, v2;
 	u_long qhat, rhat, t;
 	int m, n, d, j, i;
 	digit uspace[5], vspace[5], qspace[5];
@@ -195,7 +196,7 @@ __qdivrem(uq, vq, arq)
 	v1 = v[1];	/* for D3 -- note that v[1..n] are constant */
 	v2 = v[2];	/* for D3 */
 	do {
-		register digit uj0, uj1, uj2;
+		digit uj0, uj1, uj2;
 
 		/*
 		 * D3: Calculate qhat (\^q, in TeX notation).
diff --git a/lib/libcr/regex/engine.c b/lib/libcr/regex/engine.c
index b8b3118015..c49199cc08 100644
--- a/lib/libcr/regex/engine.c
+++ b/lib/libcr/regex/engine.c
@@ -37,7 +37,7 @@
  *	@(#)engine.c	8.5 (Berkeley) 3/20/94
  *
  * $FreeBSD: src/lib/libc/regex/engine.c,v 1.5.8.1 2000/07/31 06:30:37 dcs Exp $
- * $DragonFly: src/lib/libcr/regex/Attic/engine.c,v 1.4 2004/03/13 19:46:55 eirikn Exp $
+ * $DragonFly: src/lib/libcr/regex/Attic/engine.c,v 1.5 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -135,7 +135,7 @@ static char *pchar(int ch);
 
 /*
  - matcher - the actual matching engine
- == static int matcher(register struct re_guts *g, char *string, \
+ == static int matcher(struct re_guts *g, char *string, \
  ==	size_t nmatch, regmatch_t pmatch[], int eflags);
  */
 static int			/* 0 success, REG_NOMATCH failure */
@@ -342,7 +342,7 @@ matcher(struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[],
 
 /*
  - dissect - figure out what matched what, no back references
- == static char *dissect(register struct match *m, char *start, \
+ == static char *dissect(struct match *m, char *start, \
  ==	char *stop, sopno startst, sopno stopst);
  */
 static char *			/* == stop (success) always */
@@ -525,7 +525,7 @@ dissect(struct match *m, char *start, char *stop, sopno startst, sopno stopst)
 
 /*
  - backref - figure out what matched what, figuring in back references
- == static char *backref(register struct match *m, char *start, \
+ == static char *backref(struct match *m, char *start, \
  ==	char *stop, sopno startst, sopno stopst, sopno lev);
  */
 static char *			/* == stop (success) or NULL (failure) */
@@ -725,7 +725,7 @@ backref(struct match *m, char *start, char *stop, sopno startst, sopno stopst,
 
 /*
  - fast - step through the string at top speed
- == static char *fast(register struct match *m, char *start, \
+ == static char *fast(struct match *m, char *start, \
  ==	char *stop, sopno startst, sopno stopst);
  */
 static char *			/* where tentative match ended, or NULL */
@@ -811,7 +811,7 @@ fast(struct match *m, char *start, char *stop, sopno startst, sopno stopst)
 
 /*
  - slow - step through the string more deliberately
- == static char *slow(register struct match *m, char *start, \
+ == static char *slow(struct match *m, char *start, \
  ==	char *stop, sopno startst, sopno stopst);
  */
 static char *			/* where it ended */
@@ -893,8 +893,8 @@ slow(struct match *m, char *start, char *stop, sopno startst, sopno stopst)
 
 /*
  - step - map set of states reachable before char to set reachable after
- == static states step(register struct re_guts *g, sopno start, sopno stop, \
- ==	register states bef, int ch, register states aft);
+ == static states step(struct re_guts *g, sopno start, sopno stop, \
+ ==	states bef, int ch, states aft);
  == #define	BOL	(OUT+1)
  == #define	EOL	(BOL+1)
  == #define	BOLEOL	(BOL+2)
diff --git a/lib/libcr/regex/regcomp.c b/lib/libcr/regex/regcomp.c
index 486e1f5c9d..d36c3fbb68 100644
--- a/lib/libcr/regex/regcomp.c
+++ b/lib/libcr/regex/regcomp.c
@@ -37,7 +37,7 @@
  *	@(#)regcomp.c	8.5 (Berkeley) 3/20/94
  *
  * $FreeBSD: src/lib/libc/regex/regcomp.c,v 1.13.2.2 2002/03/20 13:13:15 dcs Exp $
- * $DragonFly: src/lib/libcr/regex/Attic/regcomp.c,v 1.4 2004/03/13 19:46:55 eirikn Exp $
+ * $DragonFly: src/lib/libcr/regex/Attic/regcomp.c,v 1.5 2004/10/25 19:38:25 drhodus Exp $
  *
  * @(#)regcomp.c	8.5 (Berkeley) 3/20/94
  */
@@ -299,7 +299,7 @@ regcomp(regex_t *preg, const char *pattern, int cflags)
 
 /*
  - p_ere - ERE parser top level, concatenation and alternation
- == static void p_ere(register struct parse *p, int stop);
+ == static void p_ere(struct parse *p, int stop);
  */
 static void
 p_ere(struct parse *p,
@@ -344,7 +344,7 @@ p_ere(struct parse *p,
 
 /*
  - p_ere_exp - parse one subERE, an atom possibly followed by a repetition op
- == static void p_ere_exp(register struct parse *p);
+ == static void p_ere_exp(struct parse *p);
  */
 static void
 p_ere_exp(struct parse *p)
@@ -492,7 +492,7 @@ p_ere_exp(struct parse *p)
 
 /*
  - p_str - string (no metacharacters) "parser"
- == static void p_str(register struct parse *p);
+ == static void p_str(struct parse *p);
  */
 static void
 p_str(struct parse *p)
@@ -504,8 +504,8 @@ p_str(struct parse *p)
 
 /*
  - p_bre - BRE parser top level, anchoring and concatenation
- == static void p_bre(register struct parse *p, register int end1, \
- ==	register int end2);
+ == static void p_bre(struct parse *p, int end1, \
+ ==	int end2);
  * Giving end1 as OUT essentially eliminates the end1/end2 check.
  *
  * This implementation is a bit of a kludge, in that a trailing $ is first
@@ -544,7 +544,7 @@ p_bre(struct parse *p,
 
 /*
  - p_simp_re - parse a simple RE, an atom possibly followed by a repetition
- == static int p_simp_re(register struct parse *p, int starordinary);
+ == static int p_simp_re(struct parse *p, int starordinary);
  */
 static int			/* was the simple RE an unbackslashed $? */
 p_simp_re(struct parse *p,
@@ -661,7 +661,7 @@ p_simp_re(struct parse *p,
 
 /*
  - p_count - parse a repetition count
- == static int p_count(register struct parse *p);
+ == static int p_count(struct parse *p);
  */
 static int			/* the value */
 p_count(struct parse *p)
@@ -680,7 +680,7 @@ p_count(struct parse *p)
 
 /*
  - p_bracket - parse a bracketed character list
- == static void p_bracket(register struct parse *p);
+ == static void p_bracket(struct parse *p);
  *
  * Note a significant property of this code:  if the allocset() did SETERROR,
  * no set operations are done.
@@ -719,8 +719,8 @@ p_bracket(struct parse *p)
 		return;
 
 	if (p->g->cflags&REG_ICASE) {
-		register int i;
-		register int ci;
+		int i;
+		int ci;
 
 		for (i = p->g->csetsize - 1; i >= 0; i--)
 			if (CHIN(cs, i) && isalpha(i)) {
@@ -732,7 +732,7 @@ p_bracket(struct parse *p)
 			mccase(p, cs);
 	}
 	if (invert) {
-		register int i;
+		int i;
 
 		for (i = p->g->csetsize - 1; i >= 0; i--)
 			if (CHIN(cs, i))
@@ -756,7 +756,7 @@ p_bracket(struct parse *p)
 
 /*
  - p_b_term - parse one term of a bracketed character list
- == static void p_b_term(register struct parse *p, register cset *cs);
+ == static void p_b_term(struct parse *p, cset *cs);
  */
 static void
 p_b_term(struct parse *p, cset *cs)
@@ -833,7 +833,7 @@ p_b_term(struct parse *p, cset *cs)
 
 /*
  - p_b_cclass - parse a character-class name and deal with it
- == static void p_b_cclass(register struct parse *p, register cset *cs);
+ == static void p_b_cclass(struct parse *p, cset *cs);
  */
 static void
 p_b_cclass(struct parse *p, cset *cs)
@@ -925,7 +925,7 @@ p_b_cclass(struct parse *p, cset *cs)
 
 /*
  - p_b_eclass - parse an equivalence-class name and deal with it
- == static void p_b_eclass(register struct parse *p, register cset *cs);
+ == static void p_b_eclass(struct parse *p, cset *cs);
  *
  * This implementation is incomplete. xxx
  */
@@ -940,7 +940,7 @@ p_b_eclass(struct parse *p, cset *cs)
 
 /*
  - p_b_symbol - parse a character or [..]ed multicharacter collating symbol
- == static char p_b_symbol(register struct parse *p);
+ == static char p_b_symbol(struct parse *p);
  */
 static char			/* value of symbol */
 p_b_symbol(struct parse *p)
@@ -959,7 +959,7 @@ p_b_symbol(struct parse *p)
 
 /*
  - p_b_coll_elem - parse a collating-element name and look it up
- == static char p_b_coll_elem(register struct parse *p, int endc);
+ == static char p_b_coll_elem(struct parse *p, int endc);
  */
 static char			/* value of collating element */
 p_b_coll_elem(struct parse *p,
@@ -1004,7 +1004,7 @@ othercase(int ch)
 
 /*
  - bothcases - emit a dualcase version of a two-case character
- == static void bothcases(register struct parse *p, int ch);
+ == static void bothcases(struct parse *p, int ch);
  *
  * Boy, is this implementation ever a kludge...
  */
@@ -1030,7 +1030,7 @@ bothcases(struct parse *p, int ch)
 
 /*
  - ordinary - emit an ordinary character
- == static void ordinary(register struct parse *p, register int ch);
+ == static void ordinary(struct parse *p, int ch);
  */
 static void
 ordinary(struct parse *p, int ch)
@@ -1048,7 +1048,7 @@ ordinary(struct parse *p, int ch)
 
 /*
  - nonnewline - emit REG_NEWLINE version of OANY
- == static void nonnewline(register struct parse *p);
+ == static void nonnewline(struct parse *p);
  *
  * Boy, is this implementation ever a kludge...
  */
@@ -1073,7 +1073,7 @@ nonnewline(struct parse *p)
 
 /*
  - repeat - generate code for a bounded repetition, recursively if needed
- == static void repeat(register struct parse *p, sopno start, int from, int to);
+ == static void repeat(struct parse *p, sopno start, int from, int to);
  */
 static void
 repeat(struct parse *p,
@@ -1144,7 +1144,7 @@ repeat(struct parse *p,
 
 /*
  - seterr - set an error condition
- == static int seterr(register struct parse *p, int e);
+ == static int seterr(struct parse *p, int e);
  */
 static int			/* useless but makes type checking happy */
 seterr(struct parse *p, int e)
@@ -1158,7 +1158,7 @@ seterr(struct parse *p, int e)
 
 /*
  - allocset - allocate a set of characters for []
- == static cset *allocset(register struct parse *p);
+ == static cset *allocset(struct parse *p);
  */
 static cset *
 allocset(struct parse *p)
@@ -1212,7 +1212,7 @@ allocset(struct parse *p)
 
 /*
  - freeset - free a now-unused set
- == static void freeset(register struct parse *p, register cset *cs);
+ == static void freeset(struct parse *p, cset *cs);
  */
 static void
 freeset(struct parse *p, cset *cs)
@@ -1229,7 +1229,7 @@ freeset(struct parse *p, cset *cs)
 
 /*
  - freezeset - final processing on a set of characters
- == static int freezeset(register struct parse *p, register cset *cs);
+ == static int freezeset(struct parse *p, cset *cs);
  *
  * The main task here is merging identical sets.  This is usually a waste
  * of time (although the hash code minimizes the overhead), but can win
@@ -1267,7 +1267,7 @@ freezeset(struct parse *p, cset *cs)
 
 /*
  - firstch - return first character in a set (which must have at least one)
- == static int firstch(register struct parse *p, register cset *cs);
+ == static int firstch(struct parse *p, cset *cs);
  */
 static int			/* character; there is no "none" value */
 firstch(struct parse *p, cset *cs)
@@ -1284,7 +1284,7 @@ firstch(struct parse *p, cset *cs)
 
 /*
  - nch - number of characters in a set
- == static int nch(register struct parse *p, register cset *cs);
+ == static int nch(struct parse *p, cset *cs);
  */
 static int
 nch(struct parse *p, cset *cs)
@@ -1301,8 +1301,8 @@ nch(struct parse *p, cset *cs)
 
 /*
  - mcadd - add a collating element to a cset
- == static void mcadd(register struct parse *p, register cset *cs, \
- ==	register char *cp);
+ == static void mcadd(struct parse *p, cset *cs, \
+ ==	char *cp);
  */
 static void
 mcadd(struct parse *p, cset *cs, char *cp)
@@ -1326,7 +1326,7 @@ mcadd(struct parse *p, cset *cs, char *cp)
 #if used
 /*
  - mcsub - subtract a collating element from a cset
- == static void mcsub(register cset *cs, register char *cp);
+ == static void mcsub(cset *cs, char *cp);
  */
 static void
 mcsub(cset *cs, char *cp)
@@ -1351,7 +1351,7 @@ mcsub(cset *cs, char *cp)
 
 /*
  - mcin - is a collating element in a cset?
- == static int mcin(register cset *cs, register char *cp);
+ == static int mcin(cset *cs, char *cp);
  */
 static int
 mcin(cset *cs, char *cp)
@@ -1361,7 +1361,7 @@ mcin(cset *cs, char *cp)
 
 /*
  - mcfind - find a collating element in a cset
- == static char *mcfind(register cset *cs, register char *cp);
+ == static char *mcfind(cset *cs, char *cp);
  */
 static char *
 mcfind(cset *cs, char *cp)
@@ -1379,7 +1379,7 @@ mcfind(cset *cs, char *cp)
 
 /*
  - mcinvert - invert the list of collating elements in a cset
- == static void mcinvert(register struct parse *p, register cset *cs);
+ == static void mcinvert(struct parse *p, cset *cs);
  *
  * This would have to know the set of possibilities.  Implementation
  * is deferred.
@@ -1392,7 +1392,7 @@ mcinvert(struct parse *p, cset *cs)
 
 /*
  - mccase - add case counterparts of the list of collating elements in a cset
- == static void mccase(register struct parse *p, register cset *cs);
+ == static void mccase(struct parse *p, cset *cs);
  *
  * This would have to know the set of possibilities.  Implementation
  * is deferred.
@@ -1405,7 +1405,7 @@ mccase(struct parse *p, cset *cs)
 
 /*
  - isinsets - is this character in any sets?
- == static int isinsets(register struct re_guts *g, int c);
+ == static int isinsets(struct re_guts *g, int c);
  */
 static int			/* predicate */
 isinsets(struct re_guts *g, int c)
@@ -1423,7 +1423,7 @@ isinsets(struct re_guts *g, int c)
 
 /*
  - samesets - are these two characters in exactly the same sets?
- == static int samesets(register struct re_guts *g, int c1, int c2);
+ == static int samesets(struct re_guts *g, int c1, int c2);
  */
 static int			/* predicate */
 samesets(struct re_guts *g, int c1, int c2)
@@ -1442,7 +1442,7 @@ samesets(struct re_guts *g, int c1, int c2)
 
 /*
  - categorize - sort out character categories
- == static void categorize(struct parse *p, register struct re_guts *g);
+ == static void categorize(struct parse *p, struct re_guts *g);
  */
 static void
 categorize(struct parse *p, struct re_guts *g)
@@ -1468,7 +1468,7 @@ categorize(struct parse *p, struct re_guts *g)
 
 /*
  - dupl - emit a duplicate of a bunch of sops
- == static sopno dupl(register struct parse *p, sopno start, sopno finish);
+ == static sopno dupl(struct parse *p, sopno start, sopno finish);
  */
 static sopno			/* start of duplicate */
 dupl(struct parse *p,
@@ -1491,7 +1491,7 @@ dupl(struct parse *p,
 
 /*
  - doemit - emit a strip operator
- == static void doemit(register struct parse *p, sop op, size_t opnd);
+ == static void doemit(struct parse *p, sop op, size_t opnd);
  *
  * It might seem better to implement this as a macro with a function as
  * hard-case backup, but it's just too big and messy unless there are
@@ -1518,7 +1518,7 @@ doemit(struct parse *p, sop op, size_t opnd)
 
 /*
  - doinsert - insert a sop into the strip
- == static void doinsert(register struct parse *p, sop op, size_t opnd, sopno pos);
+ == static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
  */
 static void
 doinsert(struct parse *p, sop op, size_t opnd, sopno pos)
@@ -1554,7 +1554,7 @@ doinsert(struct parse *p, sop op, size_t opnd, sopno pos)
 
 /*
  - dofwd - complete a forward reference
- == static void dofwd(register struct parse *p, sopno pos, sop value);
+ == static void dofwd(struct parse *p, sopno pos, sop value);
  */
 static void
 dofwd(struct parse *p, sopno pos, sop value)
@@ -1569,7 +1569,7 @@ dofwd(struct parse *p, sopno pos, sop value)
 
 /*
  - enlarge - enlarge the strip
- == static void enlarge(register struct parse *p, sopno size);
+ == static void enlarge(struct parse *p, sopno size);
  */
 static void
 enlarge(struct parse *p, sopno size)
@@ -1590,7 +1590,7 @@ enlarge(struct parse *p, sopno size)
 
 /*
  - stripsnug - compact the strip
- == static void stripsnug(register struct parse *p, register struct re_guts *g);
+ == static void stripsnug(struct parse *p, struct re_guts *g);
  */
 static void
 stripsnug(struct parse *p, struct re_guts *g)
@@ -1605,7 +1605,7 @@ stripsnug(struct parse *p, struct re_guts *g)
 
 /*
  - findmust - fill in must and mlen with longest mandatory literal string
- == static void findmust(register struct parse *p, register struct re_guts *g);
+ == static void findmust(struct parse *p, struct re_guts *g);
  *
  * This algorithm could do fancy things like analyzing the operands of |
  * for common subsequences.  Someday.  This code is simple and finds most
@@ -1848,7 +1848,7 @@ altoffset(sop *scan, int offset, int mccs)
 
 /*
  - computejumps - compute char jumps for BM scan
- == static void computejumps(register struct parse *p, register struct re_guts *g);
+ == static void computejumps(struct parse *p, struct re_guts *g);
  *
  * This algorithm assumes g->must exists and is has size greater than
  * zero. It's based on the algorithm found on Computer Algorithms by
@@ -1890,7 +1890,7 @@ computejumps(struct parse *p, struct re_guts *g)
 
 /*
  - computematchjumps - compute match jumps for BM scan
- == static void computematchjumps(register struct parse *p, register struct re_guts *g);
+ == static void computematchjumps(struct parse *p, struct re_guts *g);
  *
  * This algorithm assumes g->must exists and is has size greater than
  * zero. It's based on the algorithm found on Computer Algorithms by
@@ -1973,7 +1973,7 @@ computematchjumps(struct parse *p, struct re_guts *g)
 
 /*
  - pluscount - count + nesting
- == static sopno pluscount(register struct parse *p, register struct re_guts *g);
+ == static sopno pluscount(struct parse *p, struct re_guts *g);
  */
 static sopno			/* nesting depth */
 pluscount(struct parse *p, struct re_guts *g)
diff --git a/lib/libcr/rpc/auth_des.c b/lib/libcr/rpc/auth_des.c
index f4da61c983..83ed7e4528 100644
--- a/lib/libcr/rpc/auth_des.c
+++ b/lib/libcr/rpc/auth_des.c
@@ -28,7 +28,7 @@
  *
  * @(#)auth_des.c	2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI
  * $FreeBSD: src/lib/libc/rpc/auth_des.c,v 1.3 1999/08/28 00:00:32 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/auth_des.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/auth_des.c,v 1.4 2004/10/25 19:38:25 drhodus Exp $
  */
 /*
  * Copyright (c) 1988 by Sun Microsystems, Inc.
@@ -422,7 +422,7 @@ authdes_validate(auth, rverf)
 	struct ad_private *ad = AUTH_PRIVATE(auth);
 	struct authdes_verf verf;
 	int status;
-	register u_long *ixdr;
+	u_long *ixdr;
 
 	if (rverf->oa_length != (2 + 1) * BYTES_PER_XDR_UNIT) {
 		return (FALSE);
diff --git a/lib/libcr/rpc/auth_none.c b/lib/libcr/rpc/auth_none.c
index 3a49557629..03a79adbe7 100644
--- a/lib/libcr/rpc/auth_none.c
+++ b/lib/libcr/rpc/auth_none.c
@@ -29,7 +29,7 @@
  * @(#)auth_none.c	1.19 87/08/11 Copyr 1984 Sun Micro
  * @(#)auth_none.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.9 1999/08/28 00:00:32 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/auth_none.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/auth_none.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -72,9 +72,9 @@ static struct authnone_private {
 AUTH *
 authnone_create()
 {
-	register struct authnone_private *ap = authnone_private;
+	struct authnone_private *ap = authnone_private;
 	XDR xdr_stream;
-	register XDR *xdrs;
+	XDR *xdrs;
 
 	if (ap == 0) {
 		ap = (struct authnone_private *)calloc(1, sizeof (*ap));
@@ -102,7 +102,7 @@ authnone_marshal(client, xdrs)
 	AUTH *client;
 	XDR *xdrs;
 {
-	register struct authnone_private *ap = authnone_private;
+	struct authnone_private *ap = authnone_private;
 
 	if (ap == 0)
 		return (0);
diff --git a/lib/libcr/rpc/auth_unix.c b/lib/libcr/rpc/auth_unix.c
index da3a875a9f..e2d0f857ca 100644
--- a/lib/libcr/rpc/auth_unix.c
+++ b/lib/libcr/rpc/auth_unix.c
@@ -29,7 +29,7 @@
  * @(#)auth_unix.c	1.19 87/08/11 Copyr 1984 Sun Micro
  * @(#)auth_unix.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/auth_unix.c,v 1.12 1999/12/29 05:04:16 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/auth_unix.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/auth_unix.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -108,15 +108,15 @@ authunix_create(machname, uid, gid, len, aup_gids)
 	char *machname;
 	int uid;
 	int gid;
-	register int len;
+	int len;
 	int *aup_gids;
 {
 	struct authunix_parms aup;
 	char mymem[MAX_AUTH_BYTES];
 	struct timeval now;
 	XDR xdrs;
-	register AUTH *auth;
-	register struct audata *au;
+	AUTH *auth;
+	struct audata *au;
 
 	/*
 	 * Allocate and set up auth handle
@@ -190,10 +190,10 @@ authunix_create(machname, uid, gid, len, aup_gids)
 AUTH *
 authunix_create_default()
 {
-	register int len;
+	int len;
 	char machname[MAX_MACHINE_NAME + 1];
-	register int uid;
-	register int gid;
+	int uid;
+	int gid;
 	int gids[NGRPS];
 	int i;
 	gid_t real_gids[NGROUPS];
@@ -228,17 +228,17 @@ authunix_marshal(auth, xdrs)
 	AUTH *auth;
 	XDR *xdrs;
 {
-	register struct audata *au = AUTH_PRIVATE(auth);
+	struct audata *au = AUTH_PRIVATE(auth);
 
 	return (XDR_PUTBYTES(xdrs, au->au_marshed, au->au_mpos));
 }
 
 static bool_t
 authunix_validate(auth, verf)
-	register AUTH *auth;
+	AUTH *auth;
 	struct opaque_auth verf;
 {
-	register struct audata *au;
+	struct audata *au;
 	XDR xdrs;
 
 	if (verf.oa_flavor == AUTH_SHORT) {
@@ -265,13 +265,13 @@ authunix_validate(auth, verf)
 
 static bool_t
 authunix_refresh(auth)
-	register AUTH *auth;
+	AUTH *auth;
 {
-	register struct audata *au = AUTH_PRIVATE(auth);
+	struct audata *au = AUTH_PRIVATE(auth);
 	struct authunix_parms aup;
 	struct timeval now;
 	XDR xdrs;
-	register int stat;
+	int stat;
 
 	if (auth->ah_cred.oa_base == au->au_origcred.oa_base) {
 		/* there is no hope.  Punt */
@@ -308,9 +308,9 @@ done:
 
 static void
 authunix_destroy(auth)
-	register AUTH *auth;
+	AUTH *auth;
 {
-	register struct audata *au = AUTH_PRIVATE(auth);
+	struct audata *au = AUTH_PRIVATE(auth);
 
 	mem_free(au->au_origcred.oa_base, au->au_origcred.oa_length);
 
@@ -331,11 +331,11 @@ authunix_destroy(auth)
  */
 static void
 marshal_new_auth(auth)
-	register AUTH *auth;
+	AUTH *auth;
 {
 	XDR		xdr_stream;
-	register XDR	*xdrs = &xdr_stream;
-	register struct audata *au = AUTH_PRIVATE(auth);
+	XDR	*xdrs = &xdr_stream;
+	struct audata *au = AUTH_PRIVATE(auth);
 
 	xdrmem_create(xdrs, au->au_marshed, MAX_AUTH_BYTES, XDR_ENCODE);
 	if ((! xdr_opaque_auth(xdrs, &(auth->ah_cred))) ||
diff --git a/lib/libcr/rpc/authdes_prot.c b/lib/libcr/rpc/authdes_prot.c
index 14679c00a9..dfa3acdb72 100644
--- a/lib/libcr/rpc/authdes_prot.c
+++ b/lib/libcr/rpc/authdes_prot.c
@@ -1,6 +1,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = 	"@(#)authdes_prot.c	2.1 88/07/29 4.0 RPCSRC; from 1.6 88/02/08 SMI";
 #endif
+/* $DragonFly: src/lib/libcr/rpc/Attic/authdes_prot.c,v 1.2 2004/10/25 19:38:25 drhodus Exp $								*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -70,8 +71,8 @@ xdr_authdes_cred(xdrs, cred)
 
 bool_t
 xdr_authdes_verf(xdrs, verf)
-	register XDR *xdrs;
-	register struct authdes_verf *verf;	
+	XDR *xdrs;
+	struct authdes_verf *verf;	
 {
 	/*
  	 * Unrolled xdr
diff --git a/lib/libcr/rpc/authunix_prot.c b/lib/libcr/rpc/authunix_prot.c
index 494b0584b6..12b6ba7271 100644
--- a/lib/libcr/rpc/authunix_prot.c
+++ b/lib/libcr/rpc/authunix_prot.c
@@ -29,7 +29,7 @@
  * @(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro
  * @(#)authunix_prot.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/authunix_prot.c,v 1.6 1999/08/28 00:00:33 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/authunix_prot.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/authunix_prot.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -50,8 +50,8 @@
  */
 bool_t
 xdr_authunix_parms(xdrs, p)
-	register XDR *xdrs;
-	register struct authunix_parms *p;
+	XDR *xdrs;
+	struct authunix_parms *p;
 {
 
 	if (xdr_u_long(xdrs, &(p->aup_time))
diff --git a/lib/libcr/rpc/clnt_raw.c b/lib/libcr/rpc/clnt_raw.c
index b739ad4d33..30266578ba 100644
--- a/lib/libcr/rpc/clnt_raw.c
+++ b/lib/libcr/rpc/clnt_raw.c
@@ -29,7 +29,7 @@
  * @(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro
  * @(#)clnt_raw.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/clnt_raw.c,v 1.10 1999/08/28 00:00:36 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/clnt_raw.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/clnt_raw.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -86,7 +86,7 @@ clntraw_create(prog, vers)
 	u_long prog;
 	u_long vers;
 {
-	register struct clntraw_private *clp = clntraw_private;
+	struct clntraw_private *clp = clntraw_private;
 	struct rpc_msg call_msg;
 	XDR *xdrs = &clp->xdr_stream;
 	CLIENT	*client = &clp->client_object;
@@ -134,8 +134,8 @@ clntraw_call(h, proc, xargs, argsp, xresults, resultsp, timeout)
 	caddr_t resultsp;
 	struct timeval timeout;
 {
-	register struct clntraw_private *clp = clntraw_private;
-	register XDR *xdrs = &clp->xdr_stream;
+	struct clntraw_private *clp = clntraw_private;
+	XDR *xdrs = &clp->xdr_stream;
 	struct rpc_msg msg;
 	enum clnt_stat status;
 	struct rpc_err error;
@@ -211,8 +211,8 @@ clntraw_freeres(cl, xdr_res, res_ptr)
 	xdrproc_t xdr_res;
 	caddr_t res_ptr;
 {
-	register struct clntraw_private *clp = clntraw_private;
-	register XDR *xdrs = &clp->xdr_stream;
+	struct clntraw_private *clp = clntraw_private;
+	XDR *xdrs = &clp->xdr_stream;
 	bool_t rval;
 
 	if (clp == 0)
diff --git a/lib/libcr/rpc/clnt_simple.c b/lib/libcr/rpc/clnt_simple.c
index 397b71d4f8..2cd6a20d99 100644
--- a/lib/libcr/rpc/clnt_simple.c
+++ b/lib/libcr/rpc/clnt_simple.c
@@ -29,7 +29,7 @@
  * @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro
  * @(#)clnt_simple.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/clnt_simple.c,v 1.12 2000/01/27 23:06:35 jasone Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/clnt_simple.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/clnt_simple.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -62,7 +62,7 @@ callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out)
 	xdrproc_t inproc, outproc;
 	char *in, *out;
 {
-	register struct callrpc_private *crp = callrpc_private;
+	struct callrpc_private *crp = callrpc_private;
 	struct sockaddr_in server_addr;
 	enum clnt_stat clnt_stat;
 	struct hostent *hp;
diff --git a/lib/libcr/rpc/clnt_tcp.c b/lib/libcr/rpc/clnt_tcp.c
index 2b9c21a603..56d084abe7 100644
--- a/lib/libcr/rpc/clnt_tcp.c
+++ b/lib/libcr/rpc/clnt_tcp.c
@@ -29,7 +29,7 @@
  * @(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro
  * @(#)clnt_tcp.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/clnt_tcp.c,v 1.14 2000/01/27 23:06:36 jasone Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/clnt_tcp.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/clnt_tcp.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -113,12 +113,12 @@ clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
 	struct sockaddr_in *raddr;
 	u_long prog;
 	u_long vers;
-	register int *sockp;
+	int *sockp;
 	u_int sendsz;
 	u_int recvsz;
 {
 	CLIENT *h;
-	register struct ct_data *ct = NULL;
+	struct ct_data *ct = NULL;
 	struct timeval now;
 	struct rpc_msg call_msg;
 	static u_int32_t disrupt;
@@ -230,7 +230,7 @@ fooy:
 
 static enum clnt_stat
 clnttcp_call(h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
-	register CLIENT *h;
+	CLIENT *h;
 	u_long proc;
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
@@ -238,12 +238,12 @@ clnttcp_call(h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
 	caddr_t results_ptr;
 	struct timeval timeout;
 {
-	register struct ct_data *ct = (struct ct_data *) h->cl_private;
-	register XDR *xdrs = &(ct->ct_xdrs);
+	struct ct_data *ct = (struct ct_data *) h->cl_private;
+	XDR *xdrs = &(ct->ct_xdrs);
 	struct rpc_msg reply_msg;
 	u_long x_id;
 	u_int32_t *msg_x_id = (u_int32_t *)(ct->ct_mcall);	/* yuk */
-	register bool_t shipnow;
+	bool_t shipnow;
 	int refreshes = 2;
 
 	if (!ct->ct_waitset) {
@@ -330,7 +330,7 @@ clnttcp_geterr(h, errp)
 	CLIENT *h;
 	struct rpc_err *errp;
 {
-	register struct ct_data *ct =
+	struct ct_data *ct =
 	    (struct ct_data *) h->cl_private;
 
 	*errp = ct->ct_error;
@@ -342,8 +342,8 @@ clnttcp_freeres(cl, xdr_res, res_ptr)
 	xdrproc_t xdr_res;
 	caddr_t res_ptr;
 {
-	register struct ct_data *ct = (struct ct_data *)cl->cl_private;
-	register XDR *xdrs = &(ct->ct_xdrs);
+	struct ct_data *ct = (struct ct_data *)cl->cl_private;
+	XDR *xdrs = &(ct->ct_xdrs);
 
 	xdrs->x_op = XDR_FREE;
 	return ((*xdr_res)(xdrs, res_ptr));
@@ -361,8 +361,8 @@ clnttcp_control(cl, request, info)
 	int request;
 	char *info;
 {
-	register struct ct_data *ct = (struct ct_data *)cl->cl_private;
-	register struct timeval *tv;
+	struct ct_data *ct = (struct ct_data *)cl->cl_private;
+	struct timeval *tv;
 	int len;
 
 	switch (request) {
@@ -469,7 +469,7 @@ static void
 clnttcp_destroy(h)
 	CLIENT *h;
 {
-	register struct ct_data *ct =
+	struct ct_data *ct =
 	    (struct ct_data *) h->cl_private;
 
 	if (ct->ct_closeit) {
@@ -487,9 +487,9 @@ clnttcp_destroy(h)
  */
 static int
 readtcp(ct, buf, len)
-	register struct ct_data *ct;
+	struct ct_data *ct;
 	caddr_t buf;
-	register int len;
+	int len;
 {
 	fd_set *fds, readfds;
 	struct timeval start, after, duration, delta, tmp, tv;
@@ -566,7 +566,7 @@ writetcp(ct, buf, len)
 	caddr_t buf;
 	int len;
 {
-	register int i, cnt;
+	int i, cnt;
 
 	for (cnt = len; cnt > 0; cnt -= i, buf += i) {
 		if ((i = _write(ct->ct_sock, buf, cnt)) == -1) {
diff --git a/lib/libcr/rpc/clnt_udp.c b/lib/libcr/rpc/clnt_udp.c
index 071d869947..9095b4debb 100644
--- a/lib/libcr/rpc/clnt_udp.c
+++ b/lib/libcr/rpc/clnt_udp.c
@@ -29,7 +29,7 @@
  * @(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro
  * @(#)clnt_udp.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/clnt_udp.c,v 1.15.2.1 2001/06/28 21:44:24 iedowse Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/clnt_udp.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/clnt_udp.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -111,12 +111,12 @@ clntudp_bufcreate(raddr, program, version, wait, sockp, sendsz, recvsz)
 	u_long program;
 	u_long version;
 	struct timeval wait;
-	register int *sockp;
+	int *sockp;
 	u_int sendsz;
 	u_int recvsz;
 {
 	CLIENT *cl;
-	register struct cu_data *cu = NULL;
+	struct cu_data *cu = NULL;
 	struct timeval now;
 	struct rpc_msg call_msg;
 	static u_int32_t disrupt;
@@ -207,7 +207,7 @@ clntudp_create(raddr, program, version, wait, sockp)
 	u_long program;
 	u_long version;
 	struct timeval wait;
-	register int *sockp;
+	int *sockp;
 {
 
 	return(clntudp_bufcreate(raddr, program, version, wait, sockp,
@@ -216,7 +216,7 @@ clntudp_create(raddr, program, version, wait, sockp)
 
 static enum clnt_stat
 clntudp_call(cl, proc, xargs, argsp, xresults, resultsp, utimeout)
-	register CLIENT	*cl;		/* client handle */
+	CLIENT	*cl;		/* client handle */
 	u_long		proc;		/* procedure number */
 	xdrproc_t	xargs;		/* xdr routine for args */
 	caddr_t		argsp;		/* pointer to args */
@@ -224,10 +224,10 @@ clntudp_call(cl, proc, xargs, argsp, xresults, resultsp, utimeout)
 	caddr_t		resultsp;	/* pointer to results */
 	struct timeval	utimeout;	/* seconds to wait before giving up */
 {
-	register struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	register XDR *xdrs;
-	register int outlen;
-	register int inlen;
+	struct cu_data *cu = (struct cu_data *)cl->cl_private;
+	XDR *xdrs;
+	int outlen;
+	int inlen;
 	struct sockaddr *sa;
 	int fromlen;
 	fd_set *fds, readfds;
@@ -430,7 +430,7 @@ clntudp_geterr(cl, errp)
 	CLIENT *cl;
 	struct rpc_err *errp;
 {
-	register struct cu_data *cu = (struct cu_data *)cl->cl_private;
+	struct cu_data *cu = (struct cu_data *)cl->cl_private;
 
 	*errp = cu->cu_error;
 }
@@ -442,8 +442,8 @@ clntudp_freeres(cl, xdr_res, res_ptr)
 	xdrproc_t xdr_res;
 	caddr_t res_ptr;
 {
-	register struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	register XDR *xdrs = &(cu->cu_outxdrs);
+	struct cu_data *cu = (struct cu_data *)cl->cl_private;
+	XDR *xdrs = &(cu->cu_outxdrs);
 
 	xdrs->x_op = XDR_FREE;
 	return ((*xdr_res)(xdrs, res_ptr));
@@ -462,8 +462,8 @@ clntudp_control(cl, request, info)
 	int request;
 	char *info;
 {
-	register struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	register struct timeval *tv;
+	struct cu_data *cu = (struct cu_data *)cl->cl_private;
+	struct timeval *tv;
 	int len;
 
 	switch (request) {
@@ -581,7 +581,7 @@ static void
 clntudp_destroy(cl)
 	CLIENT *cl;
 {
-	register struct cu_data *cu = (struct cu_data *)cl->cl_private;
+	struct cu_data *cu = (struct cu_data *)cl->cl_private;
 
 	if (cu->cu_closeit) {
 		(void)_close(cu->cu_sock);
diff --git a/lib/libcr/rpc/clnt_unix.c b/lib/libcr/rpc/clnt_unix.c
index cb6dbabbb1..965f957acc 100644
--- a/lib/libcr/rpc/clnt_unix.c
+++ b/lib/libcr/rpc/clnt_unix.c
@@ -29,7 +29,7 @@
  * @(#)clnt_unix.c 1.37 87/10/05 Copyr 1984 Sun Micro
  * @(#)clnt_unix.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/clnt_unix.c,v 1.5 2000/01/27 23:06:37 jasone Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/clnt_unix.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/clnt_unix.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -115,12 +115,12 @@ clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz)
 	struct sockaddr_un *raddr;
 	u_long prog;
 	u_long vers;
-	register int *sockp;
+	int *sockp;
 	u_int sendsz;
 	u_int recvsz;
 {
 	CLIENT *h;
-	register struct ct_data *ct = NULL;
+	struct ct_data *ct = NULL;
 	struct timeval now;
 	struct rpc_msg call_msg;
 	static u_int32_t disrupt;
@@ -221,7 +221,7 @@ fooy:
 
 static enum clnt_stat
 clntunix_call(h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
-	register CLIENT *h;
+	CLIENT *h;
 	u_long proc;
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
@@ -229,12 +229,12 @@ clntunix_call(h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
 	caddr_t results_ptr;
 	struct timeval timeout;
 {
-	register struct ct_data *ct = (struct ct_data *) h->cl_private;
-	register XDR *xdrs = &(ct->ct_xdrs);
+	struct ct_data *ct = (struct ct_data *) h->cl_private;
+	XDR *xdrs = &(ct->ct_xdrs);
 	struct rpc_msg reply_msg;
 	u_long x_id;
 	u_int32_t *msg_x_id = (u_int32_t *)(ct->ct_mcall);	/* yuk */
-	register bool_t shipnow;
+	bool_t shipnow;
 	int refreshes = 2;
 
 	if (!ct->ct_waitset) {
@@ -321,7 +321,7 @@ clntunix_geterr(h, errp)
 	CLIENT *h;
 	struct rpc_err *errp;
 {
-	register struct ct_data *ct =
+	struct ct_data *ct =
 	    (struct ct_data *) h->cl_private;
 
 	*errp = ct->ct_error;
@@ -333,8 +333,8 @@ clntunix_freeres(cl, xdr_res, res_ptr)
 	xdrproc_t xdr_res;
 	caddr_t res_ptr;
 {
-	register struct ct_data *ct = (struct ct_data *)cl->cl_private;
-	register XDR *xdrs = &(ct->ct_xdrs);
+	struct ct_data *ct = (struct ct_data *)cl->cl_private;
+	XDR *xdrs = &(ct->ct_xdrs);
 
 	xdrs->x_op = XDR_FREE;
 	return ((*xdr_res)(xdrs, res_ptr));
@@ -352,8 +352,8 @@ clntunix_control(cl, request, info)
 	int request;
 	char *info;
 {
-	register struct ct_data *ct = (struct ct_data *)cl->cl_private;
-	register struct timeval *tv;
+	struct ct_data *ct = (struct ct_data *)cl->cl_private;
+	struct timeval *tv;
 	int len;
 
 	switch (request) {
@@ -460,7 +460,7 @@ static void
 clntunix_destroy(h)
 	CLIENT *h;
 {
-	register struct ct_data *ct =
+	struct ct_data *ct =
 	    (struct ct_data *) h->cl_private;
 
 	if (ct->ct_closeit) {
@@ -542,9 +542,9 @@ static int __msgwrite(sock, buf, cnt)
  */
 static int
 readunix(ct, buf, len)
-	register struct ct_data *ct;
+	struct ct_data *ct;
 	caddr_t buf;
-	register int len;
+	int len;
 {
 	fd_set *fds, readfds;
 	struct timeval start, after, duration, delta, tmp, tv;
@@ -621,7 +621,7 @@ writeunix(ct, buf, len)
 	caddr_t buf;
 	int len;
 {
-	register int i, cnt;
+	int i, cnt;
 
 	for (cnt = len; cnt > 0; cnt -= i, buf += i) {
 		if ((i = __msgwrite(ct->ct_sock, buf, cnt)) == -1) {
diff --git a/lib/libcr/rpc/des_crypt.c b/lib/libcr/rpc/des_crypt.c
index 44e28da487..afc01c82b3 100644
--- a/lib/libcr/rpc/des_crypt.c
+++ b/lib/libcr/rpc/des_crypt.c
@@ -28,7 +28,7 @@
  *
  * @(#)des_crypt.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI
  * $FreeBSD: src/lib/libc/rpc/des_crypt.c,v 1.3 1999/08/28 00:00:38 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/des_crypt.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/des_crypt.c,v 1.4 2004/10/25 19:38:25 drhodus Exp $
  */
 /*
  * des_crypt.c, DES encryption library routines
@@ -39,15 +39,15 @@
 #include <rpc/des_crypt.h>
 #include <rpc/des.h>
 
-static int common_crypt	( char *, char *, register unsigned, unsigned, struct desparams * );
+static int common_crypt	( char *, char *, unsigned, unsigned, struct desparams * );
 int (*__des_crypt_LOCAL)() = 0;
 extern _des_crypt_call ( char *, int, struct desparams * );
 /*
  * Copy 8 bytes
  */
 #define COPY8(src, dst) { \
-	register char *a = (char *) dst; \
-	register char *b = (char *) src; \
+	char *a = (char *) dst; \
+	char *b = (char *) src; \
 	*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
 	*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
 }
@@ -56,9 +56,9 @@ extern _des_crypt_call ( char *, int, struct desparams * );
  * Copy multiple of 8 bytes
  */
 #define DESCOPY(src, dst, len) { \
-	register char *a = (char *) dst; \
-	register char *b = (char *) src; \
-	register int i; \
+	char *a = (char *) dst; \
+	char *b = (char *) src; \
+	int i; \
 	for (i = (int) len; i > 0; i -= 8) { \
 		*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
 		*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
@@ -122,11 +122,11 @@ static int
 common_crypt(key, buf, len, mode, desp)	
 	char *key;	
 	char *buf;
-	register unsigned len;
+	unsigned len;
 	unsigned mode;
-	register struct desparams *desp;
+	struct desparams *desp;
 {
-	register int desdev;
+	int desdev;
 
 	if ((len % 8) != 0 || len > DES_MAXDATA) {
 		return(DESERR_BADPARAM);
diff --git a/lib/libcr/rpc/getrpcent.c b/lib/libcr/rpc/getrpcent.c
index f07438a59d..d283f9429d 100644
--- a/lib/libcr/rpc/getrpcent.c
+++ b/lib/libcr/rpc/getrpcent.c
@@ -29,7 +29,7 @@
  *
  * @(#)getrpcent.c 1.14 91/03/11 Copyr 1984 Sun Micro
  * $FreeBSD: src/lib/libc/rpc/getrpcent.c,v 1.10 1999/08/28 00:00:39 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/getrpcent.c,v 1.2 2003/06/17 04:26:44 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/getrpcent.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -77,7 +77,7 @@ static char RPCDB[] = "/etc/rpc";
 static struct rpcdata *
 _rpcdata()
 {
-	register struct rpcdata *d = rpcdata;
+	struct rpcdata *d = rpcdata;
 
 	if (d == 0) {
 		d = (struct rpcdata *)calloc(1, sizeof (struct rpcdata));
@@ -88,10 +88,10 @@ _rpcdata()
 
 struct rpcent *
 getrpcbynumber(number)
-	register int number;
+	int number;
 {
-	register struct rpcdata *d = _rpcdata();
-	register struct rpcent *p;
+	struct rpcdata *d = _rpcdata();
+	struct rpcent *p;
 #ifdef	YP
 	int reason;
 	char adrstr[16];
@@ -156,7 +156,7 @@ void
 setrpcent(f)
 	int f;
 {
-	register struct rpcdata *d = _rpcdata();
+	struct rpcdata *d = _rpcdata();
 
 	if (d == 0)
 		return;
@@ -180,7 +180,7 @@ setrpcent(f)
 void
 endrpcent()
 {
-	register struct rpcdata *d = _rpcdata();
+	struct rpcdata *d = _rpcdata();
 
 	if (d == 0)
 		return;
@@ -203,7 +203,7 @@ endrpcent()
 struct rpcent *
 getrpcent()
 {
-	register struct rpcdata *d = _rpcdata();
+	struct rpcdata *d = _rpcdata();
 #ifdef	YP
 	struct rpcent *hp;
 	int reason;
@@ -256,9 +256,9 @@ interpret(val, len)
 	char *val;
 	int len;
 {
-	register struct rpcdata *d = _rpcdata();
+	struct rpcdata *d = _rpcdata();
 	char *p;
-	register char *cp, **q;
+	char *cp, **q;
 
 	if (d == 0)
 		return (0);
diff --git a/lib/libcr/rpc/key_call.c b/lib/libcr/rpc/key_call.c
index 5d5308ad15..dd253d7667 100644
--- a/lib/libcr/rpc/key_call.c
+++ b/lib/libcr/rpc/key_call.c
@@ -30,7 +30,7 @@
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
  *
  * $FreeBSD: src/lib/libc/rpc/key_call.c,v 1.3 2000/01/27 23:06:39 jasone Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/key_call.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/key_call.c,v 1.4 2004/10/25 19:38:25 drhodus Exp $
  */
 
 #ident	"@(#)key_call.c	1.25	94/04/24 SMI"
@@ -279,7 +279,7 @@ static struct key_call_private *key_call_private_main = NULL;
 static void
 key_call_destroy(void *vp)
 {
-	register struct key_call_private *kcp = (struct key_call_private *)vp;
+	struct key_call_private *kcp = (struct key_call_private *)vp;
 
 	if (kcp) {
 		if (kcp->client)
diff --git a/lib/libcr/rpc/key_prot_xdr.c b/lib/libcr/rpc/key_prot_xdr.c
index 8cd6b6b067..87096b64af 100644
--- a/lib/libcr/rpc/key_prot_xdr.c
+++ b/lib/libcr/rpc/key_prot_xdr.c
@@ -2,6 +2,7 @@
  * Please do not edit this file.
  * It was generated using rpcgen.
  */
+/* $DragonFly: src/lib/libcr/rpc/Attic/key_prot_xdr.c,v 1.2 2004/10/25 19:38:25 drhodus Exp $								*/
 
 #include <rpc/key_prot.h>
 /*
@@ -43,7 +44,7 @@
  */
 
 bool_t
-xdr_keystatus(register XDR *xdrs, keystatus *objp)
+xdr_keystatus(XDR *xdrs, keystatus *objp)
 {
 
 	if (!xdr_enum(xdrs, (enum_t *)objp))
@@ -52,7 +53,7 @@ xdr_keystatus(register XDR *xdrs, keystatus *objp)
 }
 
 bool_t
-xdr_keybuf(register XDR *xdrs, keybuf objp)
+xdr_keybuf(XDR *xdrs, keybuf objp)
 {
 
 	if (!xdr_opaque(xdrs, objp, HEXKEYBYTES))
@@ -61,7 +62,7 @@ xdr_keybuf(register XDR *xdrs, keybuf objp)
 }
 
 bool_t
-xdr_netnamestr(register XDR *xdrs, netnamestr *objp)
+xdr_netnamestr(XDR *xdrs, netnamestr *objp)
 {
 
 	if (!xdr_string(xdrs, objp, MAXNETNAMELEN))
@@ -70,7 +71,7 @@ xdr_netnamestr(register XDR *xdrs, netnamestr *objp)
 }
 
 bool_t
-xdr_cryptkeyarg(register XDR *xdrs, cryptkeyarg *objp)
+xdr_cryptkeyarg(XDR *xdrs, cryptkeyarg *objp)
 {
 
 	if (!xdr_netnamestr(xdrs, &objp->remotename))
@@ -81,7 +82,7 @@ xdr_cryptkeyarg(register XDR *xdrs, cryptkeyarg *objp)
 }
 
 bool_t
-xdr_cryptkeyarg2(register XDR *xdrs, cryptkeyarg2 *objp)
+xdr_cryptkeyarg2(XDR *xdrs, cryptkeyarg2 *objp)
 {
 
 	if (!xdr_netnamestr(xdrs, &objp->remotename))
@@ -94,7 +95,7 @@ xdr_cryptkeyarg2(register XDR *xdrs, cryptkeyarg2 *objp)
 }
 
 bool_t
-xdr_cryptkeyres(register XDR *xdrs, cryptkeyres *objp)
+xdr_cryptkeyres(XDR *xdrs, cryptkeyres *objp)
 {
 
 	if (!xdr_keystatus(xdrs, &objp->status))
@@ -109,7 +110,7 @@ xdr_cryptkeyres(register XDR *xdrs, cryptkeyres *objp)
 }
 
 bool_t
-xdr_unixcred(register XDR *xdrs, unixcred *objp)
+xdr_unixcred(XDR *xdrs, unixcred *objp)
 {
 
 	if (!xdr_u_int(xdrs, &objp->uid))
@@ -123,7 +124,7 @@ xdr_unixcred(register XDR *xdrs, unixcred *objp)
 }
 
 bool_t
-xdr_getcredres(register XDR *xdrs, getcredres *objp)
+xdr_getcredres(XDR *xdrs, getcredres *objp)
 {
 
 	if (!xdr_keystatus(xdrs, &objp->status))
@@ -138,7 +139,7 @@ xdr_getcredres(register XDR *xdrs, getcredres *objp)
 }
 
 bool_t
-xdr_key_netstarg(register XDR *xdrs, key_netstarg *objp)
+xdr_key_netstarg(XDR *xdrs, key_netstarg *objp)
 {
 
 	if (!xdr_keybuf(xdrs, objp->st_priv_key))
@@ -151,7 +152,7 @@ xdr_key_netstarg(register XDR *xdrs, key_netstarg *objp)
 }
 
 bool_t
-xdr_key_netstres(register XDR *xdrs, key_netstres *objp)
+xdr_key_netstres(XDR *xdrs, key_netstres *objp)
 {
 
 	if (!xdr_keystatus(xdrs, &objp->status))
diff --git a/lib/libcr/rpc/netnamer.c b/lib/libcr/rpc/netnamer.c
index 6e19097f55..0107e648ca 100644
--- a/lib/libcr/rpc/netnamer.c
+++ b/lib/libcr/rpc/netnamer.c
@@ -28,7 +28,7 @@
  * Mountain View, California  94043
  *
  * $FreeBSD: src/lib/libc/rpc/netnamer.c,v 1.3.6.1 2000/09/20 04:43:11 jkh Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/netnamer.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/netnamer.c,v 1.4 2004/10/25 19:38:25 drhodus Exp $
  *
  * @(#)netnamer.c 1.13 91/03/11 Copyr 1986 Sun Micro
  */
@@ -155,9 +155,9 @@ _getgroups(uname, groups)
 	gid_t          groups[NGROUPS];
 {
 	gid_t           ngroups = 0;
-	register struct group *grp;
-	register int    i;
-	register int    j;
+	struct group *grp;
+	int    i;
+	int    j;
 	int             filter;
 
 	setgrent();
diff --git a/lib/libcr/rpc/pmap_clnt.c b/lib/libcr/rpc/pmap_clnt.c
index f8685732bc..65e224f02d 100644
--- a/lib/libcr/rpc/pmap_clnt.c
+++ b/lib/libcr/rpc/pmap_clnt.c
@@ -29,7 +29,7 @@
  * @(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro
  * @(#)pmap_clnt.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/pmap_clnt.c,v 1.11 2000/01/27 23:06:39 jasone Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/pmap_clnt.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/pmap_clnt.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -69,7 +69,7 @@ pmap_set(program, version, protocol, port)
 {
 	struct sockaddr_in myaddress;
 	int socket = -1;
-	register CLIENT *client;
+	CLIENT *client;
 	struct pmap parms;
 	bool_t rslt;
 	struct stat st;
@@ -116,7 +116,7 @@ pmap_unset(program, version)
 {
 	struct sockaddr_in myaddress;
 	int socket = -1;
-	register CLIENT *client;
+	CLIENT *client;
 	struct pmap parms;
 	bool_t rslt;
 	struct stat st;
diff --git a/lib/libcr/rpc/pmap_getmaps.c b/lib/libcr/rpc/pmap_getmaps.c
index 05fcd40766..2c243cc07a 100644
--- a/lib/libcr/rpc/pmap_getmaps.c
+++ b/lib/libcr/rpc/pmap_getmaps.c
@@ -29,7 +29,7 @@
  * @(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro
  * @(#)pmap_getmaps.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/pmap_getmaps.c,v 1.11 2000/01/27 23:06:39 jasone Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/pmap_getmaps.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/pmap_getmaps.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -64,7 +64,7 @@ pmap_getmaps(address)
 	struct pmaplist *head = (struct pmaplist *)NULL;
 	int socket = -1;
 	struct timeval minutetimeout;
-	register CLIENT *client;
+	CLIENT *client;
 
 	minutetimeout.tv_sec = 60;
 	minutetimeout.tv_usec = 0;
diff --git a/lib/libcr/rpc/pmap_getport.c b/lib/libcr/rpc/pmap_getport.c
index 5d7740aae6..ed99838f98 100644
--- a/lib/libcr/rpc/pmap_getport.c
+++ b/lib/libcr/rpc/pmap_getport.c
@@ -29,7 +29,7 @@
  * @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro
  * @(#)pmap_getport.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/pmap_getport.c,v 1.10 2000/01/27 23:06:40 jasone Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/pmap_getport.c,v 1.3 2003/12/08 13:56:35 eirikn Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/pmap_getport.c,v 1.4 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -75,7 +75,7 @@ pmap_getport(address, program, version, protocol)
 {
 	u_short port = 0;
 	int socket = -1;
-	register CLIENT *client;
+	CLIENT *client;
 	struct pmap parms;
 
 	address->sin_port = htons(PMAPPORT);
diff --git a/lib/libcr/rpc/pmap_prot2.c b/lib/libcr/rpc/pmap_prot2.c
index 01a8876c53..5ebb147063 100644
--- a/lib/libcr/rpc/pmap_prot2.c
+++ b/lib/libcr/rpc/pmap_prot2.c
@@ -29,7 +29,7 @@
  * @(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro
  * @(#)pmap_prot2.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/pmap_prot2.c,v 1.7 1999/08/28 00:00:42 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/pmap_prot2.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/pmap_prot2.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -84,8 +84,8 @@
  */
 bool_t
 xdr_pmaplist(xdrs, rp)
-	register XDR *xdrs;
-	register struct pmaplist **rp;
+	XDR *xdrs;
+	struct pmaplist **rp;
 {
 	/*
 	 * more_elements is pre-computed in case the direction is
@@ -93,8 +93,8 @@ xdr_pmaplist(xdrs, rp)
 	 * xdr_bool when the direction is XDR_DECODE.
 	 */
 	bool_t more_elements;
-	register int freeing = (xdrs->x_op == XDR_FREE);
-	register struct pmaplist **next = NULL;
+	int freeing = (xdrs->x_op == XDR_FREE);
+	struct pmaplist **next = NULL;
 
 	while (TRUE) {
 		more_elements = (bool_t)(*rp != NULL);
diff --git a/lib/libcr/rpc/pmap_rmt.c b/lib/libcr/rpc/pmap_rmt.c
index 01adb41fa5..14b3c7391a 100644
--- a/lib/libcr/rpc/pmap_rmt.c
+++ b/lib/libcr/rpc/pmap_rmt.c
@@ -29,7 +29,7 @@
  * @(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro
  * @(#)pmap_rmt.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/pmap_rmt.c,v 1.16.2.1 2002/06/30 23:34:58 iedowse Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/pmap_rmt.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/pmap_rmt.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -74,7 +74,7 @@ pmap_rmtcall(addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, port_pt
 	u_long *port_ptr;
 {
 	int socket = -1;
-	register CLIENT *client;
+	CLIENT *client;
 	struct rmtcallargs a;
 	struct rmtcallres r;
 	enum clnt_stat stat;
@@ -109,8 +109,8 @@ pmap_rmtcall(addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, port_pt
  */
 bool_t
 xdr_rmtcall_args(xdrs, cap)
-	register XDR *xdrs;
-	register struct rmtcallargs *cap;
+	XDR *xdrs;
+	struct rmtcallargs *cap;
 {
 	u_int lenposition, argposition, position;
 
@@ -140,8 +140,8 @@ xdr_rmtcall_args(xdrs, cap)
  */
 bool_t
 xdr_rmtcallres(xdrs, crp)
-	register XDR *xdrs;
-	register struct rmtcallres *crp;
+	XDR *xdrs;
+	struct rmtcallres *crp;
 {
 	caddr_t port_ptr;
 
@@ -237,14 +237,14 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)
 	enum clnt_stat stat;
 	AUTH *unix_auth = authunix_create_default();
 	XDR xdr_stream;
-	register XDR *xdrs = &xdr_stream;
+	XDR *xdrs = &xdr_stream;
 	int outlen, inlen, fromlen, nets;
-	register int sock;
+	int sock;
 	int on = 1;
 	fd_set *fds, readfds;
-	register int i;
+	int i;
 	bool_t done = FALSE;
-	register u_long xid;
+	u_long xid;
 	u_long port;
 	struct in_addr addrs[20];
 	struct sockaddr_in baddr, raddr; /* broadcast and response addresses */
diff --git a/lib/libcr/rpc/rpc_callmsg.c b/lib/libcr/rpc/rpc_callmsg.c
index 8e0a888fed..96e9c0753b 100644
--- a/lib/libcr/rpc/rpc_callmsg.c
+++ b/lib/libcr/rpc/rpc_callmsg.c
@@ -29,7 +29,7 @@
  * @(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro
  * @(#)rpc_callmsg.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/rpc_callmsg.c,v 1.9 1999/08/28 00:00:45 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/rpc_callmsg.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/rpc_callmsg.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -49,11 +49,11 @@
  */
 bool_t
 xdr_callmsg(xdrs, cmsg)
-	register XDR *xdrs;
-	register struct rpc_msg *cmsg;
+	XDR *xdrs;
+	struct rpc_msg *cmsg;
 {
-	register int32_t *buf;
-	register struct opaque_auth *oa;
+	int32_t *buf;
+	struct opaque_auth *oa;
 
 	if (xdrs->x_op == XDR_ENCODE) {
 		if (cmsg->rm_call.cb_cred.oa_length > MAX_AUTH_BYTES) {
diff --git a/lib/libcr/rpc/rpc_prot.c b/lib/libcr/rpc/rpc_prot.c
index 1b22be6ae8..841bb73701 100644
--- a/lib/libcr/rpc/rpc_prot.c
+++ b/lib/libcr/rpc/rpc_prot.c
@@ -29,7 +29,7 @@
  * @(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro
  * @(#)rpc_prot.c	2.3 88/08/07 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/rpc_prot.c,v 1.8 1999/08/28 00:00:46 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/rpc_prot.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/rpc_prot.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -59,8 +59,8 @@ struct opaque_auth _null_auth;
  */
 bool_t
 xdr_opaque_auth(xdrs, ap)
-	register XDR *xdrs;
-	register struct opaque_auth *ap;
+	XDR *xdrs;
+	struct opaque_auth *ap;
 {
 
 	if (xdr_enum(xdrs, &(ap->oa_flavor)))
@@ -74,8 +74,8 @@ xdr_opaque_auth(xdrs, ap)
  */
 bool_t
 xdr_des_block(xdrs, blkp)
-	register XDR *xdrs;
-	register des_block *blkp;
+	XDR *xdrs;
+	des_block *blkp;
 {
 	return (xdr_opaque(xdrs, (caddr_t)blkp, sizeof(des_block)));
 }
@@ -87,8 +87,8 @@ xdr_des_block(xdrs, blkp)
  */
 bool_t
 xdr_accepted_reply(xdrs, ar)
-	register XDR *xdrs;
-	register struct accepted_reply *ar;
+	XDR *xdrs;
+	struct accepted_reply *ar;
 {
 
 	/* personalized union, rather than calling xdr_union */
@@ -116,8 +116,8 @@ xdr_accepted_reply(xdrs, ar)
  */
 bool_t
 xdr_rejected_reply(xdrs, rr)
-	register XDR *xdrs;
-	register struct rejected_reply *rr;
+	XDR *xdrs;
+	struct rejected_reply *rr;
 {
 
 	/* personalized union, rather than calling xdr_union */
@@ -146,8 +146,8 @@ static struct xdr_discrim reply_dscrm[3] = {
  */
 bool_t
 xdr_replymsg(xdrs, rmsg)
-	register XDR *xdrs;
-	register struct rpc_msg *rmsg;
+	XDR *xdrs;
+	struct rpc_msg *rmsg;
 {
 	if (
 	    xdr_u_int32_t(xdrs, &(rmsg->rm_xid)) &&
@@ -166,8 +166,8 @@ xdr_replymsg(xdrs, rmsg)
  */
 bool_t
 xdr_callhdr(xdrs, cmsg)
-	register XDR *xdrs;
-	register struct rpc_msg *cmsg;
+	XDR *xdrs;
+	struct rpc_msg *cmsg;
 {
 
 	cmsg->rm_direction = CALL;
@@ -186,8 +186,8 @@ xdr_callhdr(xdrs, cmsg)
 
 static void
 accepted(acpt_stat, error)
-	register enum accept_stat acpt_stat;
-	register struct rpc_err *error;
+	enum accept_stat acpt_stat;
+	struct rpc_err *error;
 {
 
 	switch (acpt_stat) {
@@ -224,8 +224,8 @@ accepted(acpt_stat, error)
 
 static void
 rejected(rjct_stat, error)
-	register enum reject_stat rjct_stat;
-	register struct rpc_err *error;
+	enum reject_stat rjct_stat;
+	struct rpc_err *error;
 {
 
 	switch (rjct_stat) {
@@ -251,8 +251,8 @@ rejected(rjct_stat, error)
  */
 void
 _seterr_reply(msg, error)
-	register struct rpc_msg *msg;
-	register struct rpc_err *error;
+	struct rpc_msg *msg;
+	struct rpc_err *error;
 {
 
 	/* optimized for normal, SUCCESSful case */
diff --git a/lib/libcr/rpc/svc.c b/lib/libcr/rpc/svc.c
index c0a275aaee..b52a2aa064 100644
--- a/lib/libcr/rpc/svc.c
+++ b/lib/libcr/rpc/svc.c
@@ -29,7 +29,7 @@
  * @(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro
  * @(#)svc.c	2.4 88/08/11 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/svc.c,v 1.14.2.1 2001/03/05 10:50:36 obrien Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/svc.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/svc.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -82,7 +82,7 @@ void
 xprt_register(xprt)
 	SVCXPRT *xprt;
 {
-	register int sock = xprt->xp_sock;
+	int sock = xprt->xp_sock;
 
 	if (sock + 1 > __svc_fdsetsize) {
 		int bytes = howmany(sock + 1, NFDBITS) * sizeof(fd_mask);
@@ -129,7 +129,7 @@ void
 xprt_unregister(xprt)
 	SVCXPRT *xprt;
 {
-	register int sock = xprt->xp_sock;
+	int sock = xprt->xp_sock;
 
 	if (xports[sock] == xprt) {
 		xports[sock] = (SVCXPRT *)0;
@@ -165,7 +165,7 @@ svc_register(xprt, prog, vers, dispatch, protocol)
 	int protocol;
 {
 	struct svc_callout *prev;
-	register struct svc_callout *s;
+	struct svc_callout *s;
 
 	if ((s = svc_find(prog, vers, &prev)) != NULL_SVC) {
 		if (s->sc_dispatch == dispatch)
@@ -198,7 +198,7 @@ svc_unregister(prog, vers)
 	u_long vers;
 {
 	struct svc_callout *prev;
-	register struct svc_callout *s;
+	struct svc_callout *s;
 
 	if ((s = svc_find(prog, vers, &prev)) == NULL_SVC)
 		return;
@@ -223,7 +223,7 @@ svc_find(prog, vers, prev)
 	u_long vers;
 	struct svc_callout **prev;
 {
-	register struct svc_callout *s, *p;
+	struct svc_callout *s, *p;
 
 	p = NULL_SVC;
 	for (s = svc_head; s != NULL_SVC; s = s->sc_next) {
@@ -243,7 +243,7 @@ done:
  */
 bool_t
 svc_sendreply(xprt, xdr_results, xdr_location)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	xdrproc_t xdr_results;
 	caddr_t xdr_location;
 {
@@ -263,7 +263,7 @@ svc_sendreply(xprt, xdr_results, xdr_location)
  */
 void
 svcerr_noproc(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
 	struct rpc_msg rply;
 
@@ -279,7 +279,7 @@ svcerr_noproc(xprt)
  */
 void
 svcerr_decode(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
 	struct rpc_msg rply;
 
@@ -295,7 +295,7 @@ svcerr_decode(xprt)
  */
 void
 svcerr_systemerr(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
 	struct rpc_msg rply;
 
@@ -339,7 +339,7 @@ svcerr_weakauth(xprt)
  */
 void
 svcerr_noprog(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
 	struct rpc_msg rply;
 
@@ -355,7 +355,7 @@ svcerr_noprog(xprt)
  */
 void
 svcerr_progvers(xprt, low_vers, high_vers)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	u_long low_vers;
 	u_long high_vers;
 {
@@ -417,10 +417,10 @@ svc_getreqset2(readfds, width)
 	u_long low_vers;
 	u_long high_vers;
 	struct svc_req r;
-	register SVCXPRT *xprt;
-	register int bit;
-	register int sock;
-	register fd_mask mask, *maskp;
+	SVCXPRT *xprt;
+	int bit;
+	int sock;
+	fd_mask mask, *maskp;
 	char cred_area[2*MAX_AUTH_BYTES + RQCRED_SIZE];
 	msg.rm_call.cb_cred.oa_base = cred_area;
 	msg.rm_call.cb_verf.oa_base = &(cred_area[MAX_AUTH_BYTES]);
@@ -440,7 +440,7 @@ svc_getreqset2(readfds, width)
 			if (SVC_RECV(xprt, &msg)) {
 
 				/* now find the exported program and call it */
-				register struct svc_callout *s;
+				struct svc_callout *s;
 				enum auth_stat why;
 
 				r.rq_xprt = xprt;
diff --git a/lib/libcr/rpc/svc_auth.c b/lib/libcr/rpc/svc_auth.c
index ab3f0a6b27..a5c7299add 100644
--- a/lib/libcr/rpc/svc_auth.c
+++ b/lib/libcr/rpc/svc_auth.c
@@ -28,7 +28,7 @@
  *
  * @(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro
  * $FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.7 1999/12/29 05:04:16 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/svc_auth.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/svc_auth.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
@@ -66,8 +66,8 @@
  *
  *	enum auth_stat
  *	flavorx_auth(rqst, msg)
- *		register struct svc_req *rqst;
- *		register struct rpc_msg *msg;
+ *		struct svc_req *rqst;
+ *		struct rpc_msg *msg;
  *
  */
 
@@ -104,11 +104,11 @@ static struct authsvc *Auths = NULL;
  */
 enum auth_stat
 _authenticate(rqst, msg)
-	register struct svc_req *rqst;
+	struct svc_req *rqst;
 	struct rpc_msg *msg;
 {
-	register int cred_flavor;
-	register struct authsvc *asp;
+	int cred_flavor;
+	struct authsvc *asp;
 
 	rqst->rq_cred = msg->rm_call.cb_cred;
 	rqst->rq_xprt->xp_verf.oa_flavor = _null_auth.oa_flavor;
@@ -173,10 +173,10 @@ _svcauth_null(rqst, msg)
 
 int
 svc_auth_reg(cred_flavor, handler)
-	register int cred_flavor;
+	int cred_flavor;
 	enum auth_stat (*handler)();
 {
-	register struct authsvc *asp;
+	struct authsvc *asp;
 
 	switch (cred_flavor) {
 	    case AUTH_NULL:
diff --git a/lib/libcr/rpc/svc_auth_des.c b/lib/libcr/rpc/svc_auth_des.c
index 508769b1b7..4181e8f923 100644
--- a/lib/libcr/rpc/svc_auth_des.c
+++ b/lib/libcr/rpc/svc_auth_des.c
@@ -4,7 +4,7 @@
  *
  * @(#)svcauth_des.c	2.3 89/07/11 4.0 RPCSRC; from 1.15 88/02/08 SMI
  * $FreeBSD: src/lib/libc/rpc/svc_auth_des.c,v 1.3 1999/08/28 00:00:48 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/svc_auth_des.c,v 1.3 2004/02/03 07:34:10 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/svc_auth_des.c,v 1.4 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -103,16 +103,16 @@ static struct {
  */
 enum auth_stat
 _svcauth_des(rqst, msg)
-	register struct svc_req *rqst;
-	register struct rpc_msg *msg;
+	struct svc_req *rqst;
+	struct rpc_msg *msg;
 {
 
-	register long *ixdr;
+	long *ixdr;
 	des_block cryptbuf[2];
-	register struct authdes_cred *cred;
+	struct authdes_cred *cred;
 	struct authdes_verf verf;
 	int status;
-	register struct cache_entry *entry;
+	struct cache_entry *entry;
 	short sid = 0;
 	des_block *sessionkey;
 	des_block ivec;
@@ -350,7 +350,7 @@ _svcauth_des(rqst, msg)
 static void
 cache_init()
 {
-	register int i;
+	int i;
 
 	authdes_cache = (struct cache_entry *)
 		mem_alloc(sizeof(struct cache_entry) * AUTHDES_CACHESZ);	
@@ -381,11 +381,11 @@ cache_victim()
  */
 static void
 cache_ref(sid)
-	register short sid;
+	short sid;
 {
-	register int i;
-	register short curr;
-	register short prev;
+	int i;
+	short curr;
+	short prev;
 
 	prev = authdes_lru[0];
 	authdes_lru[0] = sid;
@@ -404,13 +404,13 @@ cache_ref(sid)
  */
 static short
 cache_spot(key, name, timestamp)
-	register des_block *key;
+	des_block *key;
 	char *name;
 	struct timeval *timestamp;
 {
-	register struct cache_entry *cp;
-	register int i;
-	register u_long hi;
+	struct cache_entry *cp;
+	int i;
+	u_long hi;
 
 	hi = key->key.high;
 	for (cp = authdes_cache, i = 0; i < AUTHDES_CACHESZ; i++, cp++) {
@@ -460,10 +460,10 @@ authdes_getucred(adc, uid, gid, grouplen, groups)
 	uid_t *uid;
 	gid_t *gid;
 	int *grouplen;
-	register gid_t *groups;
+	gid_t *groups;
 {
 	unsigned sid;
-	register int i;
+	int i;
 	uid_t i_uid;	
 	gid_t i_gid;
 	int i_grouplen;
diff --git a/lib/libcr/rpc/svc_auth_unix.c b/lib/libcr/rpc/svc_auth_unix.c
index 713b0a0492..02306e2295 100644
--- a/lib/libcr/rpc/svc_auth_unix.c
+++ b/lib/libcr/rpc/svc_auth_unix.c
@@ -29,7 +29,7 @@
  * @(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro
  * @(#)svc_auth_unix.c	2.3 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/svc_auth_unix.c,v 1.8 1999/08/28 00:00:49 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/svc_auth_unix.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/svc_auth_unix.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -52,13 +52,13 @@
  */
 enum auth_stat
 _svcauth_unix(rqst, msg)
-	register struct svc_req *rqst;
-	register struct rpc_msg *msg;
+	struct svc_req *rqst;
+	struct rpc_msg *msg;
 {
-	register enum auth_stat stat;
+	enum auth_stat stat;
 	XDR xdrs;
-	register struct authunix_parms *aup;
-	register int32_t *buf;
+	struct authunix_parms *aup;
+	int32_t *buf;
 	struct area {
 		struct authunix_parms area_aup;
 		char area_machname[MAX_MACHINE_NAME+1];
@@ -66,7 +66,7 @@ _svcauth_unix(rqst, msg)
 	} *area;
 	u_int auth_len;
 	int str_len, gid_len;
-	register int i;
+	int i;
 
 	area = (struct area *) rqst->rq_clntcred;
 	aup = &area->area_aup;
diff --git a/lib/libcr/rpc/svc_raw.c b/lib/libcr/rpc/svc_raw.c
index 8a674608a9..1b5c7fad9d 100644
--- a/lib/libcr/rpc/svc_raw.c
+++ b/lib/libcr/rpc/svc_raw.c
@@ -29,7 +29,7 @@
  * @(#)svc_raw.c 1.15 87/08/11 Copyr 1984 Sun Micro
  * @(#)svc_raw.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/svc_raw.c,v 1.7 1999/08/28 00:00:49 peter Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/svc_raw.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/svc_raw.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -73,7 +73,7 @@ static struct xp_ops server_ops = {
 SVCXPRT *
 svcraw_create()
 {
-	register struct svcraw_private *srp = svcraw_private;
+	struct svcraw_private *srp = svcraw_private;
 
 	if (srp == 0) {
 		srp = (struct svcraw_private *)calloc(1, sizeof (*srp));
@@ -100,8 +100,8 @@ svcraw_recv(xprt, msg)
 	SVCXPRT *xprt;
 	struct rpc_msg *msg;
 {
-	register struct svcraw_private *srp = svcraw_private;
-	register XDR *xdrs;
+	struct svcraw_private *srp = svcraw_private;
+	XDR *xdrs;
 
 	if (srp == 0)
 		return (0);
@@ -118,8 +118,8 @@ svcraw_reply(xprt, msg)
 	SVCXPRT *xprt;
 	struct rpc_msg *msg;
 {
-	register struct svcraw_private *srp = svcraw_private;
-	register XDR *xdrs;
+	struct svcraw_private *srp = svcraw_private;
+	XDR *xdrs;
 
 	if (srp == 0)
 		return (FALSE);
@@ -138,7 +138,7 @@ svcraw_getargs(xprt, xdr_args, args_ptr)
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
 {
-	register struct svcraw_private *srp = svcraw_private;
+	struct svcraw_private *srp = svcraw_private;
 
 	if (srp == 0)
 		return (FALSE);
@@ -151,8 +151,8 @@ svcraw_freeargs(xprt, xdr_args, args_ptr)
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
 {
-	register struct svcraw_private *srp = svcraw_private;
-	register XDR *xdrs;
+	struct svcraw_private *srp = svcraw_private;
+	XDR *xdrs;
 
 	if (srp == 0)
 		return (FALSE);
diff --git a/lib/libcr/rpc/svc_tcp.c b/lib/libcr/rpc/svc_tcp.c
index b4c63ae96b..0bf043f987 100644
--- a/lib/libcr/rpc/svc_tcp.c
+++ b/lib/libcr/rpc/svc_tcp.c
@@ -29,7 +29,7 @@
  * @(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro
  * @(#)svc_tcp.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/svc_tcp.c,v 1.18.2.3 2001/09/05 22:29:23 dec Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/svc_tcp.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/svc_tcp.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -122,13 +122,13 @@ struct tcp_conn {  /* kept in xprt->xp_p1 */
  */
 SVCXPRT *
 svctcp_create(sock, sendsize, recvsize)
-	register int sock;
+	int sock;
 	u_int sendsize;
 	u_int recvsize;
 {
 	bool_t madesock = FALSE;
-	register SVCXPRT *xprt;
-	register struct tcp_rendezvous *r;
+	SVCXPRT *xprt;
+	struct tcp_rendezvous *r;
 	struct sockaddr_in addr;
 	int len = sizeof(struct sockaddr_in);
 	int on;
@@ -203,8 +203,8 @@ makefd_xprt(fd, sendsize, recvsize)
 	u_int sendsize;
 	u_int recvsize;
 {
-	register SVCXPRT *xprt;
-	register struct tcp_conn *cd;
+	SVCXPRT *xprt;
+	struct tcp_conn *cd;
 
 	xprt = (SVCXPRT *)mem_alloc(sizeof(SVCXPRT));
 	if (xprt == (SVCXPRT *)NULL) {
@@ -235,7 +235,7 @@ makefd_xprt(fd, sendsize, recvsize)
 
 static bool_t
 rendezvous_request(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
 	int sock;
 	struct tcp_rendezvous *r;
@@ -285,9 +285,9 @@ rendezvous_stat()
 
 static void
 svctcp_destroy(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
-	register struct tcp_conn *cd = (struct tcp_conn *)xprt->xp_p1;
+	struct tcp_conn *cd = (struct tcp_conn *)xprt->xp_p1;
 
 	xprt_unregister(xprt);
 	(void)_close(xprt->xp_sock);
@@ -322,11 +322,11 @@ static struct timeval wait_per_try = { 35, 0 };
  */
 static int
 readtcp(xprt, buf, len)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	caddr_t buf;
-	register int len;
+	int len;
 {
-	register int sock = xprt->xp_sock;
+	int sock = xprt->xp_sock;
 	struct timeval start, delta, tv;
 	struct timeval tmp1, tmp2;
 	fd_set *fds;
@@ -394,11 +394,11 @@ fatal_err:
  */
 static int
 writetcp(xprt, buf, len)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	caddr_t buf;
 	int len;
 {
-	register int i, cnt;
+	int i, cnt;
 
 	for (cnt = len; cnt > 0; cnt -= i, buf += i) {
 		if ((i = _write(xprt->xp_sock, buf, cnt)) < 0) {
@@ -414,7 +414,7 @@ static enum xprt_stat
 svctcp_stat(xprt)
 	SVCXPRT *xprt;
 {
-	register struct tcp_conn *cd =
+	struct tcp_conn *cd =
 	    (struct tcp_conn *)(xprt->xp_p1);
 
 	if (cd->strm_stat == XPRT_DIED)
@@ -427,11 +427,11 @@ svctcp_stat(xprt)
 static bool_t
 svctcp_recv(xprt, msg)
 	SVCXPRT *xprt;
-	register struct rpc_msg *msg;
+	struct rpc_msg *msg;
 {
-	register struct tcp_conn *cd =
+	struct tcp_conn *cd =
 	    (struct tcp_conn *)(xprt->xp_p1);
-	register XDR *xdrs = &(cd->xdrs);
+	XDR *xdrs = &(cd->xdrs);
 
 	xdrs->x_op = XDR_DECODE;
 	(void)xdrrec_skiprecord(xdrs);
@@ -459,7 +459,7 @@ svctcp_freeargs(xprt, xdr_args, args_ptr)
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
 {
-	register XDR *xdrs =
+	XDR *xdrs =
 	    &(((struct tcp_conn *)(xprt->xp_p1))->xdrs);
 
 	xdrs->x_op = XDR_FREE;
@@ -469,12 +469,12 @@ svctcp_freeargs(xprt, xdr_args, args_ptr)
 static bool_t
 svctcp_reply(xprt, msg)
 	SVCXPRT *xprt;
-	register struct rpc_msg *msg;
+	struct rpc_msg *msg;
 {
-	register struct tcp_conn *cd =
+	struct tcp_conn *cd =
 	    (struct tcp_conn *)(xprt->xp_p1);
-	register XDR *xdrs = &(cd->xdrs);
-	register bool_t stat;
+	XDR *xdrs = &(cd->xdrs);
+	bool_t stat;
 
 	xdrs->x_op = XDR_ENCODE;
 	msg->rm_xid = cd->x_id;
diff --git a/lib/libcr/rpc/svc_udp.c b/lib/libcr/rpc/svc_udp.c
index b370839819..ca2d538a27 100644
--- a/lib/libcr/rpc/svc_udp.c
+++ b/lib/libcr/rpc/svc_udp.c
@@ -29,7 +29,7 @@
  * @(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro
  * @(#)svc_udp.c	2.2 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/svc_udp.c,v 1.13 2000/01/27 23:06:41 jasone Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/svc_udp.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/svc_udp.c,v 1.4 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -96,12 +96,12 @@ struct svcudp_data {
  */
 SVCXPRT *
 svcudp_bufcreate(sock, sendsz, recvsz)
-	register int sock;
+	int sock;
 	u_int sendsz, recvsz;
 {
 	bool_t madesock = FALSE;
-	register SVCXPRT *xprt;
-	register struct svcudp_data *su;
+	SVCXPRT *xprt;
+	struct svcudp_data *su;
 	struct sockaddr_in addr;
 	int len = sizeof(struct sockaddr_in);
 
@@ -170,12 +170,12 @@ svcudp_stat(xprt)
 
 static bool_t
 svcudp_recv(xprt, msg)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	struct rpc_msg *msg;
 {
-	register struct svcudp_data *su = su_data(xprt);
-	register XDR *xdrs = &(su->su_xdrs);
-	register int rlen;
+	struct svcudp_data *su = su_data(xprt);
+	XDR *xdrs = &(su->su_xdrs);
+	int rlen;
 	char *reply;
 	u_long replylen;
 
@@ -204,13 +204,13 @@ svcudp_recv(xprt, msg)
 
 static bool_t
 svcudp_reply(xprt, msg)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	struct rpc_msg *msg;
 {
-	register struct svcudp_data *su = su_data(xprt);
-	register XDR *xdrs = &(su->su_xdrs);
-	register int slen;
-	register bool_t stat = FALSE;
+	struct svcudp_data *su = su_data(xprt);
+	XDR *xdrs = &(su->su_xdrs);
+	int slen;
+	bool_t stat = FALSE;
 
 	xdrs->x_op = XDR_ENCODE;
 	XDR_SETPOS(xdrs, 0);
@@ -245,7 +245,7 @@ svcudp_freeargs(xprt, xdr_args, args_ptr)
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
 {
-	register XDR *xdrs = &(su_data(xprt)->su_xdrs);
+	XDR *xdrs = &(su_data(xprt)->su_xdrs);
 
 	xdrs->x_op = XDR_FREE;
 	return ((*xdr_args)(xdrs, args_ptr));
@@ -253,9 +253,9 @@ svcudp_freeargs(xprt, xdr_args, args_ptr)
 
 static void
 svcudp_destroy(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
-	register struct svcudp_data *su = su_data(xprt);
+	struct svcudp_data *su = su_data(xprt);
 
 	xprt_unregister(xprt);
 	(void)_close(xprt->xp_sock);
@@ -380,9 +380,9 @@ cache_set(xprt, replylen)
 	SVCXPRT *xprt;
 	u_long replylen;
 {
-	register cache_ptr victim;
-	register cache_ptr *vicp;
-	register struct svcudp_data *su = su_data(xprt);
+	cache_ptr victim;
+	cache_ptr *vicp;
+	struct svcudp_data *su = su_data(xprt);
 	struct udp_cache *uc = (struct udp_cache *) su->su_cache;
 	u_int loc;
 	char *newbuf;
@@ -448,9 +448,9 @@ cache_get(xprt, msg, replyp, replylenp)
 	u_long *replylenp;
 {
 	u_int loc;
-	register cache_ptr ent;
-	register struct svcudp_data *su = su_data(xprt);
-	register struct udp_cache *uc = (struct udp_cache *) su->su_cache;
+	cache_ptr ent;
+	struct svcudp_data *su = su_data(xprt);
+	struct udp_cache *uc = (struct udp_cache *) su->su_cache;
 
 #	define EQADDR(a1, a2)	(memcmp(&a1, &a2, sizeof(a1)) == 0)
 
diff --git a/lib/libcr/rpc/svc_unix.c b/lib/libcr/rpc/svc_unix.c
index 4662586755..7e77eca9b1 100644
--- a/lib/libcr/rpc/svc_unix.c
+++ b/lib/libcr/rpc/svc_unix.c
@@ -29,7 +29,7 @@
  * @(#)svc_unix.c 1.21 87/08/11 Copyr 1984 Sun Micro
  * @(#)svc_unix.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/rpc/svc_unix.c,v 1.7.2.2 2001/09/05 22:29:23 dec Exp $
- * $DragonFly: src/lib/libcr/rpc/Attic/svc_unix.c,v 1.2 2003/06/17 04:26:45 dillon Exp $
+ * $DragonFly: src/lib/libcr/rpc/Attic/svc_unix.c,v 1.3 2004/10/25 19:38:25 drhodus Exp $
  */
 
 /*
@@ -181,14 +181,14 @@ static int __msgwrite(sock, buf, cnt)
  */
 SVCXPRT *
 svcunix_create(sock, sendsize, recvsize, path)
-	register int sock;
+	int sock;
 	u_int sendsize;
 	u_int recvsize;
 	char *path;
 {
 	bool_t madesock = FALSE;
-	register SVCXPRT *xprt;
-	register struct unix_rendezvous *r;
+	SVCXPRT *xprt;
+	struct unix_rendezvous *r;
 	struct sockaddr_un addr;
 	int len = sizeof(struct sockaddr_un);
 
@@ -257,8 +257,8 @@ makefd_xprt(fd, sendsize, recvsize)
 	u_int sendsize;
 	u_int recvsize;
 {
-	register SVCXPRT *xprt;
-	register struct unix_conn *cd;
+	SVCXPRT *xprt;
+	struct unix_conn *cd;
 
 	xprt = (SVCXPRT *)mem_alloc(sizeof(SVCXPRT));
 	if (xprt == (SVCXPRT *)NULL) {
@@ -289,7 +289,7 @@ makefd_xprt(fd, sendsize, recvsize)
 
 static bool_t
 rendezvous_request(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
 	int sock;
 	struct unix_rendezvous *r;
@@ -327,9 +327,9 @@ rendezvous_stat()
 
 static void
 svcunix_destroy(xprt)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 {
-	register struct unix_conn *cd = (struct unix_conn *)xprt->xp_p1;
+	struct unix_conn *cd = (struct unix_conn *)xprt->xp_p1;
 
 	xprt_unregister(xprt);
 	(void)_close(xprt->xp_sock);
@@ -364,11 +364,11 @@ static struct timeval wait_per_try = { 35, 0 };
  */
 static int
 readunix(xprt, buf, len)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	caddr_t buf;
-	register int len;
+	int len;
 {
-	register int sock = xprt->xp_sock;
+	int sock = xprt->xp_sock;
 	struct timeval start, delta, tv;
 	struct timeval tmp1, tmp2;
 	fd_set *fds;
@@ -436,11 +436,11 @@ fatal_err:
  */
 static int
 writeunix(xprt, buf, len)
-	register SVCXPRT *xprt;
+	SVCXPRT *xprt;
 	caddr_t buf;
 	int len;
 {
-	register int i, cnt;
+	int i, cnt;
 
 	for (cnt = len; cnt > 0; cnt -= i, buf += i) {
 		if ((i = __msgwrite(xprt->xp_sock, buf, cnt)) < 0) {
@@ -456,7 +456,7 @@ static enum xprt_stat
 svcunix_stat(xprt)
 	SVCXPRT *xprt;
 {
-	register struct unix_conn *cd =
+	struct unix_conn *cd =
 	    (struct unix_conn *)(xprt->xp_p1);
 
 	if (cd->strm_stat == XPRT_DIED)
@@ -469,11 +469,11 @@ svcunix_stat(xprt)
 static bool_t
 svcunix_recv(xprt, msg)
 	SVCXPRT *xprt;
-	register struct rpc_msg *msg;
+	struct rpc_msg *msg;
 {
-	register struct unix_conn *cd =
+	struct unix_conn *cd =
 	    (struct unix_conn *)(xprt->xp_p1);
-	register XDR *xdrs = &(cd->xdrs);
+	XDR *xdrs = &(cd->xdrs);
 
 	xdrs->x_op = XDR_DECODE;
 	(void)xdrrec_skiprecord(xdrs);
@@ -505,7 +505,7 @@ svcunix_freeargs(xprt, xdr_args, args_ptr)
 	xdrproc_t xdr_args;
 	caddr_t args_ptr;
 {
-	register XDR *xdrs =
+	XDR *xdrs =
 	    &(((struct unix_conn *)(xprt->xp_p1))->xdrs);
 
 	xdrs->x_op = XDR_FREE;
@@ -515,12 +515,12 @@ svcunix_freeargs(xprt, xdr_args, args_ptr)
 static bool_t
 svcunix_reply(xprt, msg)
 	SVCXPRT *xprt;
-	register struct rpc_msg *msg;
+	struct rpc_msg *msg;
 {
-	register struct unix_conn *cd =
+	struct unix_conn *cd =
 	    (struct unix_conn *)(xprt->xp_p1);
-	register XDR *xdrs = &(cd->xdrs);
-	register bool_t stat;
+	XDR *xdrs = &(cd->xdrs);
+	bool_t stat;
 
 	xdrs->x_op = XDR_ENCODE;
 	msg->rm_xid = cd->x_id;
diff --git a/lib/libcr/stdtime/asctime.c b/lib/libcr/stdtime/asctime.c
index 1e0457efa0..b5f11a0c63 100644
--- a/lib/libcr/stdtime/asctime.c
+++ b/lib/libcr/stdtime/asctime.c
@@ -3,7 +3,7 @@
 ** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
 **
 ** $FreeBSD: src/lib/libc/stdtime/asctime.c,v 1.7.6.1 2001/03/05 11:37:20 obrien Exp $
-** $DragonFly: src/lib/libcr/stdtime/Attic/asctime.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+** $DragonFly: src/lib/libcr/stdtime/Attic/asctime.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
 */
 
 /*
@@ -47,8 +47,8 @@ char *result;
 	** three explicit spaces, two explicit colons, a newline,
 	** and a trailing ASCII nul).
 	*/
-	register const char *	wn;
-	register const char *	mn;
+	const char *	wn;
+	const char *	mn;
 
 	if (timeptr->tm_wday < 0 || timeptr->tm_wday >= DAYSPERWEEK)
 		wn = "???";
diff --git a/lib/libcr/stdtime/localtime.c b/lib/libcr/stdtime/localtime.c
index 1c42aa879e..72b09e8bbb 100644
--- a/lib/libcr/stdtime/localtime.c
+++ b/lib/libcr/stdtime/localtime.c
@@ -3,7 +3,7 @@
 ** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
 **
 ** $FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.25.2.2 2002/08/13 16:08:07 bmilekic Exp $
-** $DragonFly: src/lib/libcr/stdtime/Attic/localtime.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+** $DragonFly: src/lib/libcr/stdtime/Attic/localtime.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
 */
 
 /*
@@ -204,8 +204,8 @@ static long
 detzcode(codep)
 const char * const	codep;
 {
-	register long	result;
-	register int	i;
+	long	result;
+	int	i;
 
 	result = (codep[0] & 0x80) ? ~0L : 0L;
 	for (i = 0; i < 4; ++i)
@@ -216,8 +216,8 @@ const char * const	codep;
 static void
 settzname P((void))
 {
-	register struct state * 	sp = lclptr;
-	register int			i;
+	struct state * 	sp = lclptr;
+	int			i;
 
 	tzname[0] = wildabbr;
 	tzname[1] = wildabbr;
@@ -235,7 +235,7 @@ settzname P((void))
 	}
 #endif /* defined ALL_STATE */
 	for (i = 0; i < sp->typecnt; ++i) {
-		register const struct ttinfo * const	ttisp = &sp->ttis[i];
+		const struct ttinfo * const	ttisp = &sp->ttis[i];
 
 		tzname[ttisp->tt_isdst] =
 			&sp->chars[ttisp->tt_abbrind];
@@ -254,7 +254,7 @@ settzname P((void))
 	** And to get the latest zone names into tzname. . .
 	*/
 	for (i = 0; i < sp->timecnt; ++i) {
-		register const struct ttinfo * const	ttisp =
+		const struct ttinfo * const	ttisp =
 							&sp->ttis[
 								sp->types[i]];
 
@@ -265,12 +265,12 @@ settzname P((void))
 
 static int
 tzload(name, sp)
-register const char *		name;
-register struct state * const	sp;
+const char *		name;
+struct state * const	sp;
 {
-	register const char *	p;
-	register int		i;
-	register int		fid;
+	const char *	p;
+	int		i;
+	int		fid;
 
 	/* XXX The following is from OpenBSD, and I'm not sure it is correct */
 	if (name != NULL && issetugid() != 0)
@@ -280,7 +280,7 @@ register struct state * const	sp;
 	if (name == NULL && (name = TZDEFAULT) == NULL)
 		return -1;
 	{
-		register int	doaccess;
+		int	doaccess;
 		struct stat	stab;
 		/*
 		** Section 4.9.1 of the C standard says that
@@ -366,7 +366,7 @@ register struct state * const	sp;
 				return -1;
 		}
 		for (i = 0; i < sp->typecnt; ++i) {
-			register struct ttinfo *	ttisp;
+			struct ttinfo *	ttisp;
 
 			ttisp = &sp->ttis[i];
 			ttisp->tt_gmtoff = detzcode(p);
@@ -383,7 +383,7 @@ register struct state * const	sp;
 			sp->chars[i] = *p++;
 		sp->chars[i] = '\0';	/* ensure '\0' at end */
 		for (i = 0; i < sp->leapcnt; ++i) {
-			register struct lsinfo *	lsisp;
+			struct lsinfo *	lsisp;
 
 			lsisp = &sp->lsis[i];
 			lsisp->ls_trans = detzcode(p);
@@ -392,7 +392,7 @@ register struct state * const	sp;
 			p += 4;
 		}
 		for (i = 0; i < sp->typecnt; ++i) {
-			register struct ttinfo *	ttisp;
+			struct ttinfo *	ttisp;
 
 			ttisp = &sp->ttis[i];
 			if (ttisstdcnt == 0)
@@ -405,7 +405,7 @@ register struct state * const	sp;
 			}
 		}
 		for (i = 0; i < sp->typecnt; ++i) {
-			register struct ttinfo *	ttisp;
+			struct ttinfo *	ttisp;
 
 			ttisp = &sp->ttis[i];
 			if (ttisgmtcnt == 0)
@@ -438,9 +438,9 @@ static const int	year_lengths[2] = {
 
 static const char *
 getzname(strp)
-register const char *	strp;
+const char *	strp;
 {
-	register char	c;
+	char	c;
 
 	while ((c = *strp) != '\0' && !is_digit(c) && c != ',' && c != '-' &&
 		c != '+')
@@ -457,13 +457,13 @@ register const char *	strp;
 
 static const char *
 getnum(strp, nump, min, max)
-register const char *	strp;
+const char *	strp;
 int * const		nump;
 const int		min;
 const int		max;
 {
-	register char	c;
-	register int	num;
+	char	c;
+	int	num;
 
 	if (strp == NULL || !is_digit(c = *strp))
 		return NULL;
@@ -490,7 +490,7 @@ const int		max;
 
 static const char *
 getsecs(strp, secsp)
-register const char *	strp;
+const char *	strp;
 long * const		secsp;
 {
 	int	num;
@@ -532,10 +532,10 @@ long * const		secsp;
 
 static const char *
 getoffset(strp, offsetp)
-register const char *	strp;
+const char *	strp;
 long * const		offsetp;
 {
-	register int	neg = 0;
+	int	neg = 0;
 
 	if (*strp == '-') {
 		neg = 1;
@@ -560,7 +560,7 @@ long * const		offsetp;
 static const char *
 getrule(strp, rulep)
 const char *			strp;
-register struct rule * const	rulep;
+struct rule * const	rulep;
 {
 	if (*strp == 'J') {
 		/*
@@ -615,12 +615,12 @@ static time_t
 transtime(janfirst, year, rulep, offset)
 const time_t				janfirst;
 const int				year;
-register const struct rule * const	rulep;
+const struct rule * const	rulep;
 const long				offset;
 {
-	register int	leapyear;
-	register time_t	value;
-	register int	i;
+	int	leapyear;
+	time_t	value;
+	int	i;
 	int		d, m1, yy0, yy1, yy2, dow;
 
 	INITIALIZE(value);
@@ -709,7 +709,7 @@ const long				offset;
 static int
 tzparse(name, sp, lastditch)
 const char *			name;
-register struct state * const	sp;
+struct state * const	sp;
 const int			lastditch;
 {
 	const char *			stdname;
@@ -718,10 +718,10 @@ const int			lastditch;
 	size_t				dstlen;
 	long				stdoffset;
 	long				dstoffset;
-	register time_t *		atp;
-	register unsigned char *	typep;
-	register char *			cp;
-	register int			load_result;
+	time_t *		atp;
+	unsigned char *	typep;
+	char *			cp;
+	int			load_result;
 
 	INITIALIZE(dstname);
 	stdname = name;
@@ -761,8 +761,8 @@ const int			lastditch;
 		if (*name == ',' || *name == ';') {
 			struct rule	start;
 			struct rule	end;
-			register int	year;
-			register time_t	janfirst;
+			int	year;
+			time_t	janfirst;
 			time_t		starttime;
 			time_t		endtime;
 
@@ -811,12 +811,12 @@ const int			lastditch;
 					SECSPERDAY;
 			}
 		} else {
-			register long	theirstdoffset;
-			register long	theirdstoffset;
-			register long	theiroffset;
-			register int	isdst;
-			register int	i;
-			register int	j;
+			long	theirstdoffset;
+			long	theirdstoffset;
+			long	theiroffset;
+			int	isdst;
+			int	i;
+			int	j;
 
 			if (*name != '\0')
 				return -1;
@@ -979,7 +979,7 @@ void
 tzset P((void))
 #endif
 {
-	register const char *	name;
+	const char *	name;
 
 	name = getenv("TZ");
 	if (name == NULL) {
@@ -1043,9 +1043,9 @@ const time_t * const	timep;
 const long		offset;
 struct tm * const	tmp;
 {
-	register struct state *		sp;
-	register const struct ttinfo *	ttisp;
-	register int			i;
+	struct state *		sp;
+	const struct ttinfo *	ttisp;
+	int			i;
 	const time_t			t = *timep;
 
 	sp = lclptr;
@@ -1241,18 +1241,18 @@ static void
 timesub(timep, offset, sp, tmp)
 const time_t * const			timep;
 const long				offset;
-register const struct state * const	sp;
-register struct tm * const		tmp;
+const struct state * const	sp;
+struct tm * const		tmp;
 {
-	register const struct lsinfo *	lp;
-	register long			days;
-	register long			rem;
-	register int			y;
-	register int			yleap;
-	register const int *		ip;
-	register long			corr;
-	register int			hit;
-	register int			i;
+	const struct lsinfo *	lp;
+	long			days;
+	long			rem;
+	int			y;
+	int			yleap;
+	const int *		ip;
+	long			corr;
+	int			hit;
+	int			i;
 
 	corr = 0;
 	hit = 0;
@@ -1316,7 +1316,7 @@ register struct tm * const		tmp;
 	y = EPOCH_YEAR;
 #define LEAPS_THRU_END_OF(y)	((y) / 4 - (y) / 100 + (y) / 400)
 	while (days < 0 || days >= (long) year_lengths[yleap = isleap(y)]) {
-		register int	newy;
+		int	newy;
 
 		newy = y + days / DAYSPERNYEAR;
 		if (days < 0)
@@ -1396,7 +1396,7 @@ int * const	tensptr;
 int * const	unitsptr;
 const int	base;
 {
-	register int	tensdelta;
+	int	tensdelta;
 
 	tensdelta = (*unitsptr >= 0) ?
 		(*unitsptr / base) :
@@ -1407,10 +1407,10 @@ const int	base;
 
 static int
 tmcomp(atmp, btmp)
-register const struct tm * const atmp;
-register const struct tm * const btmp;
+const struct tm * const atmp;
+const struct tm * const btmp;
 {
-	register int	result;
+	int	result;
 
 	if ((result = (atmp->tm_year - btmp->tm_year)) == 0 &&
 		(result = (atmp->tm_mon - btmp->tm_mon)) == 0 &&
@@ -1428,11 +1428,11 @@ void (* const		funcp) P((const time_t*, long, struct tm*));
 const long		offset;
 int * const		okayp;
 {
-	register const struct state *	sp;
-	register int			dir;
-	register int			bits;
-	register int			i, j ;
-	register int			saved_seconds;
+	const struct state *	sp;
+	int			dir;
+	int			bits;
+	int			i, j ;
+	int			saved_seconds;
 	time_t				newt;
 	time_t				t;
 	struct tm			yourtm, mytm;
@@ -1573,9 +1573,9 @@ struct tm * const	tmp;
 void (* const		funcp) P((const time_t *, long, struct tm *));
 const long		offset;
 {
-	register time_t			t;
-	register const struct state *	sp;
-	register int			samei, otheri;
+	time_t			t;
+	const struct state *	sp;
+	int			samei, otheri;
 	int				okay;
 
 	if (tmp->tm_isdst > 1)
@@ -1712,9 +1712,9 @@ static long
 leapcorr(timep)
 time_t *	timep;
 {
-	register struct state *		sp;
-	register struct lsinfo *	lp;
-	register int			i;
+	struct state *		sp;
+	struct lsinfo *	lp;
+	int			i;
 
 	sp = lclptr;
 	i = sp->leapcnt;
diff --git a/lib/libcr/string/bcmp.c b/lib/libcr/string/bcmp.c
index 262b2a1f19..364f68ec19 100644
--- a/lib/libcr/string/bcmp.c
+++ b/lib/libcr/string/bcmp.c
@@ -32,7 +32,7 @@
  *
  * @(#)bcmp.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/bcmp.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/bcmp.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/bcmp.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <string.h>
@@ -43,9 +43,9 @@
 int
 bcmp(b1, b2, length)
 	const void *b1, *b2;
-	register size_t length;
+	size_t length;
 {
-	register char *p1, *p2;
+	char *p1, *p2;
 
 	if (length == 0)
 		return(0);
diff --git a/lib/libcr/string/bcopy.c b/lib/libcr/string/bcopy.c
index e5588cb810..723a2636ab 100644
--- a/lib/libcr/string/bcopy.c
+++ b/lib/libcr/string/bcopy.c
@@ -35,7 +35,7 @@
  *
  * @(#)bcopy.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/bcopy.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/bcopy.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/bcopy.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
  
 #include <sys/cdefs.h>
@@ -69,11 +69,11 @@ bcopy(src0, dst0, length)
 #endif
 	void *dst0;
 	const void *src0;
-	register size_t length;
+	size_t length;
 {
-	register char *dst = dst0;
-	register const char *src = src0;
-	register size_t t;
+	char *dst = dst0;
+	const char *src = src0;
+	size_t t;
 
 	if (length == 0 || dst == src)		/* nothing to do */
 		goto done;
diff --git a/lib/libcr/string/ffs.c b/lib/libcr/string/ffs.c
index 16b3b297df..73bad57fc0 100644
--- a/lib/libcr/string/ffs.c
+++ b/lib/libcr/string/ffs.c
@@ -32,7 +32,7 @@
  *
  * @(#)ffs.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/ffs.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/ffs.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/ffs.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <string.h>
@@ -42,9 +42,9 @@
  */
 int
 ffs(mask)
-	register int mask;
+	int mask;
 {
-	register int bit;
+	int bit;
 
 	if (mask == 0)
 		return(0);
diff --git a/lib/libcr/string/index.c b/lib/libcr/string/index.c
index e8bbc5368f..b9d26033ed 100644
--- a/lib/libcr/string/index.c
+++ b/lib/libcr/string/index.c
@@ -32,7 +32,7 @@
  *
  * @(#)index.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/index.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/index.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/index.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -45,7 +45,7 @@ strchr(p, ch)
 #else
 index(p, ch)
 #endif
-	register const char *p, ch;
+	const char *p, ch;
 {
 	for (;; ++p) {
 		if (*p == ch)
diff --git a/lib/libcr/string/memccpy.c b/lib/libcr/string/memccpy.c
index 607250db60..cb7bd2870d 100644
--- a/lib/libcr/string/memccpy.c
+++ b/lib/libcr/string/memccpy.c
@@ -32,7 +32,7 @@
  *
  * @(#)memccpy.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/memccpy.c,v 1.2.12.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/memccpy.c,v 1.3 2003/12/08 13:56:36 eirikn Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/memccpy.c,v 1.4 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -47,9 +47,9 @@ memccpy(t, f, c, n)
 {
 
 	if (n) {
-		register unsigned char *tp = t;
-		register const unsigned char *fp = f;
-		register unsigned char uc = c;
+		unsigned char *tp = t;
+		const unsigned char *fp = f;
+		unsigned char uc = c;
 		do {
 			if ((*tp++ = *fp++) == uc)
 				return (tp);
diff --git a/lib/libcr/string/memchr.c b/lib/libcr/string/memchr.c
index 4ce0221bfd..5fb39bd832 100644
--- a/lib/libcr/string/memchr.c
+++ b/lib/libcr/string/memchr.c
@@ -35,7 +35,7 @@
  *
  * @(#)memchr.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/memchr.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/memchr.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/memchr.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -44,11 +44,11 @@
 void *
 memchr(s, c, n)
 	const void *s;
-	register unsigned char c;
-	register size_t n;
+	unsigned char c;
+	size_t n;
 {
 	if (n != 0) {
-		register const unsigned char *p = s;
+		const unsigned char *p = s;
 
 		do {
 			if (*p++ == c)
diff --git a/lib/libcr/string/memcmp.c b/lib/libcr/string/memcmp.c
index 1beb7f6aa7..87914a4926 100644
--- a/lib/libcr/string/memcmp.c
+++ b/lib/libcr/string/memcmp.c
@@ -35,7 +35,7 @@
  *
  * @(#)memcmp.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/memcmp.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/memcmp.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/memcmp.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -50,7 +50,7 @@ memcmp(s1, s2, n)
 	size_t n;
 {
 	if (n != 0) {
-		register const unsigned char *p1 = s1, *p2 = s2;
+		const unsigned char *p1 = s1, *p2 = s2;
 
 		do {
 			if (*p1++ != *p2++)
diff --git a/lib/libcr/string/memset.c b/lib/libcr/string/memset.c
index 8e8dca09b1..9ce3880187 100644
--- a/lib/libcr/string/memset.c
+++ b/lib/libcr/string/memset.c
@@ -35,7 +35,7 @@
  *
  * @(#)memset.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/memset.c,v 1.4.2.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/memset.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/memset.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -54,7 +54,7 @@
 void
 bzero(dst0, length)
 	void *dst0;
-	register size_t length;
+	size_t length;
 #else
 #define	RETURN	return (dst0)
 #define	VAL	c0
@@ -63,15 +63,15 @@ bzero(dst0, length)
 void *
 memset(dst0, c0, length)
 	void *dst0;
-	register int c0;
-	register size_t length;
+	int c0;
+	size_t length;
 #endif
 {
-	register size_t t;
+	size_t t;
 #ifndef BZERO
-	register u_int c;
+	u_int c;
 #endif
-	register u_char *dst;
+	u_char *dst;
 
 	dst = dst0;
 	/*
diff --git a/lib/libcr/string/rindex.c b/lib/libcr/string/rindex.c
index eb0566e924..19fb1896dd 100644
--- a/lib/libcr/string/rindex.c
+++ b/lib/libcr/string/rindex.c
@@ -32,7 +32,7 @@
  *
  * @(#)rindex.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/rindex.c,v 1.1.1.1.14.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/rindex.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/rindex.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <stddef.h>
@@ -44,10 +44,10 @@ strrchr(p, ch)
 #else
 rindex(p, ch)
 #endif
-	register const char *p;
-	register int ch;
+	const char *p;
+	int ch;
 {
-	register char *save;
+	char *save;
 
 	for (save = NULL;; ++p) {
 		if (*p == ch)
diff --git a/lib/libcr/string/strcasecmp.c b/lib/libcr/string/strcasecmp.c
index 47e78fe25f..110dc6a3d9 100644
--- a/lib/libcr/string/strcasecmp.c
+++ b/lib/libcr/string/strcasecmp.c
@@ -32,7 +32,7 @@
  *
  * @(#)strcasecmp.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strcasecmp.c,v 1.2.8.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strcasecmp.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strcasecmp.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -45,7 +45,7 @@ int
 strcasecmp(s1, s2)
 	const char *s1, *s2;
 {
-	register const u_char
+	const u_char
 			*us1 = (const u_char *)s1,
 			*us2 = (const u_char *)s2;
 
@@ -58,10 +58,10 @@ strcasecmp(s1, s2)
 int
 strncasecmp(s1, s2, n)
 	const char *s1, *s2;
-	register size_t n;
+	size_t n;
 {
 	if (n != 0) {
-		register const u_char
+		const u_char
 				*us1 = (const u_char *)s1,
 				*us2 = (const u_char *)s2;
 
diff --git a/lib/libcr/string/strcasestr.c b/lib/libcr/string/strcasestr.c
index 10622343cf..2c7f7d6d16 100644
--- a/lib/libcr/string/strcasestr.c
+++ b/lib/libcr/string/strcasestr.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/string/strcasestr.c,v 1.2.2.1 2001/12/25 00:36:53 ache Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strcasestr.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strcasestr.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <ctype.h>
@@ -45,10 +45,10 @@
  */
 char *
 strcasestr(s, find)
-	register const char *s, *find;
+	const char *s, *find;
 {
-	register char c, sc;
-	register size_t len;
+	char c, sc;
+	size_t len;
 
 	if ((c = *find++) != 0) {
 		c = tolower((unsigned char)c);
diff --git a/lib/libcr/string/strcat.c b/lib/libcr/string/strcat.c
index 66d9f8bf00..c6a3a3f6ad 100644
--- a/lib/libcr/string/strcat.c
+++ b/lib/libcr/string/strcat.c
@@ -32,15 +32,15 @@
  *
  * @(#)strcat.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strcat.c,v 1.2.2.1 2001/07/09 23:30:03 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strcat.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strcat.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <string.h>
 
 char *
 strcat(s, append)
-	register char *s;
-	register const char *append;
+	char *s;
+	const char *append;
 {
 	char *save = s;
 
diff --git a/lib/libcr/string/strcmp.c b/lib/libcr/string/strcmp.c
index 65389b893a..47e89e3b48 100644
--- a/lib/libcr/string/strcmp.c
+++ b/lib/libcr/string/strcmp.c
@@ -35,7 +35,7 @@
  *
  * @(#)strcmp.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strcmp.c,v 1.2.8.1 2001/07/09 23:30:05 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strcmp.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strcmp.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -46,7 +46,7 @@
  */
 int
 strcmp(s1, s2)
-	register const char *s1, *s2;
+	const char *s1, *s2;
 {
 	while (*s1 == *s2++)
 		if (*s1++ == 0)
diff --git a/lib/libcr/string/strcpy.c b/lib/libcr/string/strcpy.c
index 77b3f45e75..2dac7bfb5e 100644
--- a/lib/libcr/string/strcpy.c
+++ b/lib/libcr/string/strcpy.c
@@ -32,7 +32,7 @@
  *
  * @(#)strcpy.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strcpy.c,v 1.2.2.1 2001/07/09 23:30:06 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strcpy.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strcpy.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -40,8 +40,8 @@
 
 char *
 strcpy(to, from)
-	register char *to;
-	register const char *from;
+	char *to;
+	const char *from;
 {
 	char *save = to;
 
diff --git a/lib/libcr/string/strcspn.c b/lib/libcr/string/strcspn.c
index 32f597be4c..ad039a8700 100644
--- a/lib/libcr/string/strcspn.c
+++ b/lib/libcr/string/strcspn.c
@@ -35,7 +35,7 @@
  *
  * @(#)strcspn.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strcspn.c,v 1.1.1.1.14.1 2001/07/09 23:30:06 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strcspn.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strcspn.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -47,10 +47,10 @@
 size_t
 strcspn(s1, s2)
 	const char *s1;
-	register const char *s2;
+	const char *s2;
 {
-	register const char *p, *spanp;
-	register char c, sc;
+	const char *p, *spanp;
+	char c, sc;
 
 	/*
 	 * Stop as soon as we find any character from s2.  Note that there
diff --git a/lib/libcr/string/strlcat.c b/lib/libcr/string/strlcat.c
index 2842216fe2..501e0ea351 100644
--- a/lib/libcr/string/strlcat.c
+++ b/lib/libcr/string/strlcat.c
@@ -26,7 +26,7 @@
  *
  * $OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $
  * $FreeBSD: src/lib/libc/string/strlcat.c,v 1.2.4.2 2001/07/09 23:30:06 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strlcat.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strlcat.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -44,9 +44,9 @@ size_t strlcat(dst, src, siz)
 	const char *src;
 	size_t siz;
 {
-	register char *d = dst;
-	register const char *s = src;
-	register size_t n = siz;
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
 	size_t dlen;
 
 	/* Find the end of dst and adjust bytes left but don't go past end */
diff --git a/lib/libcr/string/strlcpy.c b/lib/libcr/string/strlcpy.c
index 6cb1eb7291..56d866e73a 100644
--- a/lib/libcr/string/strlcpy.c
+++ b/lib/libcr/string/strlcpy.c
@@ -28,7 +28,7 @@
  *
  * $OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $
  * $FreeBSD: src/lib/libc/string/strlcpy.c,v 1.2.4.1 2001/07/09 23:30:06 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strlcpy.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strlcpy.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -44,9 +44,9 @@ size_t strlcpy(dst, src, siz)
 	const char *src;
 	size_t siz;
 {
-	register char *d = dst;
-	register const char *s = src;
-	register size_t n = siz;
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
 
 	/* Copy as many bytes as will fit */
 	if (n != 0 && --n != 0) {
diff --git a/lib/libcr/string/strlen.c b/lib/libcr/string/strlen.c
index 9d6d57c2c2..59ec70e899 100644
--- a/lib/libcr/string/strlen.c
+++ b/lib/libcr/string/strlen.c
@@ -32,7 +32,7 @@
  *
  * @(#)strlen.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strlen.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strlen.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strlen.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -42,7 +42,7 @@ size_t
 strlen(str)
 	const char *str;
 {
-	register const char *s;
+	const char *s;
 
 	for (s = str; *s; ++s);
 	return(s - str);
diff --git a/lib/libcr/string/strmode.c b/lib/libcr/string/strmode.c
index 7c2c98d976..9fab477e14 100644
--- a/lib/libcr/string/strmode.c
+++ b/lib/libcr/string/strmode.c
@@ -32,7 +32,7 @@
  *
  * @(#)strmode.c	8.3 (Berkeley) 8/15/94
  * $FreeBSD: src/lib/libc/string/strmode.c,v 1.1.1.2.6.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strmode.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strmode.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -41,8 +41,8 @@
 
 void
 strmode(mode, p)
-	register mode_t mode;
-	register char *p;
+	mode_t mode;
+	char *p;
 {
 	 /* print type */
 	switch (mode & S_IFMT) {
diff --git a/lib/libcr/string/strncat.c b/lib/libcr/string/strncat.c
index 13e4c6c0b0..d2d55c2254 100644
--- a/lib/libcr/string/strncat.c
+++ b/lib/libcr/string/strncat.c
@@ -35,7 +35,7 @@
  *
  * @(#)strncat.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strncat.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strncat.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strncat.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -49,11 +49,11 @@ char *
 strncat(dst, src, n)
 	char *dst;
 	const char *src;
-	register size_t n;
+	size_t n;
 {
 	if (n != 0) {
-		register char *d = dst;
-		register const char *s = src;
+		char *d = dst;
+		const char *s = src;
 
 		while (*d != 0)
 			d++;
diff --git a/lib/libcr/string/strncmp.c b/lib/libcr/string/strncmp.c
index 6cc125ebb0..472327ee5f 100644
--- a/lib/libcr/string/strncmp.c
+++ b/lib/libcr/string/strncmp.c
@@ -32,7 +32,7 @@
  *
  * @(#)strncmp.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strncmp.c,v 1.2.8.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strncmp.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strncmp.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -40,8 +40,8 @@
 
 int
 strncmp(s1, s2, n)
-	register const char *s1, *s2;
-	register size_t n;
+	const char *s1, *s2;
+	size_t n;
 {
 
 	if (n == 0)
diff --git a/lib/libcr/string/strncpy.c b/lib/libcr/string/strncpy.c
index f7608e9888..bb029db151 100644
--- a/lib/libcr/string/strncpy.c
+++ b/lib/libcr/string/strncpy.c
@@ -35,7 +35,7 @@
  *
  * @(#)strncpy.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strncpy.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strncpy.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strncpy.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -49,11 +49,11 @@ char *
 strncpy(dst, src, n)
 	char *dst;
 	const char *src;
-	register size_t n;
+	size_t n;
 {
 	if (n != 0) {
-		register char *d = dst;
-		register const char *s = src;
+		char *d = dst;
+		const char *s = src;
 
 		do {
 			if ((*d++ = *s++) == 0) {
diff --git a/lib/libcr/string/strpbrk.c b/lib/libcr/string/strpbrk.c
index b4e4963a4a..044e1289ee 100644
--- a/lib/libcr/string/strpbrk.c
+++ b/lib/libcr/string/strpbrk.c
@@ -32,7 +32,7 @@
  *
  * @(#)strpbrk.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strpbrk.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strpbrk.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strpbrk.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -43,10 +43,10 @@
  */
 char *
 strpbrk(s1, s2)
-	register const char *s1, *s2;
+	const char *s1, *s2;
 {
-	register const char *scanp;
-	register int c, sc;
+	const char *scanp;
+	int c, sc;
 
 	while ((c = *s1++) != 0) {
 		for (scanp = s2; (sc = *scanp++) != 0;)
diff --git a/lib/libcr/string/strsep.c b/lib/libcr/string/strsep.c
index 559c43ccd0..d55f794b3d 100644
--- a/lib/libcr/string/strsep.c
+++ b/lib/libcr/string/strsep.c
@@ -32,7 +32,7 @@
  *
  * @(#)strsep.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strsep.c,v 1.2.12.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strsep.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strsep.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -52,12 +52,12 @@
  */
 char *
 strsep(stringp, delim)
-	register char **stringp;
-	register const char *delim;
+	char **stringp;
+	const char *delim;
 {
-	register char *s;
-	register const char *spanp;
-	register int c, sc;
+	char *s;
+	const char *spanp;
+	int c, sc;
 	char *tok;
 
 	if ((s = *stringp) == NULL)
diff --git a/lib/libcr/string/strsignal.c b/lib/libcr/string/strsignal.c
index cb1ac245a5..6729c3f622 100644
--- a/lib/libcr/string/strsignal.c
+++ b/lib/libcr/string/strsignal.c
@@ -32,7 +32,7 @@
  *
  * @(#)strerror.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strsignal.c,v 1.1.2.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strsignal.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strsignal.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <stdio.h>
@@ -45,8 +45,8 @@ strsignal(num)
 {
 #define	UPREFIX	"Unknown signal: "
 	static char ebuf[40] = UPREFIX;		/* 64-bit number + slop */
-	register unsigned int signum;
-	register char *p, *t;
+	unsigned int signum;
+	char *p, *t;
 	char tmp[40];
 
 	signum = num;				/* convert to unsigned */
diff --git a/lib/libcr/string/strspn.c b/lib/libcr/string/strspn.c
index 236fb7fed5..ea89b8fbc7 100644
--- a/lib/libcr/string/strspn.c
+++ b/lib/libcr/string/strspn.c
@@ -32,7 +32,7 @@
  *
  * @(#)strspn.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strspn.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strspn.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strspn.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -44,10 +44,10 @@
 size_t
 strspn(s1, s2)
 	const char *s1;
-	register const char *s2;
+	const char *s2;
 {
-	register const char *p = s1, *spanp;
-	register char c, sc;
+	const char *p = s1, *spanp;
+	char c, sc;
 
 	/*
 	 * Skip any characters in s2, excluding the terminating \0.
diff --git a/lib/libcr/string/strstr.c b/lib/libcr/string/strstr.c
index 7ed03da3a6..15ae13a178 100644
--- a/lib/libcr/string/strstr.c
+++ b/lib/libcr/string/strstr.c
@@ -35,7 +35,7 @@
  *
  * @(#)strstr.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strstr.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/strstr.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/strstr.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -46,10 +46,10 @@
  */
 char *
 strstr(s, find)
-	register const char *s, *find;
+	const char *s, *find;
 {
-	register char c, sc;
-	register size_t len;
+	char c, sc;
+	size_t len;
 
 	if ((c = *find++) != 0) {
 		len = strlen(find);
diff --git a/lib/libcr/string/swab.c b/lib/libcr/string/swab.c
index 2a35cd468b..9b0f692149 100644
--- a/lib/libcr/string/swab.c
+++ b/lib/libcr/string/swab.c
@@ -35,7 +35,7 @@
  *
  * @(#)swab.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/swab.c,v 1.1.1.1.14.1 2001/07/09 23:30:07 obrien Exp $
- * $DragonFly: src/lib/libcr/string/Attic/swab.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libcr/string/Attic/swab.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 #include <string.h>
@@ -46,9 +46,9 @@ swab(from, to, len)
 	void *to;
 	size_t len;
 {
-	register unsigned long temp;
-	register int n;
-	register char *fp, *tp;
+	unsigned long temp;
+	int n;
+	char *fp, *tp;
 
 	n = (len >> 1) + 1;
 	fp = (char *)from;
diff --git a/lib/libcr/xdr/xdr.c b/lib/libcr/xdr/xdr.c
index ee393e8efd..c81ec23ea7 100644
--- a/lib/libcr/xdr/xdr.c
+++ b/lib/libcr/xdr/xdr.c
@@ -29,7 +29,7 @@
  * @(#)xdr.c 1.35 87/08/12
  * @(#)xdr.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr.c,v 1.9.2.1 2000/05/06 21:16:04 dec Exp $
- * $DragonFly: src/lib/libcr/xdr/Attic/xdr.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libcr/xdr/Attic/xdr.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 /*
@@ -154,7 +154,7 @@ xdr_u_int(xdrs, up)
  */
 bool_t
 xdr_long(xdrs, lp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	long *lp;
 {
 	switch (xdrs->x_op) {
@@ -175,7 +175,7 @@ xdr_long(xdrs, lp)
  */
 bool_t
 xdr_u_long(xdrs, ulp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_long *ulp;
 {
 	switch (xdrs->x_op) {
@@ -196,7 +196,7 @@ xdr_u_long(xdrs, ulp)
  */
 bool_t
 xdr_int32_t(xdrs, int32_p)
-	register XDR *xdrs;
+	XDR *xdrs;
 	int32_t *int32_p;
 {
 	long l;
@@ -226,7 +226,7 @@ xdr_int32_t(xdrs, int32_p)
  */
 bool_t
 xdr_u_int32_t(xdrs, u_int32_p)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_int32_t *u_int32_p;
 {
 	u_long l;
@@ -255,7 +255,7 @@ xdr_u_int32_t(xdrs, u_int32_p)
  */
 bool_t
 xdr_int64_t(xdrs, int64_p)
-	register XDR *xdrs;
+	XDR *xdrs;
 	int64_t *int64_p;
 {
 	u_long ul[2];
@@ -287,7 +287,7 @@ xdr_int64_t(xdrs, int64_p)
  */
 bool_t
 xdr_u_int64_t(xdrs, uint64_p)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_int64_t *uint64_p;
 {
 	u_long ul[2];
@@ -321,7 +321,7 @@ xdr_u_int64_t(xdrs, uint64_p)
  */
 bool_t
 xdr_short(xdrs, sp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	short *sp;
 {
 	long l;
@@ -350,7 +350,7 @@ xdr_short(xdrs, sp)
  */
 bool_t
 xdr_u_short(xdrs, usp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_short *usp;
 {
 	u_long l;
@@ -380,7 +380,7 @@ xdr_u_short(xdrs, usp)
  */
 bool_t
 xdr_int16_t(xdrs, int16_p)
-	register XDR *xdrs;
+	XDR *xdrs;
 	int16_t *int16_p;
 {
 	long l;
@@ -409,7 +409,7 @@ xdr_int16_t(xdrs, int16_p)
  */
 bool_t
 xdr_u_int16_t(xdrs, u_int16_p)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_int16_t *u_int16_p;
 {
 	u_long l;
@@ -475,7 +475,7 @@ xdr_u_char(xdrs, cp)
  */
 bool_t
 xdr_bool(xdrs, bp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	bool_t *bp;
 {
 	long lb;
@@ -536,11 +536,11 @@ xdr_enum(xdrs, ep)
  */
 bool_t
 xdr_opaque(xdrs, cp, cnt)
-	register XDR *xdrs;
+	XDR *xdrs;
 	caddr_t cp;
-	register u_int cnt;
+	u_int cnt;
 {
-	register u_int rndup;
+	u_int rndup;
 	static crud[BYTES_PER_XDR_UNIT];
 
 	/*
@@ -588,13 +588,13 @@ xdr_opaque(xdrs, cp, cnt)
  */
 bool_t
 xdr_bytes(xdrs, cpp, sizep, maxsize)
-	register XDR *xdrs;
+	XDR *xdrs;
 	char **cpp;
-	register u_int *sizep;
+	u_int *sizep;
 	u_int maxsize;
 {
-	register char *sp = *cpp;  /* sp is the actual string pointer */
-	register u_int nodesize;
+	char *sp = *cpp;  /* sp is the actual string pointer */
+	u_int nodesize;
 
 	/*
 	 * first deal with the length since xdr bytes are counted
@@ -663,13 +663,13 @@ xdr_netobj(xdrs, np)
  */
 bool_t
 xdr_union(xdrs, dscmp, unp, choices, dfault)
-	register XDR *xdrs;
+	XDR *xdrs;
 	enum_t *dscmp;		/* enum to decide which arm to work on */
 	char *unp;		/* the union itself */
 	struct xdr_discrim *choices;	/* [value, xdr proc] for each arm */
 	xdrproc_t dfault;	/* default xdr routine */
 {
-	register enum_t dscm;
+	enum_t dscm;
 
 	/*
 	 * we deal with the discriminator;  it's an enum
@@ -712,11 +712,11 @@ xdr_union(xdrs, dscmp, unp, choices, dfault)
  */
 bool_t
 xdr_string(xdrs, cpp, maxsize)
-	register XDR *xdrs;
+	XDR *xdrs;
 	char **cpp;
 	u_int maxsize;
 {
-	register char *sp = *cpp;  /* sp is the actual string pointer */
+	char *sp = *cpp;  /* sp is the actual string pointer */
 	u_int size;
 	u_int nodesize;
 
diff --git a/lib/libcr/xdr/xdr_array.c b/lib/libcr/xdr/xdr_array.c
index 44aa340509..ffbab8e718 100644
--- a/lib/libcr/xdr/xdr_array.c
+++ b/lib/libcr/xdr/xdr_array.c
@@ -29,7 +29,7 @@
  * @(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro
  * @(#)xdr_array.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.8.2.3 2002/08/01 12:23:20 nectar Exp $
- * $DragonFly: src/lib/libcr/xdr/Attic/xdr_array.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libcr/xdr/Attic/xdr_array.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 /*
@@ -59,18 +59,18 @@
  */
 bool_t
 xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc)
-	register XDR *xdrs;
+	XDR *xdrs;
 	caddr_t *addrp;		/* array pointer */
 	u_int *sizep;		/* number of elements */
 	u_int maxsize;		/* max numberof elements */
 	u_int elsize;		/* size in bytes of each element */
 	xdrproc_t elproc;	/* xdr routine to handle each element */
 {
-	register u_int i;
-	register caddr_t target = *addrp;
-	register u_int c;  /* the actual element count */
-	register bool_t stat = TRUE;
-	register u_int nodesize;
+	u_int i;
+	caddr_t target = *addrp;
+	u_int c;  /* the actual element count */
+	bool_t stat = TRUE;
+	u_int nodesize;
 
 	/* like strings, arrays are really counted arrays */
 	if (!xdr_u_int(xdrs, sizep)) {
@@ -135,14 +135,14 @@ xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc)
  */
 bool_t
 xdr_vector(xdrs, basep, nelem, elemsize, xdr_elem)
-	register XDR *xdrs;
-	register char *basep;
-	register u_int nelem;
-	register u_int elemsize;
-	register xdrproc_t xdr_elem;
+	XDR *xdrs;
+	char *basep;
+	u_int nelem;
+	u_int elemsize;
+	xdrproc_t xdr_elem;
 {
-	register u_int i;
-	register char *elptr;
+	u_int i;
+	char *elptr;
 
 	elptr = basep;
 	for (i = 0; i < nelem; i++) {
diff --git a/lib/libcr/xdr/xdr_float.c b/lib/libcr/xdr/xdr_float.c
index e771c07411..2663ebad1b 100644
--- a/lib/libcr/xdr/xdr_float.c
+++ b/lib/libcr/xdr/xdr_float.c
@@ -29,7 +29,7 @@
  * @(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro
  * @(#)xdr_float.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.7 1999/08/28 00:02:55 peter Exp $
- * $DragonFly: src/lib/libcr/xdr/Attic/xdr_float.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libcr/xdr/Attic/xdr_float.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 /*
@@ -93,8 +93,8 @@ static struct sgl_limits {
 
 bool_t
 xdr_float(xdrs, fp)
-	register XDR *xdrs;
-	register float *fp;
+	XDR *xdrs;
+	float *fp;
 {
 #ifdef IEEEFP
 	bool_t rv;
@@ -200,18 +200,18 @@ static struct dbl_limits {
 
 bool_t
 xdr_double(xdrs, dp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	double *dp;
 {
 #ifdef IEEEFP
-	register int32_t *i32p;
+	int32_t *i32p;
 	bool_t rv;
 	long tmpl;
 #else
-	register long *lp;
+	long *lp;
 	struct	ieee_double id;
 	struct	vax_double vd;
-	register struct dbl_limits *lim;
+	struct dbl_limits *lim;
 	int i;
 #endif
 
diff --git a/lib/libcr/xdr/xdr_mem.c b/lib/libcr/xdr/xdr_mem.c
index 027c40d023..f49ead0227 100644
--- a/lib/libcr/xdr/xdr_mem.c
+++ b/lib/libcr/xdr/xdr_mem.c
@@ -29,7 +29,7 @@
  * @(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro
  * @(#)xdr_mem.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr_mem.c,v 1.8.2.1 2003/03/20 12:59:55 jedgar Exp $
- * $DragonFly: src/lib/libcr/xdr/Attic/xdr_mem.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libcr/xdr/Attic/xdr_mem.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 /*
@@ -88,7 +88,7 @@ static struct	xdr_ops xdrmem_ops_unaligned = {
  */
 void
 xdrmem_create(xdrs, addr, size, op)
-	register XDR *xdrs;
+	XDR *xdrs;
 	caddr_t addr;
 	u_int size;
 	enum xdr_op op;
@@ -110,7 +110,7 @@ xdrmem_destroy(/*xdrs*/)
 
 static bool_t
 xdrmem_getlong_aligned(xdrs, lp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	long *lp;
 {
 
@@ -124,7 +124,7 @@ xdrmem_getlong_aligned(xdrs, lp)
 
 static bool_t
 xdrmem_putlong_aligned(xdrs, lp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	long *lp;
 {
 
@@ -138,7 +138,7 @@ xdrmem_putlong_aligned(xdrs, lp)
 
 static bool_t
 xdrmem_getlong_unaligned(xdrs, lp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	long *lp;
 {
 	int32_t l;
@@ -154,7 +154,7 @@ xdrmem_getlong_unaligned(xdrs, lp)
 
 static bool_t
 xdrmem_putlong_unaligned(xdrs, lp)
-	register XDR *xdrs;
+	XDR *xdrs;
 	long *lp;
 {
 	int32_t l;
@@ -170,9 +170,9 @@ xdrmem_putlong_unaligned(xdrs, lp)
 
 static bool_t
 xdrmem_getbytes(xdrs, addr, len)
-	register XDR *xdrs;
+	XDR *xdrs;
 	caddr_t addr;
-	register u_int len;
+	u_int len;
 {
 
 	if (xdrs->x_handy < len)
@@ -185,9 +185,9 @@ xdrmem_getbytes(xdrs, addr, len)
 
 static bool_t
 xdrmem_putbytes(xdrs, addr, len)
-	register XDR *xdrs;
+	XDR *xdrs;
 	caddr_t addr;
-	register u_int len;
+	u_int len;
 {
 
 	if (xdrs->x_handy < len)
@@ -200,7 +200,7 @@ xdrmem_putbytes(xdrs, addr, len)
 
 static u_int
 xdrmem_getpos(xdrs)
-	register XDR *xdrs;
+	XDR *xdrs;
 {
 
 	/* XXX w/64-bit pointers, u_int not enough! */
@@ -209,11 +209,11 @@ xdrmem_getpos(xdrs)
 
 static bool_t
 xdrmem_setpos(xdrs, pos)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_int pos;
 {
-	register caddr_t newaddr = xdrs->x_base + pos;
-	register caddr_t lastaddr = xdrs->x_private + xdrs->x_handy;
+	caddr_t newaddr = xdrs->x_base + pos;
+	caddr_t lastaddr = xdrs->x_private + xdrs->x_handy;
 
 	if (newaddr > lastaddr)
 		return (FALSE);
@@ -224,7 +224,7 @@ xdrmem_setpos(xdrs, pos)
 
 static int32_t *
 xdrmem_inline_aligned(xdrs, len)
-	register XDR *xdrs;
+	XDR *xdrs;
 	int len;
 {
 	int32_t *buf = 0;
@@ -239,7 +239,7 @@ xdrmem_inline_aligned(xdrs, len)
 
 static int32_t *
 xdrmem_inline_unaligned(xdrs, len)
-	register XDR *xdrs;
+	XDR *xdrs;
 	int len;
 {
 	
diff --git a/lib/libcr/xdr/xdr_rec.c b/lib/libcr/xdr/xdr_rec.c
index c9733de942..e97fbc531a 100644
--- a/lib/libcr/xdr/xdr_rec.c
+++ b/lib/libcr/xdr/xdr_rec.c
@@ -29,7 +29,7 @@
  * @(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro
  * @(#)xdr_rec.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr_rec.c,v 1.12 2000/01/19 06:12:32 wpaul Exp $
- * $DragonFly: src/lib/libcr/xdr/Attic/xdr_rec.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $
+ * $DragonFly: src/lib/libcr/xdr/Attic/xdr_rec.c,v 1.4 2004/10/25 19:38:44 drhodus Exp $
  */
 
 /*
@@ -135,14 +135,14 @@ typedef struct rec_strm {
  */
 void
 xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit)
-	register XDR *xdrs;
-	register u_int sendsize;
-	register u_int recvsize;
+	XDR *xdrs;
+	u_int sendsize;
+	u_int recvsize;
 	caddr_t tcp_handle;
 	int (*readit)();  /* like read, but pass it a tcp_handle, not sock */
 	int (*writeit)();  /* like write, but pass it a tcp_handle, not sock */
 {
-	register RECSTREAM *rstrm =
+	RECSTREAM *rstrm =
 		(RECSTREAM *)mem_alloc(sizeof(RECSTREAM));
 
 	if (rstrm == NULL) {
@@ -198,8 +198,8 @@ xdrrec_getlong(xdrs, lp)
 	XDR *xdrs;
 	long *lp;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	register int32_t *buflp = (int32_t *)(rstrm->in_finger);
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	int32_t *buflp = (int32_t *)(rstrm->in_finger);
 	int32_t mylong;
 
 	/* first try the inline, fast case */
@@ -221,8 +221,8 @@ xdrrec_putlong(xdrs, lp)
 	XDR *xdrs;
 	long *lp;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	register int32_t *dest_lp = ((int32_t *)(rstrm->out_finger));
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	int32_t *dest_lp = ((int32_t *)(rstrm->out_finger));
 
 	if ((rstrm->out_finger += sizeof(int32_t)) > rstrm->out_boundry) {
 		/*
@@ -243,11 +243,11 @@ xdrrec_putlong(xdrs, lp)
 static bool_t  /* must manage buffers, fragments, and records */
 xdrrec_getbytes(xdrs, addr, len)
 	XDR *xdrs;
-	register caddr_t addr;
-	register u_int len;
+	caddr_t addr;
+	u_int len;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	register int current;
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	int current;
 
 	while (len > 0) {
 		current = rstrm->fbtbc;
@@ -271,11 +271,11 @@ xdrrec_getbytes(xdrs, addr, len)
 static bool_t
 xdrrec_putbytes(xdrs, addr, len)
 	XDR *xdrs;
-	register caddr_t addr;
-	register u_int len;
+	caddr_t addr;
+	u_int len;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	register long current;
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	long current;
 
 	while (len > 0) {
 		current = (u_long)rstrm->out_boundry -
@@ -296,10 +296,10 @@ xdrrec_putbytes(xdrs, addr, len)
 
 static u_int
 xdrrec_getpos(xdrs)
-	register XDR *xdrs;
+	XDR *xdrs;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-	register long pos;
+	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
+	long pos;
 
 	pos = lseek((int)(long)rstrm->tcp_handle, (off_t) 0, 1);
 	if (pos != -1)
@@ -322,10 +322,10 @@ xdrrec_getpos(xdrs)
 
 static bool_t
 xdrrec_setpos(xdrs, pos)
-	register XDR *xdrs;
+	XDR *xdrs;
 	u_int pos;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
+	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
 	u_int currpos = xdrrec_getpos(xdrs);
 	int delta = currpos - pos;
 	caddr_t newpos;
@@ -358,10 +358,10 @@ xdrrec_setpos(xdrs, pos)
 
 static int32_t *
 xdrrec_inline(xdrs, len)
-	register XDR *xdrs;
+	XDR *xdrs;
 	int len;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
+	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
 	int32_t * buf = NULL;
 
 	switch (xdrs->x_op) {
@@ -387,9 +387,9 @@ xdrrec_inline(xdrs, len)
 
 static void
 xdrrec_destroy(xdrs)
-	register XDR *xdrs;
+	XDR *xdrs;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
+	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
 
 	mem_free(rstrm->the_buffer,
 		rstrm->sendsize + rstrm->recvsize + BYTES_PER_XDR_UNIT);
@@ -409,7 +409,7 @@ bool_t
 xdrrec_skiprecord(xdrs)
 	XDR *xdrs;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
 
 	while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
 		if (! skip_input_bytes(rstrm, rstrm->fbtbc))
@@ -431,7 +431,7 @@ bool_t
 xdrrec_eof(xdrs)
 	XDR *xdrs;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
 
 	while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
 		if (! skip_input_bytes(rstrm, rstrm->fbtbc))
@@ -456,8 +456,8 @@ xdrrec_endofrecord(xdrs, sendnow)
 	XDR *xdrs;
 	bool_t sendnow;
 {
-	register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	register u_long len;  /* fragment length */
+	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+	u_long len;  /* fragment length */
 
 	if (sendnow || rstrm->frag_sent ||
 		((u_long)rstrm->out_finger + sizeof(u_int32_t) >=
@@ -479,11 +479,11 @@ xdrrec_endofrecord(xdrs, sendnow)
  */
 static bool_t
 flush_out(rstrm, eor)
-	register RECSTREAM *rstrm;
+	RECSTREAM *rstrm;
 	bool_t eor;
 {
-	register u_long eormask = (eor == TRUE) ? LAST_FRAG : 0;
-	register u_int32_t len = (u_long)(rstrm->out_finger) -
+	u_long eormask = (eor == TRUE) ? LAST_FRAG : 0;
+	u_int32_t len = (u_long)(rstrm->out_finger) -
 		(u_long)(rstrm->frag_header) - sizeof(u_int32_t);
 
 	*(rstrm->frag_header) = htonl(len | eormask);
@@ -498,11 +498,11 @@ flush_out(rstrm, eor)
 
 static bool_t  /* knows nothing about records!  Only about input buffers */
 fill_input_buf(rstrm)
-	register RECSTREAM *rstrm;
+	RECSTREAM *rstrm;
 {
-	register caddr_t where;
+	caddr_t where;
 	u_long i;
-	register long len;
+	long len;
 
 	where = rstrm->in_base;
 	i = (u_long)rstrm->in_boundry % BYTES_PER_XDR_UNIT;
@@ -518,11 +518,11 @@ fill_input_buf(rstrm)
 
 static bool_t  /* knows nothing about records!  Only about input buffers */
 get_input_bytes(rstrm, addr, len)
-	register RECSTREAM *rstrm;
-	register caddr_t addr;
-	register int len;
+	RECSTREAM *rstrm;
+	caddr_t addr;
+	int len;
 {
-	register long current;
+	long current;
 
 	while (len > 0) {
 		current = (long)rstrm->in_boundry - (long)rstrm->in_finger;
@@ -542,7 +542,7 @@ get_input_bytes(rstrm, addr, len)
 
 static bool_t  /* next two bytes of the input stream are treated as a header */
 set_input_fragment(rstrm)
-	register RECSTREAM *rstrm;
+	RECSTREAM *rstrm;
 {
 	u_int32_t header;
 
@@ -566,10 +566,10 @@ set_input_fragment(rstrm)
 
 static bool_t  /* consumes input bytes; knows nothing about records! */
 skip_input_bytes(rstrm, cnt)
-	register RECSTREAM *rstrm;
+	RECSTREAM *rstrm;
 	long cnt;
 {
-	register long current;
+	long current;
 
 	while (cnt > 0) {
 		current = (long)rstrm->in_boundry - (long)rstrm->in_finger;
@@ -587,7 +587,7 @@ skip_input_bytes(rstrm, cnt)
 
 static u_int
 fix_buf_size(s)
-	register u_int s;
+	u_int s;
 {
 
 	if (s < 100)
diff --git a/lib/libcr/xdr/xdr_reference.c b/lib/libcr/xdr/xdr_reference.c
index bd7807bad8..4ba1941fca 100644
--- a/lib/libcr/xdr/xdr_reference.c
+++ b/lib/libcr/xdr/xdr_reference.c
@@ -29,7 +29,7 @@
  * @(#)xdr_reference.c 1.11 87/08/11 SMI
  * @(#)xdr_reference.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr_reference.c,v 1.8 1999/08/28 00:02:56 peter Exp $
- * $DragonFly: src/lib/libcr/xdr/Attic/xdr_reference.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libcr/xdr/Attic/xdr_reference.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 /*
@@ -60,13 +60,8 @@
  */
 bool_t
 xdr_reference(xdrs, pp, size, proc)
-	register XDR *xdrs;
-	caddr_t *pp;		/* the pointer to work on */
-	u_int size;		/* size of the object pointed to */
-	xdrproc_t proc;		/* xdr routine to handle the object */
-{
-	register caddr_t loc = *pp;
-	register bool_t stat;
+	caddr_t loc = *pp;
+	bool_t stat;
 
 	if (loc == NULL)
 		switch (xdrs->x_op) {
@@ -115,7 +110,7 @@ xdr_reference(xdrs, pp, size, proc)
  */
 bool_t
 xdr_pointer(xdrs,objpp,obj_size,xdr_obj)
-	register XDR *xdrs;
+	XDR *xdrs;
 	char **objpp;
 	u_int obj_size;
 	xdrproc_t xdr_obj;
diff --git a/lib/libcr/xdr/xdr_stdio.c b/lib/libcr/xdr/xdr_stdio.c
index cd4f79e5d7..d8d4fac184 100644
--- a/lib/libcr/xdr/xdr_stdio.c
+++ b/lib/libcr/xdr/xdr_stdio.c
@@ -29,7 +29,7 @@
  * @(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro
  * @(#)xdr_stdio.c	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/lib/libc/xdr/xdr_stdio.c,v 1.7 1999/08/28 00:02:56 peter Exp $
- * $DragonFly: src/lib/libcr/xdr/Attic/xdr_stdio.c,v 1.2 2003/06/17 04:26:47 dillon Exp $
+ * $DragonFly: src/lib/libcr/xdr/Attic/xdr_stdio.c,v 1.3 2004/10/25 19:38:44 drhodus Exp $
  */
 
 /*
@@ -76,7 +76,7 @@ static struct xdr_ops	xdrstdio_ops = {
  */
 void
 xdrstdio_create(xdrs, file, op)
-	register XDR *xdrs;
+	XDR *xdrs;
 	FILE *file;
 	enum xdr_op op;
 {
@@ -94,7 +94,7 @@ xdrstdio_create(xdrs, file, op)
  */
 static void
 xdrstdio_destroy(xdrs)
-	register XDR *xdrs;
+	XDR *xdrs;
 {
 	(void)fflush((FILE *)xdrs->x_private);
 	/* xx should we close the file ?? */
@@ -103,7 +103,7 @@ xdrstdio_destroy(xdrs)
 static bool_t
 xdrstdio_getlong(xdrs, lp)
 	XDR *xdrs;
-	register long *lp;
+	long *lp;
 {
 
 	if (fread((caddr_t)lp, sizeof(int32_t), 1,
diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c
index 97d9eba5ce..bf7c17cc23 100644
--- a/lib/libdevstat/devstat.c
+++ b/lib/libdevstat/devstat.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libdevstat/devstat.c,v 1.6 1999/08/28 00:04:26 peter Exp $
- * $DragonFly: src/lib/libdevstat/devstat.c,v 1.2 2003/06/17 04:26:49 dillon Exp $
+ * $DragonFly: src/lib/libdevstat/devstat.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -423,7 +423,7 @@ selectdevs(struct device_selection **dev_select, int *num_selected,
 	   char **dev_selections, int num_dev_selections,
 	   devstat_select_mode select_mode, int maxshowdevs, int perf_select)
 {
-	register int i, j, k;
+	int i, j, k;
 	int init_selections = 0, init_selected_var = 0;
 	struct device_selection *old_dev_select = NULL;
 	int old_num_selections = 0, old_num_selected;
@@ -885,7 +885,7 @@ buildmatch(char *match_str, struct devstat_match **matches, int *num_matches)
 	char *tstr[5];
 	char **tempstr;
 	int num_args;
-	register int i, j;
+	int i, j;
 	char *func_name = "buildmatch";
 
 	/* We can't do much without a string to parse */
diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c
index 7ade7c4c55..e25538210a 100644
--- a/lib/libedit/chared.c
+++ b/lib/libedit/chared.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)chared.c	8.1 (Berkeley) 6/4/93
- * $DragonFly: src/lib/libedit/chared.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $
+ * $DragonFly: src/lib/libedit/chared.c,v 1.5 2004/10/25 19:38:45 drhodus Exp $
  */
 
 /*
@@ -182,8 +182,8 @@ c___isword(p)
  */
 protected char *
 c__prev_word(p, low, n, wtest)
-    register char *p, *low;
-    register int n;
+    char *p, *low;
+    int n;
     int (*wtest) (int);
 {
     p--;
@@ -209,8 +209,8 @@ c__prev_word(p, low, n, wtest)
  */
 protected char *
 c__next_word(p, high, n, wtest)
-    register char *p, *high;
-    register int n;
+    char *p, *high;
+    int n;
     int (*wtest) (int);
 {
     while (n--) {
@@ -231,8 +231,8 @@ c__next_word(p, high, n, wtest)
 protected char *
 cv_next_word(el, p, high, n, wtest)
     EditLine *el;
-    register char *p, *high;
-    register int n;
+    char *p, *high;
+    int n;
     int (*wtest) (int);
 {
     int test;
@@ -264,8 +264,8 @@ cv_next_word(el, p, high, n, wtest)
 protected char *
 cv_prev_word(el, p, low, n, wtest)
     EditLine *el;
-    register char *p, *low;
-    register int n;
+    char *p, *low;
+    int n;
     int (*wtest) (int);
 {
     int test;
@@ -307,8 +307,8 @@ c__number(p, num, dval)
     int *num;	/* Return value	*/
     int dval;	/* dval is the number to subtract from like $-3 */
 {
-    register int i;
-    register int sign = 1;
+    int i;
+    int sign = 1;
 
     if (*++p == '^') {
 	*num = 1;
@@ -336,7 +336,7 @@ protected void
 cv_delfini(el)
     EditLine *el;
 {
-    register int size;
+    int size;
     int oaction;
 
     if (el->el_chared.c_vcmd.action & INSERT)
diff --git a/lib/libedit/common.c b/lib/libedit/common.c
index 5cbb8887e6..a16e697ad1 100644
--- a/lib/libedit/common.c
+++ b/lib/libedit/common.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)common.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libedit/common.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  */
 
 /*
@@ -450,7 +451,7 @@ ed_digit(el, c)
 protected el_action_t
 ed_argument_digit(el, c)
     EditLine *el;
-    register int c;
+    int c;
 {
     if (!isdigit((unsigned char) c))
 	return CC_ERROR;
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c
index 7052adea24..d12c76b65e 100644
--- a/lib/libedit/emacs.c
+++ b/lib/libedit/emacs.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)emacs.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libedit/emacs.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  */
 
 /*
@@ -390,7 +391,7 @@ em_exchange_mark(el, c)
     EditLine *el;
     int c;
 {
-    register char *cp;
+    char *cp;
 
     cp = el->el_line.cursor;
     el->el_line.cursor = el->el_chared.c_kill.mark;
diff --git a/lib/libedit/map.c b/lib/libedit/map.c
index cf9fe49340..4390ff1a51 100644
--- a/lib/libedit/map.c
+++ b/lib/libedit/map.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)map.c	8.1 (Berkeley) 6/4/93
- * $DragonFly: src/lib/libedit/map.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $
+ * $DragonFly: src/lib/libedit/map.c,v 1.5 2004/10/25 19:38:45 drhodus Exp $
  */
 
 /*
@@ -961,7 +961,7 @@ map_init_meta(el)
     EditLine *el;
 {
     char    buf[3];
-    register int i;
+    int i;
     el_action_t *map = el->el_map.key;
     el_action_t *alt = el->el_map.alt;
 
@@ -1003,7 +1003,7 @@ protected void
 map_init_vi(el)
     EditLine *el;
 {
-    register int i;
+    int i;
     el_action_t *key = el->el_map.key;
     el_action_t *alt = el->el_map.alt;
     el_action_t *vii = el->el_map.vii;
diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c
index fa3266cd1f..e98e82871b 100644
--- a/lib/libedit/vi.c
+++ b/lib/libedit/vi.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)vi.c	8.1 (Berkeley) 6/4/93
- * $DragonFly: src/lib/libedit/vi.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $
+ * $DragonFly: src/lib/libedit/vi.c,v 1.5 2004/10/25 19:38:45 drhodus Exp $
  */
 
 /*
@@ -53,7 +53,7 @@ cv_action(el, c)
     EditLine *el;
     int c;
 {
-    register char *cp, *kp;
+    char *cp, *kp;
 
     if (el->el_chared.c_vcmd.action & DELETE) {
 	el->el_chared.c_vcmd.action = NOP;
diff --git a/lib/libipx/ipx_addr.c b/lib/libipx/ipx_addr.c
index 2a85806ca3..3378e3100f 100644
--- a/lib/libipx/ipx_addr.c
+++ b/lib/libipx/ipx_addr.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libipx/ipx_addr.c,v 1.2.8.1 2001/03/05 06:21:40 kris Exp $
- * $DragonFly: src/lib/libipx/ipx_addr.c,v 1.2 2003/06/17 04:26:49 dillon Exp $
+ * $DragonFly: src/lib/libipx/ipx_addr.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  *
  * @(#)ipx_addr.c
  */
@@ -101,7 +101,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;
 	char *fmt;
diff --git a/lib/libipx/ipx_ntoa.c b/lib/libipx/ipx_ntoa.c
index 07a708e092..600dd0020e 100644
--- a/lib/libipx/ipx_ntoa.c
+++ b/lib/libipx/ipx_ntoa.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)ipx_ntoa.c
+ * $DragonFly: src/lib/libipx/ipx_ntoa.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -44,9 +45,9 @@ ipx_ntoa(addr)
 	static char obuf[40];
 	union { union ipx_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();
 
@@ -81,7 +82,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/libkvm/kvm.c b/lib/libkvm/kvm.c
index d8e0e679ce..2d26e0a78d 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -36,7 +36,7 @@
  *
  * @(#)kvm.c	8.2 (Berkeley) 2/13/94
  * $FreeBSD: src/lib/libkvm/kvm.c,v 1.12.2.3 2002/09/13 14:53:43 nectar Exp $
- * $DragonFly: src/lib/libkvm/kvm.c,v 1.4 2004/04/11 21:28:03 cpressey Exp $
+ * $DragonFly: src/lib/libkvm/kvm.c,v 1.5 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -111,7 +111,7 @@ _kvm_syserr(kvm_t *kd, const char *program, const char *fmt, ...)
 		(void)vfprintf(stderr, fmt, ap);
 		(void)fprintf(stderr, ": %s\n", strerror(errno));
 	} else {
-		register char *cp = kd->errbuf;
+		char *cp = kd->errbuf;
 
 		(void)vsnprintf(cp, sizeof(kd->errbuf), (char *)fmt, ap);
 		n = strlen(cp);
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 68cd09ef08..35d9362c12 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.25.2.3 2002/08/24 07:27:46 kris Exp $
- * $DragonFly: src/lib/libkvm/kvm_proc.c,v 1.6 2004/04/11 21:28:03 cpressey Exp $
+ * $DragonFly: src/lib/libkvm/kvm_proc.c,v 1.7 2004/10/25 19:38:45 drhodus Exp $
  *
  * @(#)kvm_proc.c	8.3 (Berkeley) 9/23/93
  */
@@ -491,9 +491,9 @@ kvm_argv(kvm_t *kd, const struct proc *p, u_long addr, int narg, int maxcnt)
 
 		/* will we exceed the malloc/realloced buffer? */
 		if (len + cc > kd->arglen) {
-			register int off;
-			register char **pp;
-			register char *op = kd->argspc;
+			int off;
+			char **pp;
+			char *op = kd->argspc;
 
 			kd->arglen *= 2;
 			kd->argspc = (char *)_kvm_realloc(kd, kd->argspc,
diff --git a/lib/libm/common_source/fmod.c b/lib/libm/common_source/fmod.c
index da6f611cd2..5b7a8795d8 100644
--- a/lib/libm/common_source/fmod.c
+++ b/lib/libm/common_source/fmod.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)fmod.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libm/common_source/Attic/fmod.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  */
 
 /* fmod.c
@@ -119,7 +120,7 @@ double x,y;
 
 main()
 {
-	register int i,cases;
+	int i,cases;
 	double x,y;
 
 	srandom(12345);
diff --git a/lib/libmd/rmd160c.c b/lib/libmd/rmd160c.c
index 54048020bd..6b4996ea98 100644
--- a/lib/libmd/rmd160c.c
+++ b/lib/libmd/rmd160c.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  *
  * $FreeBSD: src/lib/libmd/rmd160c.c,v 1.4 1999/08/28 00:05:07 peter Exp $
- * $DragonFly: src/lib/libmd/rmd160c.c,v 1.3 2003/11/09 02:34:03 dillon Exp $
+ * $DragonFly: src/lib/libmd/rmd160c.c,v 1.4 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -103,7 +103,7 @@ RIPEMD160_CTX *c;
 const unsigned char *data;
 size_t len;
 	{
-	register u_int32_t *p;
+	u_int32_t *p;
 	int sw,sc;
 	u_int32_t l;
 
@@ -273,7 +273,7 @@ RIPEMD160_CTX *ctx;
 const u_int32_t *X;
 int num;
 	{
-	register u_int32_t A,B,C,D,E;
+	u_int32_t A,B,C,D,E;
 	u_int32_t a,b,c,d,e;
 
 	for (;;)
@@ -472,9 +472,9 @@ void RIPEMD160_Final(md, c)
 unsigned char *md;
 RIPEMD160_CTX *c;
 	{
-	register int i,j;
-	register u_int32_t l;
-	register u_int32_t *p;
+	int i,j;
+	u_int32_t l;
+	u_int32_t *p;
 	static unsigned char end[4]={0x80,0x00,0x00,0x00};
 	unsigned char *cp=end;
 
diff --git a/lib/libmd/sha0c.c b/lib/libmd/sha0c.c
index 5a75c1c694..6c279fccc2 100644
--- a/lib/libmd/sha0c.c
+++ b/lib/libmd/sha0c.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  *
  * $FreeBSD: src/lib/libmd/sha0c.c,v 1.3 1999/08/28 00:05:09 peter Exp $
- * $DragonFly: src/lib/libmd/sha0c.c,v 1.3 2003/11/09 02:34:03 dillon Exp $
+ * $DragonFly: src/lib/libmd/sha0c.c,v 1.4 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -117,7 +117,7 @@ SHA_CTX *c;
 const unsigned char *data;
 size_t len;
 	{
-	register u_int32_t *p;
+	u_int32_t *p;
 	int ew,ec,sw,sc;
 	u_int32_t l;
 
@@ -287,7 +287,7 @@ SHA_CTX *c;
 const u_int32_t *W;
 int num;
 	{
-	register u_int32_t A,B,C,D,E,T;
+	u_int32_t A,B,C,D,E,T;
 	u_int32_t X[16];
 
 	A=c->h0;
@@ -405,9 +405,9 @@ void SHA_Final(md, c)
 unsigned char *md;
 SHA_CTX *c;
 	{
-	register int i,j;
-	register u_int32_t l;
-	register u_int32_t *p;
+	int i,j;
+	u_int32_t l;
+	u_int32_t *p;
 	static unsigned char end[4]={0x80,0x00,0x00,0x00};
 	unsigned char *cp=end;
 
diff --git a/lib/libmd/sha1c.c b/lib/libmd/sha1c.c
index cb2a8932c3..64f9f22641 100644
--- a/lib/libmd/sha1c.c
+++ b/lib/libmd/sha1c.c
@@ -55,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  *
- * $DragonFly: src/lib/libmd/sha1c.c,v 1.2 2003/11/09 02:34:03 dillon Exp $
+ * $DragonFly: src/lib/libmd/sha1c.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -144,7 +144,7 @@ SHA1_Update(c, data, len)
 	const unsigned char *data;
 	size_t len;
 {
-	register u_int32_t *p;
+	u_int32_t *p;
 	int ew,ec,sw,sc;
 	u_int32_t l;
 
@@ -317,7 +317,7 @@ sha1_block(c, W, num)
 	const u_int32_t *W;
 	int num;
 {
-	register u_int32_t A,B,C,D,E,T;
+	u_int32_t A,B,C,D,E,T;
 	u_int32_t X[16];
 
 	A=c->h0;
@@ -436,9 +436,9 @@ void SHA1_Final(md, c)
 unsigned char *md;
 SHA_CTX *c;
 	{
-	register int i,j;
-	register u_int32_t l;
-	register u_int32_t *p;
+	int i,j;
+	u_int32_t l;
+	u_int32_t *p;
 	static unsigned char end[4]={0x80,0x00,0x00,0x00};
 	unsigned char *cp=end;
 
diff --git a/lib/libncurses/termcap.c b/lib/libncurses/termcap.c
index 821d9a1309..0e4d56f760 100644
--- a/lib/libncurses/termcap.c
+++ b/lib/libncurses/termcap.c
@@ -61,7 +61,7 @@
  *
  * @(#)termcap.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libncurses/termcap.c,v 1.2.2.2 2002/08/15 08:30:26 ru Exp $
- * $DragonFly: src/lib/libncurses/Attic/termcap.c,v 1.2 2003/06/17 04:26:50 dillon Exp $
+ * $DragonFly: src/lib/libncurses/Attic/termcap.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <stdio.h>
@@ -100,8 +100,8 @@ int
 _nc_read_termcap_entry(const char *const name, TERMTYPE *const tp)
 {
 	ENTRY	*ep;
-	register char *p;
-	register char *cp;
+	char *p;
+	char *cp;
 	char  *dummy;
 	char **fname;
 	char  *home;
diff --git a/lib/libpam/modules/pam_krb5/compat_heimdal.c b/lib/libpam/modules/pam_krb5/compat_heimdal.c
index f5197ba473..6d21d398cb 100644
--- a/lib/libpam/modules/pam_krb5/compat_heimdal.c
+++ b/lib/libpam/modules/pam_krb5/compat_heimdal.c
@@ -4,7 +4,7 @@
  * Heimdal compatibility layer.
  *
  * $FreeBSD: src/lib/libpam/modules/pam_krb5/compat_heimdal.c,v 1.1.2.2 2001/07/29 18:57:30 markm Exp $
- * $DragonFly: src/lib/libpam/modules/pam_krb5/Attic/compat_heimdal.c,v 1.3 2003/11/22 19:30:55 asmodai Exp $
+ * $DragonFly: src/lib/libpam/modules/pam_krb5/Attic/compat_heimdal.c,v 1.4 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <errno.h>
@@ -86,7 +86,7 @@ heimdal_pam_prompter(krb5_context context, void *data, const char *name,
 	pam_prompts++;
 
     for (i = 0; i < num_prompts; i++, pam_prompts++) {
-	register int len;
+	int len;
 	if (!resp[pam_prompts].resp) {
 	    pamret = PAM_AUTH_ERR;
 	    goto cleanup;
diff --git a/lib/libskey/put.c b/lib/libskey/put.c
index db0f6fe608..d3b245c57c 100644
--- a/lib/libskey/put.c
+++ b/lib/libskey/put.c
@@ -1,5 +1,5 @@
 /*
- * $DragonFly: src/lib/libskey/put.c,v 1.3 2003/11/12 20:21:31 eirikn Exp $
+ * $DragonFly: src/lib/libskey/put.c,v 1.4 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <stdio.h>
@@ -2253,7 +2253,7 @@ int  start, length;
 
 static void
 standard(word)
-register char *word;
+char *word;
 {
 	while(*word){
 		if(!isascii(*word))
diff --git a/lib/libskey/skeylogin.c b/lib/libskey/skeylogin.c
index f5f30ffb63..66c6e59051 100644
--- a/lib/libskey/skeylogin.c
+++ b/lib/libskey/skeylogin.c
@@ -5,7 +5,7 @@
  *   Many references for mink  may still be found in this program.
  *
  * $FreeBSD: src/lib/libskey/skeylogin.c,v 1.14.6.1 2000/07/18 11:38:24 sheldonh Exp $
- * $DragonFly: src/lib/libskey/skeylogin.c,v 1.3 2003/11/12 20:21:31 eirikn Exp $
+ * $DragonFly: src/lib/libskey/skeylogin.c,v 1.4 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -273,10 +273,10 @@ char *response;
  */
 int
 atob8(out,in)
-register char *out,*in;
+char *out,*in;
 {
-	register int i;
-	register int val;
+	int i;
+	int val;
 
 	if(in == NULL || out == NULL)
 		return -1;
@@ -300,7 +300,7 @@ register char *out,*in;
 static
 char *
 skipspace(cp)
-register char *cp;
+char *cp;
 {
 	while(*cp == ' ' || *cp == '\t')
 		cp++;
@@ -314,9 +314,9 @@ register char *cp;
 /* Convert 8-byte binary array to hex-ascii string */
 int
 btoa8(out,in)
-register char *out,*in;
+char *out,*in;
 {
-	register int i;
+	int i;
 
 	if(in == NULL || out == NULL)
 		return -1;
@@ -332,7 +332,7 @@ register char *out,*in;
 /* Convert hex digit to binary integer */
 int
 htoi(c)
-register char c;
+char c;
 {
 	if('0' <= c && c <= '9')
 		return c - '0';
diff --git a/lib/libstand/arp.c b/lib/libstand/arp.c
index f3f8b093d3..a9ba43939d 100644
--- a/lib/libstand/arp.c
+++ b/lib/libstand/arp.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  * @(#) Header: arp.c,v 1.5 93/07/15 05:52:26 leres Exp  (LBL)
- * $DragonFly: src/lib/libstand/arp.c,v 1.2 2004/08/20 00:43:00 joerg Exp $
+ * $DragonFly: src/lib/libstand/arp.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -72,12 +72,12 @@ static	ssize_t arprecv(struct iodesc *, void *, size_t, time_t);
 /* Broadcast an ARP packet, asking who has addr on interface d */
 u_char *
 arpwhohas(d, addr)
-	register struct iodesc *d;
+	struct iodesc *d;
 	struct in_addr addr;
 {
-	register int i;
-	register struct ether_arp *ah;
-	register struct arp_list *al;
+	int i;
+	struct ether_arp *ah;
+	struct arp_list *al;
 	struct {
 		struct ether_header eh;
 		struct {
@@ -150,9 +150,9 @@ arpwhohas(d, addr)
 
 static ssize_t
 arpsend(d, pkt, len)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 {
 
 #ifdef ARP_DEBUG
@@ -169,13 +169,13 @@ arpsend(d, pkt, len)
  */
 static ssize_t
 arprecv(d, pkt, len, tleft)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 	time_t tleft;
 {
-	register ssize_t n;
-	register struct ether_arp *ah;
+	ssize_t n;
+	struct ether_arp *ah;
 	u_int16_t etype;	/* host order */
 
 #ifdef ARP_DEBUG
@@ -259,8 +259,8 @@ arprecv(d, pkt, len, tleft)
  */
 void
 arp_reply(d, pkt)
-	register struct iodesc *d;
-	register void *pkt;		/* the request */
+	struct iodesc *d;
+	void *pkt;		/* the request */
 {
 	struct ether_arp *arp = pkt;
 
diff --git a/lib/libstand/bootp.c b/lib/libstand/bootp.c
index eea4792c74..6fe8da338c 100644
--- a/lib/libstand/bootp.c
+++ b/lib/libstand/bootp.c
@@ -38,7 +38,7 @@
  *
  * @(#) Header: bootp.c,v 1.4 93/09/11 03:13:51 leres Exp  (LBL)
  * $FreeBSD: src/lib/libstand/bootp.c,v 1.1.1.1.6.2 2000/09/20 18:37:25 ps Exp $
- * $DragonFly: src/lib/libstand/bootp.c,v 1.3 2004/08/20 00:43:00 joerg Exp $
+ * $DragonFly: src/lib/libstand/bootp.c,v 1.4 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -87,7 +87,7 @@ bootp(sock, flag)
 	int flag;
 {
 	struct iodesc *d;
-	register struct bootp *bp;
+	struct bootp *bp;
 	struct {
 		u_char header[HEADER_SIZE];
 		struct bootp wbootp;
@@ -255,11 +255,11 @@ bootp(sock, flag)
 /* Transmit a bootp request */
 static ssize_t
 bootpsend(d, pkt, len)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 {
-	register struct bootp *bp;
+	struct bootp *bp;
 
 #ifdef BOOTP_DEBUG
 	if (debug)
@@ -279,13 +279,13 @@ bootpsend(d, pkt, len)
 
 static ssize_t
 bootprecv(d, pkt, len, tleft)
-register struct iodesc *d;
-register void *pkt;
-register size_t len;
+struct iodesc *d;
+void *pkt;
+size_t len;
 time_t tleft;
 {
-	register ssize_t n;
-	register struct bootp *bp;
+	ssize_t n;
+	struct bootp *bp;
 
 #ifdef BOOTP_DEBUGx
 	if (debug)
@@ -338,12 +338,12 @@ bad:
 
 static int
 vend_rfc1048(cp, len)
-	register u_char *cp;
+	u_char *cp;
 	u_int len;
 {
-	register u_char *ep;
-	register int size;
-	register u_char tag;
+	u_char *ep;
+	int size;
+	u_char tag;
 
 #ifdef BOOTP_DEBUG
 	if (debug)
@@ -399,7 +399,7 @@ static void
 vend_cmu(cp)
 	u_char *cp;
 {
-	register struct cmu_vend *vp;
+	struct cmu_vend *vp;
 
 #ifdef BOOTP_DEBUG
 	if (debug)
diff --git a/lib/libstand/ether.c b/lib/libstand/ether.c
index 871dad49b8..ee97fcd26b 100644
--- a/lib/libstand/ether.c
+++ b/lib/libstand/ether.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: ether.c,v 1.11 1997/07/07 15:52:50 drochner Exp $	*/
+/* $DragonFly: src/lib/libstand/ether.c,v 1.2 2004/10/25 19:38:45 drhodus Exp $								*/
 
 /*
  * Copyright (c) 1992 Regents of the University of California.
@@ -62,8 +63,8 @@ sendether(d, pkt, len, dea, etype)
 	u_char *dea;
 	int etype;
 {
-	register ssize_t n;
-	register struct ether_header *eh;
+	ssize_t n;
+	struct ether_header *eh;
 
 #ifdef ETHER_DEBUG
  	if (debug)
@@ -92,14 +93,14 @@ sendether(d, pkt, len, dea, etype)
  */
 ssize_t
 readether(d, pkt, len, tleft, etype)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 	time_t tleft;
-	register u_int16_t *etype;
+	u_int16_t *etype;
 {
-	register ssize_t n;
-	register struct ether_header *eh;
+	ssize_t n;
+	struct ether_header *eh;
 
 #ifdef ETHER_DEBUG
  	if (debug)
@@ -135,11 +136,11 @@ readether(d, pkt, len, tleft, etype)
 static char digits[] = "0123456789abcdef";
 char *
 ether_sprintf(ap)
-        register u_char *ap;
+        u_char *ap;
 {
-	register int i;
+	int i;
 	static char etherbuf[18];
-	register char *cp = etherbuf;
+	char *cp = etherbuf;
 
 	for (i = 0; i < 6; i++) {
 		*cp++ = digits[*ap >> 4];
diff --git a/lib/libstand/fstat.c b/lib/libstand/fstat.c
index aa8b89826f..b5569c92d4 100644
--- a/lib/libstand/fstat.c
+++ b/lib/libstand/fstat.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: fstat.c,v 1.1 1996/01/13 22:25:38 leo Exp $	*/
+/* $DragonFly: src/lib/libstand/fstat.c,v 1.2 2004/10/25 19:38:45 drhodus Exp $							*/
 
 /*-
  * Copyright (c) 1993
@@ -42,7 +43,7 @@ fstat(fd, sb)
 	int fd;
 	struct stat *sb;
 {
-	register struct open_file *f = &files[fd];
+	struct open_file *f = &files[fd];
 
 	if ((unsigned)fd >= SOPEN_MAX || f->f_flags == 0) {
 		errno = EBADF;
diff --git a/lib/libstand/gets.c b/lib/libstand/gets.c
index dc26a998b3..713f38a902 100644
--- a/lib/libstand/gets.c
+++ b/lib/libstand/gets.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: gets.c,v 1.6 1995/10/11 21:16:57 pk Exp $	*/
+/* $DragonFly: src/lib/libstand/gets.c,v 1.2 2004/10/25 19:38:45 drhodus Exp $							*/
 
 /*-
  * Copyright (c) 1993
@@ -42,8 +43,8 @@
 void
 ngets(char *buf, int n)
 {
-    register int c;
-    register char *lp;
+    int c;
+    char *lp;
 
     for (lp = buf;;)
 	switch (c = getchar() & 0177) {
@@ -62,7 +63,7 @@ ngets(char *buf, int n)
 	    }
 	    break;
 	case 'r'&037: {
-	    register char *p;
+	    char *p;
 
 	    putchar('\n');
 	    for (p = buf; p < lp; ++p)
diff --git a/lib/libstand/ioctl.c b/lib/libstand/ioctl.c
index 1b0f353f89..d3d5abac35 100644
--- a/lib/libstand/ioctl.c
+++ b/lib/libstand/ioctl.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: ioctl.c,v 1.4 1994/10/30 21:48:24 cgd Exp $	*/
+/* $DragonFly: src/lib/libstand/ioctl.c,v 1.2 2004/10/25 19:38:45 drhodus Exp $							*/
 
 /*-
  * Copyright (c) 1993
@@ -72,7 +73,7 @@ ioctl(fd, cmd, arg)
 	u_long cmd;
 	char *arg;
 {
-	register struct open_file *f = &files[fd];
+	struct open_file *f = &files[fd];
 
 	if ((unsigned)fd >= SOPEN_MAX || f->f_flags == 0) {
 		errno = EBADF;
diff --git a/lib/libstand/net.c b/lib/libstand/net.c
index a3a1df521e..7106e42535 100644
--- a/lib/libstand/net.c
+++ b/lib/libstand/net.c
@@ -38,7 +38,7 @@
  *
  * @(#) Header: net.c,v 1.9 93/08/06 19:32:15 leres Exp  (LBL)
  * $FreeBSD: src/lib/libstand/net.c,v 1.1.1.1.6.1 2000/04/15 03:09:28 ps Exp $
- * $DragonFly: src/lib/libstand/net.c,v 1.3 2004/07/28 12:07:49 joerg Exp $
+ * $DragonFly: src/lib/libstand/net.c,v 1.4 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -72,16 +72,16 @@
  */
 ssize_t
 sendrecv(d, sproc, sbuf, ssize, rproc, rbuf, rsize)
-	register struct iodesc *d;
-	register ssize_t (*sproc)(struct iodesc *, void *, size_t);
-	register void *sbuf;
-	register size_t ssize;
-	register ssize_t (*rproc)(struct iodesc *, void *, size_t, time_t);
-	register void *rbuf;
-	register size_t rsize;
+	struct iodesc *d;
+	ssize_t (*sproc)(struct iodesc *, void *, size_t);
+	void *sbuf;
+	size_t ssize;
+	ssize_t (*rproc)(struct iodesc *, void *, size_t, time_t);
+	void *rbuf;
+	size_t rsize;
 {
-	register ssize_t cc;
-	register time_t t, tmo, tlast;
+	ssize_t cc;
+	time_t t, tmo, tlast;
 	long tleft;
 
 #ifdef NET_DEBUG
@@ -139,11 +139,11 @@ n_long
 inet_addr(cp)
 	char *cp;
 {
-	register u_long val;
-	register int n;
-	register char c;
+	u_long val;
+	int n;
+	char c;
 	u_int parts[4];
-	register u_int *pp = parts;
+	u_int *pp = parts;
 
 	for (;;) {
 		/*
@@ -223,11 +223,11 @@ inet_ntoa(ia)
 /* Similar to inet_ntoa() */
 char *
 intoa(addr)
-	register n_long addr;
+	n_long addr;
 {
-	register char *cp;
-	register u_int byte;
-	register int n;
+	char *cp;
+	u_int byte;
+	int n;
 	static char buf[17];	/* strlen(".255.255.255.255") + 1 */
 
 	addr = ntohl(addr);
diff --git a/lib/libstand/netif.c b/lib/libstand/netif.c
index bc1b7bd1f5..10f7787284 100644
--- a/lib/libstand/netif.c
+++ b/lib/libstand/netif.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: netif.c,v 1.10 1997/09/06 13:57:14 drochner Exp $	*/
+/* $DragonFly: src/lib/libstand/netif.c,v 1.2 2004/10/25 19:38:45 drhodus Exp $							*/
 
 /*
  * Copyright (c) 1993 Adam Glass
@@ -290,7 +291,7 @@ netif_open(machdep_hint)
 	void *machdep_hint;
 {
 	int fd;
-	register struct iodesc *s;
+	struct iodesc *s;
 	struct netif *nif;
 	
 	/* find a free socket */
diff --git a/lib/libstand/nfs.c b/lib/libstand/nfs.c
index 18befec9e6..13fdd53b3d 100644
--- a/lib/libstand/nfs.c
+++ b/lib/libstand/nfs.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/lib/libstand/nfs.c,v 1.2.6.3 2000/09/10 01:33:25 ps Exp $ */
-/* $DragonFly: src/lib/libstand/nfs.c,v 1.2 2003/06/17 04:26:51 dillon Exp $ */
+/* $DragonFly: src/lib/libstand/nfs.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $ */
 /*	$NetBSD: nfs.c,v 1.2 1998/01/24 12:43:09 drochner Exp $	*/
 
 /*-
@@ -147,11 +147,11 @@ struct fs_ops nfs_fsops = {
  */
 int
 nfs_getrootfh(d, path, fhp)
-	register struct iodesc *d;
+	struct iodesc *d;
 	char *path;
 	u_char *fhp;
 {
-	register int len;
+	int len;
 	struct args {
 		n_long	len;
 		char	path[FNAME_SIZE];
@@ -210,7 +210,7 @@ nfs_lookupfh(d, name, newfd)
 	const char *name;
 	struct nfs_iodesc *newfd;
 {
-	register int len, rlen;
+	int len, rlen;
 	struct args {
 		u_char	fh[NFS_FHSIZE];
 		n_long	len;
@@ -389,8 +389,8 @@ nfs_open(upath, f)
 #ifndef NFS_NOSYMLINK
 	struct nfs_iodesc *newfd;
 	struct nfsv2_fattrs *fa;
-	register char *cp, *ncp;
-	register int c;
+	char *cp, *ncp;
+	int c;
 	char namebuf[NFS_MAXPATHLEN + 1];
 	char linkbuf[NFS_MAXPATHLEN + 1];
 	int nlinks = 0;
@@ -458,7 +458,7 @@ nfs_open(upath, f)
 		 * Get next component of path name.
 		 */
 		{
-			register int len = 0;
+			int len = 0;
 			
 			ncp = cp;
 			while ((c = *cp) != '\0' && c != '/') {
@@ -559,7 +559,7 @@ int
 nfs_close(f)
 	struct open_file *f;
 {
-	register struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
+	struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
 
 #ifdef NFS_DEBUG
 	if (debug)
@@ -583,9 +583,9 @@ nfs_read(f, buf, size, resid)
 	size_t size;
 	size_t *resid;	/* out */
 {
-	register struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
-	register ssize_t cc;
-	register char *addr = buf;
+	struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
+	ssize_t cc;
+	char *addr = buf;
 	
 #ifdef NFS_DEBUG
 	if (debug)
@@ -640,7 +640,7 @@ nfs_seek(f, offset, where)
 	off_t offset;
 	int where;
 {
-	register struct nfs_iodesc *d = (struct nfs_iodesc *)f->f_fsdata;
+	struct nfs_iodesc *d = (struct nfs_iodesc *)f->f_fsdata;
 	n_long size = ntohl(d->fa.fa_size);
 
 	switch (where) {
@@ -670,7 +670,7 @@ nfs_stat(f, sb)
 	struct stat *sb;
 {
 	struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
-	register n_long ftype, mode;
+	n_long ftype, mode;
 
 	ftype = ntohl(fp->fa.fa_type);
 	mode  = ntohl(fp->fa.fa_mode);
@@ -688,7 +688,7 @@ nfs_stat(f, sb)
 static int
 nfs_readdir(struct open_file *f, struct dirent *d)
 {
-	register struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
+	struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
 	struct nfs_readdir_args *args;
 	struct nfs_readdir_data *rd;
 	struct nfs_readdir_off  *roff = NULL;
diff --git a/lib/libstand/printf.c b/lib/libstand/printf.c
index 35e12a5282..469db8f064 100644
--- a/lib/libstand/printf.c
+++ b/lib/libstand/printf.c
@@ -37,7 +37,7 @@
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
  * $FreeBSD: src/lib/libstand/printf.c,v 1.4 1999/12/27 08:45:14 peter Exp $
- * $DragonFly: src/lib/libstand/printf.c,v 1.3 2003/11/09 02:34:03 dillon Exp $
+ * $DragonFly: src/lib/libstand/printf.c,v 1.4 2004/10/25 19:38:45 drhodus Exp $
  */
 
 /*
@@ -105,11 +105,11 @@ vsprintf(char *buf, const char *cfmt, va_list ap)
  */
 static char *
 ksprintn(ul, base, lenp)
-	register u_long ul;
-	register int base, *lenp;
+	u_long ul;
+	int base, *lenp;
 {					/* A long in base 8, plus NULL. */
 	static char buf[sizeof(long) * NBBY / 3 + 2];
-	register char *p;
+	char *p;
 
 	p = buf;
 	do {
diff --git a/lib/libstand/qdivrem.c b/lib/libstand/qdivrem.c
index f1a0b12d32..673f03d602 100644
--- a/lib/libstand/qdivrem.c
+++ b/lib/libstand/qdivrem.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libstand/qdivrem.c,v 1.2 1999/08/28 00:05:33 peter Exp $
- * $DragonFly: src/lib/libstand/qdivrem.c,v 1.2 2003/06/17 04:26:51 dillon Exp $
+ * $DragonFly: src/lib/libstand/qdivrem.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  * 	From: Id: qdivrem.c,v 1.7 1997/11/07 09:20:40 phk Exp
  */
 
@@ -64,9 +64,9 @@ typedef u_long digit;
  * We may assume len >= 0.  NOTE THAT THIS WRITES len+1 DIGITS.
  */
 static void
-shl(register digit *p, register int len, register int sh)
+shl(digit *p, int len, int sh)
 {
-	register int i;
+	int i;
 
 	for (i = 0; i < len; i++)
 		p[i] = LHALF(p[i] << sh) | (p[i + 1] >> (HALF_BITS - sh));
@@ -87,7 +87,7 @@ __qdivrem(uq, vq, arq)
 {
 	union uu tmp;
 	digit *u, *v, *q;
-	register digit v1, v2;
+	digit v1, v2;
 	u_long qhat, rhat, t;
 	int m, n, d, j, i;
 	digit uspace[5], vspace[5], qspace[5];
@@ -197,7 +197,7 @@ __qdivrem(uq, vq, arq)
 	v1 = v[1];	/* for D3 -- note that v[1..n] are constant */
 	v2 = v[2];	/* for D3 */
 	do {
-		register digit uj0, uj1, uj2;
+		digit uj0, uj1, uj2;
 
 		/*
 		 * D3: Calculate qhat (\^q, in TeX notation).
diff --git a/lib/libstand/random.c b/lib/libstand/random.c
index bfcf8eb639..364e30e529 100644
--- a/lib/libstand/random.c
+++ b/lib/libstand/random.c
@@ -32,7 +32,7 @@
  *
  *	@(#)random.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/lib/libstand/random.c,v 1.2.2.1 2000/09/10 01:25:52 ps Exp $
- * $DragonFly: src/lib/libstand/random.c,v 1.2 2003/06/17 04:26:51 dillon Exp $
+ * $DragonFly: src/lib/libstand/random.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -54,7 +54,7 @@ srandom(seed)
 u_long
 random()
 {
-	register long x, hi, lo, t;
+	long x, hi, lo, t;
 
 	/*
 	 * Compute x[n + 1] = (7^5 * x[n]) mod (2^31 - 1).
diff --git a/lib/libstand/rarp.c b/lib/libstand/rarp.c
index 898e4756ae..38988641b6 100644
--- a/lib/libstand/rarp.c
+++ b/lib/libstand/rarp.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: rarp.c,v 1.16 1997/07/07 15:52:52 drochner Exp $	*/
+/* $DragonFly: src/lib/libstand/rarp.c,v 1.2 2004/10/25 19:38:45 drhodus Exp $							*/
 
 /*
  * Copyright (c) 1992 Regents of the University of California.
@@ -64,7 +65,7 @@ rarp_getipaddress(sock)
 	int sock;
 {
 	struct iodesc *d;
-	register struct ether_arp *ap;
+	struct ether_arp *ap;
 	struct {
 		u_char header[ETHER_SIZE];
 		struct {
@@ -135,9 +136,9 @@ rarp_getipaddress(sock)
  */
 static ssize_t
 rarpsend(d, pkt, len)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 {
 
 #ifdef RARP_DEBUG
@@ -154,13 +155,13 @@ rarpsend(d, pkt, len)
  */
 static ssize_t
 rarprecv(d, pkt, len, tleft)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 	time_t tleft;
 {
-	register ssize_t n;
-	register struct ether_arp *ap;
+	ssize_t n;
+	struct ether_arp *ap;
 	u_int16_t etype;	/* host order */
 
 #ifdef RARP_DEBUG
diff --git a/lib/libstand/rpc.c b/lib/libstand/rpc.c
index 9f0fa32764..c01ed34d73 100644
--- a/lib/libstand/rpc.c
+++ b/lib/libstand/rpc.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: rpc.c,v 1.18 1998/01/23 19:27:45 thorpej Exp $	*/
+/* $DragonFly: src/lib/libstand/rpc.c,v 1.2 2004/10/25 19:38:45 drhodus Exp $							*/
 
 /*
  * Copyright (c) 1992 Regents of the University of California.
@@ -110,14 +111,14 @@ int rpc_port = 0x400;	/* predecrement */
  */
 ssize_t
 rpc_call(d, prog, vers, proc, sdata, slen, rdata, rlen)
-	register struct iodesc *d;
-	register n_long prog, vers, proc;
-	register void *sdata;
-	register size_t slen;
-	register void *rdata;
-	register size_t rlen;
+	struct iodesc *d;
+	n_long prog, vers, proc;
+	void *sdata;
+	size_t slen;
+	void *rdata;
+	size_t rlen;
 {
-	register ssize_t cc;
+	ssize_t cc;
 	struct auth_info *auth;
 	struct rpc_call *call;
 	struct rpc_reply *reply;
@@ -234,12 +235,12 @@ rpc_call(d, prog, vers, proc, sdata, slen, rdata, rlen)
  */
 static ssize_t
 recvrpc(d, pkt, len, tleft)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 	time_t tleft;
 {
-	register struct rpc_reply *reply;
+	struct rpc_reply *reply;
 	ssize_t	n;
 	int	x;
 
@@ -379,7 +380,7 @@ rpc_pmap_putcache(addr, prog, vers, port)
  */
 int
 rpc_getport(d, prog, vers)
-	register struct iodesc *d;
+	struct iodesc *d;
 	n_long prog;	/* host order */
 	n_long vers;	/* host order */
 {
diff --git a/lib/libstand/strcasecmp.c b/lib/libstand/strcasecmp.c
index 5eb6d72814..ca693c33ad 100644
--- a/lib/libstand/strcasecmp.c
+++ b/lib/libstand/strcasecmp.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)strcasecmp.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libstand/strcasecmp.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <sys/cdefs.h>
@@ -41,7 +42,7 @@ int
 strcasecmp(s1, s2)
 	const char *s1, *s2;
 {
-	register const u_char
+	const u_char
 			*us1 = (const u_char *)s1,
 			*us2 = (const u_char *)s2;
 
@@ -54,10 +55,10 @@ strcasecmp(s1, s2)
 int
 strncasecmp(s1, s2, n)
 	const char *s1, *s2;
-	register size_t n;
+	size_t n;
 {
 	if (n != 0) {
-		register const u_char
+		const u_char
 				*us1 = (const u_char *)s1,
 				*us2 = (const u_char *)s2;
 
diff --git a/lib/libstand/strtol.c b/lib/libstand/strtol.c
index df7be9810e..3c2c47041d 100644
--- a/lib/libstand/strtol.c
+++ b/lib/libstand/strtol.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)strtol.c	8.1 (Berkeley) 6/4/93
+ * $DragonFly: src/lib/libstand/strtol.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include "stand.h"
@@ -46,13 +47,13 @@ long
 strtol(nptr, endptr, base)
 	const char *nptr;
 	char **endptr;
-	register int base;
+	int base;
 {
-	register const char *s;
-	register unsigned long acc;
-	register unsigned char c;
-	register unsigned long cutoff;
-	register int neg = 0, any, cutlim;
+	const char *s;
+	unsigned long acc;
+	unsigned char c;
+	unsigned long cutoff;
+	int neg = 0, any, cutlim;
 
 	/* Be sensible about NULL strings */
 	if (nptr == NULL)
diff --git a/lib/libstand/tftp.c b/lib/libstand/tftp.c
index b788dc5436..721b523868 100644
--- a/lib/libstand/tftp.c
+++ b/lib/libstand/tftp.c
@@ -31,7 +31,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libstand/tftp.c,v 1.2.6.4 2001/07/14 14:00:03 mikeh Exp $
- * $DragonFly: src/lib/libstand/tftp.c,v 1.3 2004/08/20 00:43:00 joerg Exp $
+ * $DragonFly: src/lib/libstand/tftp.c,v 1.4 2004/10/25 19:38:45 drhodus Exp $
  */
 
 /*
@@ -111,9 +111,9 @@ static int tftperrors[8] = {
 
 static ssize_t 
 recvtftp(d, pkt, len, tleft)
-	register struct iodesc *d;
-	register void  *pkt;
-	register ssize_t len;
+	struct iodesc *d;
+	void  *pkt;
+	ssize_t len;
 	time_t          tleft;
 {
 	struct tftphdr *t;
@@ -140,7 +140,7 @@ recvtftp(d, pkt, len, tleft)
 			/*
 			 * First data packet from new port.
 			 */
-			register struct udphdr *uh;
+			struct udphdr *uh;
 			uh = (struct udphdr *) pkt - 1;
 			d->destport = uh->uh_sport;
 		} /* else check uh_sport has not changed??? */
diff --git a/lib/libstand/udp.c b/lib/libstand/udp.c
index 69b11ffbb7..7cdefadd72 100644
--- a/lib/libstand/udp.c
+++ b/lib/libstand/udp.c
@@ -38,7 +38,7 @@
  *
  * @(#) Header: net.c,v 1.9 93/08/06 19:32:15 leres Exp  (LBL)
  * $FreeBSD: src/lib/libstand/udp.c,v 1.1.2.1 2000/04/15 03:09:29 ps Exp $
- * $DragonFly: src/lib/libstand/udp.c,v 1.2 2003/06/17 04:26:51 dillon Exp $
+ * $DragonFly: src/lib/libstand/udp.c,v 1.3 2004/10/25 19:38:45 drhodus Exp $
  */
 
 #include <sys/param.h>
@@ -62,14 +62,14 @@
 /* Caller must leave room for ethernet, ip and udp headers in front!! */
 ssize_t
 sendudp(d, pkt, len)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 {
-	register ssize_t cc;
-	register struct ip *ip;
-	register struct udphdr *uh;
-	register u_char *ea;
+	ssize_t cc;
+	struct ip *ip;
+	struct udphdr *uh;
+	u_char *ea;
 
 #ifdef NET_DEBUG
  	if (debug) {
@@ -104,7 +104,7 @@ sendudp(d, pkt, len)
 
 #ifndef UDP_NO_CKSUM
 	{
-		register struct udpiphdr *ui;
+		struct udpiphdr *ui;
 		struct ip tip;
 
 		/* Calculate checksum (must save and restore ip header) */
@@ -137,15 +137,15 @@ sendudp(d, pkt, len)
  */
 ssize_t
 readudp(d, pkt, len, tleft)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 	time_t tleft;
 {
-	register ssize_t n;
-	register size_t hlen;
-	register struct ip *ip;
-	register struct udphdr *uh;
+	ssize_t n;
+	size_t hlen;
+	struct ip *ip;
+	struct udphdr *uh;
 	u_int16_t etype;	/* host order */
 
 #ifdef NET_DEBUG
@@ -234,7 +234,7 @@ readudp(d, pkt, len, tleft)
 
 #ifndef UDP_NO_CKSUM
 	if (uh->uh_sum) {
-		register struct udpiphdr *ui;
+		struct udpiphdr *ui;
 		struct ip tip;
 
 		n = ntohs(uh->uh_ulen) + sizeof(*ip);
diff --git a/lib/libstand/ufs.c b/lib/libstand/ufs.c
index b01022a605..4a5fae9b2d 100644
--- a/lib/libstand/ufs.c
+++ b/lib/libstand/ufs.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/lib/libstand/ufs.c,v 1.5.6.1 2000/05/04 13:47:53 ps Exp $ */
-/* $DragonFly: src/lib/libstand/ufs.c,v 1.3 2003/08/08 04:18:34 dillon Exp $ */
+/* $DragonFly: src/lib/libstand/ufs.c,v 1.4 2004/10/25 19:38:45 drhodus Exp $ */
 /*	$NetBSD: ufs.c,v 1.20 1998/03/01 07:15:39 ross Exp $	*/
 
 /*-
@@ -134,8 +134,8 @@ read_inode(inumber, f)
 	ino_t inumber;
 	struct open_file *f;
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
-	register struct fs *fs = fp->f_fs;
+	struct file *fp = (struct file *)f->f_fsdata;
+	struct fs *fs = fp->f_fs;
 	char *buf;
 	size_t rsize;
 	int rc;
@@ -159,7 +159,7 @@ read_inode(inumber, f)
 	}
 
 	{
-		register struct dinode *dp;
+		struct dinode *dp;
 
 		dp = (struct dinode *)buf;
 		fp->f_di = dp[ino_to_fsbo(fs, inumber)];
@@ -169,7 +169,7 @@ read_inode(inumber, f)
 	 * Clear out the old buffers
 	 */
 	{
-		register int level;
+		int level;
 
 		for (level = 0; level < NIADDR; level++)
 			fp->f_blkno[level] = -1;
@@ -190,8 +190,8 @@ block_map(f, file_block, disk_block_p)
 	daddr_t file_block;
 	daddr_t *disk_block_p;	/* out */
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
-	register struct fs *fs = fp->f_fs;
+	struct file *fp = (struct file *)f->f_fsdata;
+	struct fs *fs = fp->f_fs;
 	int level;
 	int idx;
 	daddr_t ind_block_num;
@@ -296,10 +296,10 @@ buf_read_file(f, buf_p, size_p)
 	char **buf_p;		/* out */
 	size_t *size_p;		/* out */
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
-	register struct fs *fs = fp->f_fs;
+	struct file *fp = (struct file *)f->f_fsdata;
+	struct fs *fs = fp->f_fs;
 	long off;
-	register daddr_t file_block;
+	daddr_t file_block;
 	daddr_t	disk_block;
 	size_t block_size;
 	int rc;
@@ -358,8 +358,8 @@ search_directory(name, f, inumber_p)
 	struct open_file *f;
 	ino_t *inumber_p;		/* out */
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
-	register struct direct *dp;
+	struct file *fp = (struct file *)f->f_fsdata;
+	struct direct *dp;
 	struct direct *edp;
 	char *buf;
 	size_t buf_size;
@@ -407,8 +407,8 @@ ufs_open(upath, f)
 	const char *upath;
 	struct open_file *f;
 {
-	register char *cp, *ncp;
-	register int c;
+	char *cp, *ncp;
+	int c;
 	ino_t inumber, parent_inumber;
 	struct file *fp;
 	struct fs *fs;
@@ -446,8 +446,8 @@ ufs_open(upath, f)
 	 * Calculate indirect block levels.
 	 */
 	{
-		register int mult;
-		register int level;
+		int mult;
+		int level;
 
 		mult = 1;
 		for (level = 0; level < NIADDR; level++) {
@@ -487,7 +487,7 @@ ufs_open(upath, f)
 		 * Get next component of path name.
 		 */
 		{
-			register int len = 0;
+			int len = 0;
 
 			ncp = cp;
 			while ((c = *cp) != '\0' && c != '/') {
@@ -543,7 +543,7 @@ ufs_open(upath, f)
 				 */
 				size_t buf_size;
 				daddr_t	disk_block;
-				register struct fs *fs = fp->f_fs;
+				struct fs *fs = fp->f_fs;
 
 				if (!buf)
 					buf = malloc(fs->fs_bsize);
@@ -598,7 +598,7 @@ static int
 ufs_close(f)
 	struct open_file *f;
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
+	struct file *fp = (struct file *)f->f_fsdata;
 	int level;
 
 	f->f_fsdata = (void *)0;
@@ -627,12 +627,12 @@ ufs_read(f, start, size, resid)
 	size_t size;
 	size_t *resid;	/* out */
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
-	register size_t csize;
+	struct file *fp = (struct file *)f->f_fsdata;
+	size_t csize;
 	char *buf;
 	size_t buf_size;
 	int rc = 0;
-	register char *addr = start;
+	char *addr = start;
 
 	while (size != 0) {
 		if (fp->f_seekp >= fp->f_di.di_size)
@@ -663,7 +663,7 @@ ufs_seek(f, offset, where)
 	off_t offset;
 	int where;
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
+	struct file *fp = (struct file *)f->f_fsdata;
 
 	switch (where) {
 	case SEEK_SET:
@@ -686,7 +686,7 @@ ufs_stat(f, sb)
 	struct open_file *f;
 	struct stat *sb;
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
+	struct file *fp = (struct file *)f->f_fsdata;
 
 	/* only important stuff */
 	sb->st_mode = fp->f_di.di_mode;
diff --git a/lib/libstand/write.c b/lib/libstand/write.c
index 7c30926313..705a32bef6 100644
--- a/lib/libstand/write.c
+++ b/lib/libstand/write.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: write.c,v 1.7 1996/06/21 20:29:30 pk Exp $	*/
+/* $DragonFly: src/lib/libstand/write.c,v 1.2 2004/10/25 19:38:45 drhodus Exp $							*/
 
 /*-
  * Copyright (c) 1993
@@ -73,7 +74,7 @@ write(fd, dest, bcount)
 	void *dest;
 	size_t bcount;
 {
-	register struct open_file *f = &files[fd];
+	struct open_file *f = &files[fd];
 	size_t resid;
 
 	if ((unsigned)fd >= SOPEN_MAX || !(f->f_flags & F_WRITE)) {
diff --git a/lib/libutil/login.c b/lib/libutil/login.c
index 16d811ed93..9ce116ac4d 100644
--- a/lib/libutil/login.c
+++ b/lib/libutil/login.c
@@ -32,7 +32,7 @@
  *
  * @(#)login.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libutil/login.c,v 1.6 1999/08/28 00:05:45 peter Exp $
- * $DragonFly: src/lib/libutil/login.c,v 1.2 2003/06/17 04:26:51 dillon Exp $
+ * $DragonFly: src/lib/libutil/login.c,v 1.3 2004/10/25 19:39:09 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -47,7 +47,7 @@ void
 login(ut)
 	struct utmp *ut;
 {
-	register int fd;
+	int fd;
 	int tty;
 
 	tty = ttyslot();
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index 4c20c41aff..f8fa0f299b 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -32,7 +32,7 @@
  *
  * @(#)pty.c	8.3 (Berkeley) 5/16/94
  * $FreeBSD: src/lib/libutil/pty.c,v 1.10 1999/08/28 00:05:51 peter Exp $
- * $DragonFly: src/lib/libutil/pty.c,v 1.2 2003/06/17 04:26:52 dillon Exp $
+ * $DragonFly: src/lib/libutil/pty.c,v 1.3 2004/10/25 19:39:09 drhodus Exp $
  */
 
 #include <sys/types.h>
@@ -56,8 +56,8 @@ openpty(amaster, aslave, name, termp, winp)
 	struct winsize *winp;
 {
 	char line[] = "/dev/ptyXX";
-	register const char *cp1, *cp2;
-	register int master, slave, ttygid;
+	const char *cp1, *cp2;
+	int master, slave, ttygid;
 	struct group *gr;
 
 	if ((gr = getgrnam("tty")) != NULL)