From 3b0357f059e3e11442379cbc47a4b734f3d53172 Mon Sep 17 00:00:00 2001
From: Jeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Date: Sat, 6 Sep 2003 08:10:46 +0000
Subject: [PATCH] Remove 'register' keyword while I am here. The days that we
 could make better guesses about its use than a compiler are long past us.

Add DragonFly ID to getsubopt.c, heapsort.c, and radixsort.c.
---
 lib/libc/stdlib/atexit.c    |  4 ++--
 lib/libc/stdlib/bsearch.c   | 16 ++++++++--------
 lib/libc/stdlib/calloc.c    |  6 +++---
 lib/libc/stdlib/exit.c      |  6 +++---
 lib/libc/stdlib/getenv.c    | 10 +++++-----
 lib/libc/stdlib/getsubopt.c | 10 ++++++----
 lib/libc/stdlib/heapsort.c  |  6 ++++--
 lib/libc/stdlib/malloc.c    |  4 ++--
 lib/libc/stdlib/merge.c     |  8 ++++----
 lib/libc/stdlib/qsort.c     |  8 ++++----
 lib/libc/stdlib/radixsort.c | 16 +++++++++-------
 lib/libc/stdlib/random.c    | 22 +++++++++++-----------
 lib/libc/stdlib/setenv.c    | 14 +++++++-------
 lib/libc/stdlib/strhash.c   | 14 +++++++-------
 lib/libc/stdlib/strtod.c    | 14 +++++++-------
 lib/libc/stdlib/strtol.c    | 14 +++++++-------
 lib/libc/stdlib/strtoll.c   | 14 +++++++-------
 lib/libc/stdlib/strtoul.c   | 14 +++++++-------
 lib/libc/stdlib/strtoull.c  | 14 +++++++-------
 19 files changed, 110 insertions(+), 104 deletions(-)

diff --git a/lib/libc/stdlib/atexit.c b/lib/libc/stdlib/atexit.c
index 34132c8c7c..1ccc0542c8 100644
--- a/lib/libc/stdlib/atexit.c
+++ b/lib/libc/stdlib/atexit.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/stdlib/atexit.c,v 1.3.6.1 2002/03/10 20:28:40 tegge Exp $
- * $DragonFly: src/lib/libc/stdlib/atexit.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/atexit.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  *
  * @(#)atexit.c	8.2 (Berkeley) 7/3/94
  */
@@ -62,7 +62,7 @@ atexit(fn)
 	void (*fn)();
 {
 	static struct atexit __atexit0;	/* one guaranteed table */
-	register struct atexit *p;
+	struct atexit *p;
 
 	THREAD_LOCK();
 	if ((p = __atexit) == NULL)
diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c
index dbb713c834..8c1efdc585 100644
--- a/lib/libc/stdlib/bsearch.c
+++ b/lib/libc/stdlib/bsearch.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)bsearch.c	8.1 (Berkeley) 6/4/93
- * $DragonFly: src/lib/libc/stdlib/bsearch.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/bsearch.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  */
 
 #include <stddef.h>
@@ -55,16 +55,16 @@
  */
 void *
 bsearch(key, base0, nmemb, size, compar)
-	register const void *key;
+	const void *key;
 	const void *base0;
 	size_t nmemb;
-	register size_t size;
-	register int (*compar) __P((const void *, const void *));
+	size_t size;
+	int (*compar) __P((const void *, const void *));
 {
-	register const char *base = base0;
-	register size_t lim;
-	register int cmp;
-	register const void *p;
+	const char *base = base0;
+	size_t lim;
+	int cmp;
+	const void *p;
 
 	for (lim = nmemb; lim != 0; lim >>= 1) {
 		p = base + (lim >> 1) * size;
diff --git a/lib/libc/stdlib/calloc.c b/lib/libc/stdlib/calloc.c
index 56141d3b24..0d5cd4447c 100644
--- a/lib/libc/stdlib/calloc.c
+++ b/lib/libc/stdlib/calloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)calloc.c	8.1 (Berkeley) 6/4/93
- * $DragonFly: src/lib/libc/stdlib/calloc.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/calloc.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  */
 
 #include <stdlib.h>
@@ -40,9 +40,9 @@
 void *
 calloc(num, size)
 	size_t num;
-	register size_t size;
+	size_t size;
 {
-	register void *p;
+	void *p;
 
 	size *= num;
 	if ( (p = malloc(size)) )
diff --git a/lib/libc/stdlib/exit.c b/lib/libc/stdlib/exit.c
index 866be6dc77..24fb50182f 100644
--- a/lib/libc/stdlib/exit.c
+++ b/lib/libc/stdlib/exit.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/stdlib/exit.c,v 1.3.6.1 2001/03/05 11:33:57 obrien Exp $
- * $DragonFly: src/lib/libc/stdlib/exit.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/exit.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  *
  * @(#)exit.c	8.1 (Berkeley) 6/4/93
  */
@@ -58,8 +58,8 @@ void
 exit(status)
 	int status;
 {
-	register struct atexit *p;
-	register int n;
+	struct atexit *p;
+	int n;
 
 #ifdef	_THREAD_SAFE
 	extern int _thread_autoinit_dummy_decl;
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
index 66b19158dc..6eb1fdafa4 100644
--- a/lib/libc/stdlib/getenv.c
+++ b/lib/libc/stdlib/getenv.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)getenv.c	8.1 (Berkeley) 6/4/93
- * $DragonFly: src/lib/libc/stdlib/getenv.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/getenv.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  */
 
 #include <stdlib.h>
@@ -51,13 +51,13 @@ inline char *__findenv __P((const char *, int *));
  */
 inline char *
 __findenv(name, offset)
-	register const char *name;
+	const char *name;
 	int *offset;
 {
 	extern char **environ;
-	register int len, i;
-	register const char *np;
-	register char **p, *cp;
+	int len, i;
+	const char *np;
+	char **p, *cp;
 
 	if (name == NULL || environ == NULL)
 		return (NULL);
diff --git a/lib/libc/stdlib/getsubopt.c b/lib/libc/stdlib/getsubopt.c
index ad6f160d22..d8ec63a726 100644
--- a/lib/libc/stdlib/getsubopt.c
+++ b/lib/libc/stdlib/getsubopt.c
@@ -30,6 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $DragonFly: src/lib/libc/stdlib/getsubopt.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
+ *
  * @(#)getsubopt.c	8.1 (Berkeley) 6/4/93
  */
 
@@ -46,11 +48,11 @@ char *suboptarg;
 
 int
 getsubopt(optionp, tokens, valuep)
-	register char **optionp, **valuep;
-	register char * const *tokens;
+	char **optionp, **valuep;
+	char * const *tokens;
 {
-	register int cnt;
-	register char *p;
+	int cnt;
+	char *p;
 
 	suboptarg = *valuep = NULL;
 
diff --git a/lib/libc/stdlib/heapsort.c b/lib/libc/stdlib/heapsort.c
index 6bc75b92cb..49892f6ff6 100644
--- a/lib/libc/stdlib/heapsort.c
+++ b/lib/libc/stdlib/heapsort.c
@@ -33,6 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $DragonFly: src/lib/libc/stdlib/heapsort.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
+ *
  * @(#)heapsort.c	8.1 (Berkeley) 6/4/93
  */
 
@@ -141,8 +143,8 @@ heapsort(vbase, nmemb, size, compar)
 	size_t nmemb, size;
 	int (*compar) __P((const void *, const void *));
 {
-	register int cnt, i, j, l;
-	register char tmp, *tmp1, *tmp2;
+	int cnt, i, j, l;
+	char tmp, *tmp1, *tmp2;
 	char *base, *k, *p, *t;
 
 	if (nmemb <= 1)
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index faf16a7e96..5461115fdb 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -7,7 +7,7 @@
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.49.2.4 2001/12/29 08:10:14 knu Exp $
- * $DragonFly: src/lib/libc/stdlib/malloc.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/malloc.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  *
  */
 
@@ -1059,7 +1059,7 @@ ifree(void *ptr)
 void *
 malloc(size_t size)
 {
-    register void *r;
+    void *r;
 
     THREAD_LOCK();
     malloc_func = " in malloc():";
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index a800398f80..8c62a411ef 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)merge.c	8.2 (Berkeley) 2/14/94
- * $DragonFly: src/lib/libc/stdlib/merge.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/merge.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  */
 
 /*
@@ -97,12 +97,12 @@ int
 mergesort(base, nmemb, size, cmp)
 	void *base;
 	size_t nmemb;
-	register size_t size;
+	size_t size;
 	int (*cmp) __P((const void *, const void *));
 {
-	register int i, sense;
+	int i, sense;
 	int big, iflag;
-	register u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
+	u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
 	u_char *list2, *list1, *p2, *p, *last, **p1;
 
 	if (size < PSIZE / 2) {		/* Pointers must fit into 2 * size. */
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index 9264a4bc35..65e0060b6f 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -32,7 +32,7 @@
  *
  * @(#)qsort.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/stdlib/qsort.c,v 1.8 1999/08/28 00:01:35 peter Exp $
- * $DragonFly: src/lib/libc/stdlib/qsort.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/qsort.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  */
 
 #include <stdlib.h>
@@ -48,10 +48,10 @@ static inline void	 swapfunc __P((char *, char *, int, int));
  */
 #define swapcode(TYPE, parmi, parmj, n) { 		\
 	long i = (n) / sizeof (TYPE); 			\
-	register TYPE *pi = (TYPE *) (parmi); 		\
-	register TYPE *pj = (TYPE *) (parmj); 		\
+	TYPE *pi = (TYPE *) (parmi); 		\
+	TYPE *pj = (TYPE *) (parmj); 		\
 	do { 						\
-		register TYPE	t = *pi;		\
+		TYPE	t = *pi;		\
 		*pi++ = *pj;				\
 		*pj++ = t;				\
         } while (--i > 0);				\
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
index a236958ac8..0e999e4310 100644
--- a/lib/libc/stdlib/radixsort.c
+++ b/lib/libc/stdlib/radixsort.c
@@ -33,6 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $DragonFly: src/lib/libc/stdlib/radixsort.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
+ *
  * @(#)radixsort.c	8.2 (Berkeley) 4/28/95
  */
 
@@ -138,8 +140,8 @@ r_sort_a(a, n, i, tr, endch)
 	u_int endch;
 {
 	static int count[256], nc, bmin;
-	register int c;
-	register const u_char **ak, *r;
+	int c;
+	const u_char **ak, *r;
 	stack s[SIZE], *sp, *sp0, *sp1, temp;
 	int *cp, bigc;
 	const u_char **an, *t, **aj, **top[256];
@@ -229,8 +231,8 @@ r_sort_b(a, ta, n, i, tr, endch)
 	u_int endch;
 {
 	static int count[256], nc, bmin;
-	register int c;
-	register const u_char **ak, **ai;
+	int c;
+	const u_char **ak, **ai;
 	stack s[512], *sp, *sp0, *sp1, temp;
 	const u_char **top[256];
 	int *cp, bigc;
@@ -295,12 +297,12 @@ r_sort_b(a, ta, n, i, tr, endch)
 
 static inline void
 simplesort(a, n, b, tr, endch)	/* insertion sort */
-	register const u_char **a;
+	const u_char **a;
 	int n, b;
-	register const u_char *tr;
+	const u_char *tr;
 	u_int endch;
 {
-	register u_char ch;
+	u_char ch;
 	const u_char  **ak, **ai, *s, *t;
 
 	for (ak = a+1; --n >= 1; ak++)
diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
index a9ef2cc12b..468573569f 100644
--- a/lib/libc/stdlib/random.c
+++ b/lib/libc/stdlib/random.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/stdlib/random.c,v 1.13 2000/01/27 23:06:49 jasone Exp $
- * $DragonFly: src/lib/libc/stdlib/random.c,v 1.3 2003/09/06 08:00:07 asmodai Exp $
+ * $DragonFly: src/lib/libc/stdlib/random.c,v 1.4 2003/09/06 08:10:46 asmodai Exp $
  *
  * @(#)random.c	8.2 (Berkeley) 5/19/95
  */
@@ -213,7 +213,7 @@ static uint32_t *end_ptr = &randtbl[DEG_3 + 1];
 static inline long good_rand __P((long));
 
 static inline long good_rand (x)
-	register long x;
+	long x;
 {
 #ifdef  USE_WEAK_SEEDING
 /*
@@ -231,7 +231,7 @@ static inline long good_rand (x)
  * Park and Miller, Communications of the ACM, vol. 31, no. 10,
  * October 1988, p. 1195.
  */
-	register long hi, lo;
+	long hi, lo;
 
 	hi = x / 127773;
 	lo = x % 127773;
@@ -258,7 +258,7 @@ void
 srandom(x)
 	unsigned long x;
 {
-	register int i;
+	int i;
 
 	if (rand_type == TYPE_0)
 		state[0] = (uint32_t)x;
@@ -347,8 +347,8 @@ initstate(seed, arg_state, n)
 	char *arg_state;		/* pointer to state array */
 	long n;				/* # bytes of state info */
 {
-	register char *ostate = (char *)(&state[-1]);
-	register uint32_t *int_arg_state = (uint32_t *)(void *)arg_state;
+	char *ostate = (char *)(&state[-1]);
+	uint32_t *int_arg_state = (uint32_t *)(void *)arg_state;
 
 	if (rand_type == TYPE_0)
 		state[-1] = rand_type;
@@ -413,9 +413,9 @@ char *
 setstate(arg_state)
 	char *arg_state;		/* pointer to state array */
 {
-	register uint32_t *new_state = (uint32_t *)(void *)arg_state;
-	register uint32_t type = new_state[0] % MAX_TYPES;
-	register uint32_t rear = new_state[0] / MAX_TYPES;
+	uint32_t *new_state = (uint32_t *)(void *)arg_state;
+	uint32_t type = new_state[0] % MAX_TYPES;
+	uint32_t rear = new_state[0] / MAX_TYPES;
 	char *ostate = (char *)(&state[-1]);
 
 	if (rand_type == TYPE_0)
@@ -465,8 +465,8 @@ setstate(arg_state)
 long
 random()
 {
-	register uint32_t i;
-	register uint32_t *f, *r;
+	uint32_t i;
+	uint32_t *f, *r;
 
 	if (rand_type == TYPE_0) {
 		i = state[0];
diff --git a/lib/libc/stdlib/setenv.c b/lib/libc/stdlib/setenv.c
index 4bba357502..228345b960 100644
--- a/lib/libc/stdlib/setenv.c
+++ b/lib/libc/stdlib/setenv.c
@@ -32,7 +32,7 @@
  *
  * @(#)setenv.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/stdlib/setenv.c,v 1.5.2.1 2000/09/20 19:46:03 brian Exp $
- * $DragonFly: src/lib/libc/stdlib/setenv.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/setenv.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  */
 
 #include <stddef.h>
@@ -48,13 +48,13 @@ char *__findenv __P((const char *, int *));
  */
 int
 setenv(name, value, rewrite)
-	register const char *name;
-	register const char *value;
+	const char *name;
+	const char *value;
 	int rewrite;
 {
 	extern char **environ;
 	static char **alloced;			/* if allocated space before */
-	register char *c;
+	char *c;
 	int l_value, offset;
 
 	if (*value == '=')			/* no `=' in value */
@@ -68,8 +68,8 @@ setenv(name, value, rewrite)
 			return (0);
 		}
 	} else {					/* create new slot */
-		register int cnt;
-		register char **p;
+		int cnt;
+		char **p;
 
 		for (p = environ, cnt = 0; *p; ++p, ++cnt);
 		if (alloced == environ) {			/* just increase size */
@@ -108,7 +108,7 @@ unsetenv(name)
 	const char *name;
 {
 	extern char **environ;
-	register char **p;
+	char **p;
 	int offset;
 
 	while (__findenv(name, &offset))	/* if set multiple times */
diff --git a/lib/libc/stdlib/strhash.c b/lib/libc/stdlib/strhash.c
index 6c853de8ef..54847a6064 100644
--- a/lib/libc/stdlib/strhash.c
+++ b/lib/libc/stdlib/strhash.c
@@ -23,7 +23,7 @@
  *  without specific, written prior permission.
  *
  * $FreeBSD: src/lib/libc/stdlib/strhash.c,v 1.8 1999/09/05 17:42:45 peter Exp $
- * $DragonFly: src/lib/libc/stdlib/Attic/strhash.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/Attic/strhash.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  */
 
 /*
@@ -97,7 +97,7 @@ static hash_node *list_find(caddr_t key, hash_node *head);
 hash_table *
 hash_create(int size)
 {
-    register int i;
+    int i;
     hash_table *new = (hash_table *)malloc(sizeof(hash_table));
 
     if (!new || size < 0){
@@ -290,8 +290,8 @@ assign_key(char *key, hash_node *node)
 void
 hash_traverse(hash_table *table, int (*func)(), void *arg)
 {
-    register int i;
-    register int size = table->size;
+    int i;
+    int size = table->size;
 
     if (!func)
 	return;
@@ -317,8 +317,8 @@ hash_traverse(hash_table *table, int (*func)(), void *arg)
 void
 hash_purge(hash_table *table, void (*purge_func)(char *p1, void *p2))
 {
-    register int i;
-    register int size = table->size;
+    int i;
+    int size = table->size;
 
     for (i = 0; i < size; i++) {
 	hash_node *n = table->buckets[i];
@@ -347,7 +347,7 @@ hash_purge(hash_table *table, void (*purge_func)(char *p1, void *p2))
 void
 hash_stats(hash_table *table, int verbose)
 {
-    register int i;
+    int i;
     int total_elements = 0;
     int non_empty_buckets = 0;
     int max_count = 0;
diff --git a/lib/libc/stdlib/strtod.c b/lib/libc/stdlib/strtod.c
index 0b03288da7..1483535279 100644
--- a/lib/libc/stdlib/strtod.c
+++ b/lib/libc/stdlib/strtod.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/stdlib/strtod.c,v 1.3.8.4 2002/08/31 22:26:35 dwmalone Exp $
- * $DragonFly: src/lib/libc/stdlib/strtod.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/strtod.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  *
  * @(#)strtod.c	8.1 (Berkeley) 6/4/93
  */
@@ -493,12 +493,12 @@ s2b
  static int
 hi0bits
 #ifdef KR_headers
-	(x) register unsigned long x;
+	(x) unsigned long x;
 #else
-	(register unsigned long x)
+	(unsigned long x)
 #endif
 {
-	register int k = 0;
+	int k = 0;
 
 	if (!(x & 0xffff0000)) {
 		k = 16;
@@ -532,8 +532,8 @@ lo0bits
 	(unsigned long *y)
 #endif
 {
-	register int k;
-	register unsigned long x = *y;
+	int k;
+	unsigned long x = *y;
 
 	if (x & 7) {
 		if (x & 1)
@@ -894,7 +894,7 @@ ulp
 	(double x)
 #endif
 {
-	register long L;
+	long L;
 	double a;
 
 	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
diff --git a/lib/libc/stdlib/strtol.c b/lib/libc/stdlib/strtol.c
index 808782f998..6d81f83f03 100644
--- a/lib/libc/stdlib/strtol.c
+++ b/lib/libc/stdlib/strtol.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)strtol.c	8.1 (Berkeley) 6/4/93
- * $DragonFly: src/lib/libc/stdlib/strtol.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/strtol.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  */
 
 #include <limits.h>
@@ -50,13 +50,13 @@ long
 strtol(nptr, endptr, base)
 	const char *nptr;
 	char **endptr;
-	register int base;
+	int base;
 {
-	register const char *s = nptr;
-	register unsigned long acc;
-	register unsigned char c;
-	register unsigned long cutoff;
-	register int neg = 0, any, cutlim;
+	const char *s = nptr;
+	unsigned long acc;
+	unsigned char c;
+	unsigned long cutoff;
+	int neg = 0, any, cutlim;
 
 	/*
 	 * Skip white space and pick up leading +/- sign if any.
diff --git a/lib/libc/stdlib/strtoll.c b/lib/libc/stdlib/strtoll.c
index 3c6063e8ce..b1038091f5 100644
--- a/lib/libc/stdlib/strtoll.c
+++ b/lib/libc/stdlib/strtoll.c
@@ -32,7 +32,7 @@
  *
  * @(#)strtoq.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.5.2.1 2001/03/02 09:45:20 obrien Exp $
- * $DragonFly: src/lib/libc/stdlib/strtoll.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/strtoll.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  */
 
 #include <sys/types.h>
@@ -52,13 +52,13 @@ long long
 strtoll(nptr, endptr, base)
 	const char *nptr;
 	char **endptr;
-	register int base;
+	int base;
 {
-	register const char *s;
-	register unsigned long long acc;
-	register unsigned char c;
-	register unsigned long long qbase, cutoff;
-	register int neg, any, cutlim;
+	const char *s;
+	unsigned long long acc;
+	unsigned char c;
+	unsigned long long qbase, cutoff;
+	int neg, any, cutlim;
 
 	/*
 	 * Skip white space and pick up leading +/- sign if any.
diff --git a/lib/libc/stdlib/strtoul.c b/lib/libc/stdlib/strtoul.c
index a32a99eb74..5516350947 100644
--- a/lib/libc/stdlib/strtoul.c
+++ b/lib/libc/stdlib/strtoul.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * @(#)strtoul.c	8.1 (Berkeley) 6/4/93
- * $DragonFly: src/lib/libc/stdlib/strtoul.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/strtoul.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  */
 
 #include <limits.h>
@@ -49,13 +49,13 @@ unsigned long
 strtoul(nptr, endptr, base)
 	const char *nptr;
 	char **endptr;
-	register int base;
+	int base;
 {
-	register const char *s = nptr;
-	register unsigned long acc;
-	register unsigned char c;
-	register unsigned long cutoff;
-	register int neg = 0, any, cutlim;
+	const char *s = nptr;
+	unsigned long acc;
+	unsigned char c;
+	unsigned long cutoff;
+	int neg = 0, any, cutlim;
 
 	/*
 	 * See strtol for comments as to the logic used.
diff --git a/lib/libc/stdlib/strtoull.c b/lib/libc/stdlib/strtoull.c
index 7d845a8737..ebff14b71d 100644
--- a/lib/libc/stdlib/strtoull.c
+++ b/lib/libc/stdlib/strtoull.c
@@ -32,7 +32,7 @@
  *
  * @(#)strtouq.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/stdlib/strtoull.c,v 1.5.2.1 2001/03/02 09:45:20 obrien Exp $
- * $DragonFly: src/lib/libc/stdlib/strtoull.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
+ * $DragonFly: src/lib/libc/stdlib/strtoull.c,v 1.3 2003/09/06 08:10:46 asmodai Exp $
  */
 
 #include <sys/types.h>
@@ -52,13 +52,13 @@ unsigned long long
 strtoull(nptr, endptr, base)
 	const char *nptr;
 	char **endptr;
-	register int base;
+	int base;
 {
-	register const char *s = nptr;
-	register unsigned long long acc;
-	register unsigned char c;
-	register unsigned long long qbase, cutoff;
-	register int neg, any, cutlim;
+	const char *s = nptr;
+	unsigned long long acc;
+	unsigned char c;
+	unsigned long long qbase, cutoff;
+	int neg, any, cutlim;
 
 	/*
 	 * See strtoq for comments as to the logic used.
-- 
2.41.0