From: Jon Trulson <jon@radscan.com>
Date: Wed, 27 Jun 2018 22:57:54 +0000 (-0600)
Subject: dtinfo: remove register keyword
X-Git-Tag: 2.3.0a~310
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=556ce45298e2dd5639285569a611bab86faf2174;p=oweals%2Fcde.git

dtinfo: remove register keyword
---

diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/defParser.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/defParser.C
index 1ddbbf3a..23e8f94d 100644
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/defParser.C
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/defParser.C
@@ -210,9 +210,9 @@ extern char *getenv(const char *);
 int
 defParserparse()
 {
-    register int defParserm, defParsern, defParserstate;
+    int defParserm, defParsern, defParserstate;
 #if defParserDEBUG
-    register char *defParsers;
+    char *defParsers;
 
     if (defParsers = getenv("defParserDEBUG"))
     {
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C
index 6603fdf7..ae536439 100644
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C
@@ -505,9 +505,9 @@ static int input defParser_PROTO(( void ));
 
 defParser_DECL
     {
-    register defParser_state_type defParser_current_state;
-    register defParser_CHAR *defParser_cp, *defParser_bp;
-    register int defParser_act;
+    defParser_state_type defParser_current_state;
+    defParser_CHAR *defParser_cp, *defParser_bp;
+    int defParser_act;
 
 
 
@@ -553,7 +553,7 @@ defParser_DECL
 defParser_match:
 	do
 	    {
-	    register defParser_CHAR defParser_c = defParser_ec[*defParser_cp];
+	    defParser_CHAR defParser_c = defParser_ec[*defParser_cp];
 	    if ( defParser_accept[defParser_current_state] )
 		{
 		defParser_last_accepting_state = defParser_current_state;
@@ -912,9 +912,9 @@ case defParser_STATE_EOF(quoted_string):
 static int defParser_get_next_buffer()
 
     {
-    register defParser_CHAR *dest = defParser_current_buffer->defParser_ch_buf;
-    register defParser_CHAR *source = defParsertext - 1; /* copy prev. char, too */
-    register int number_to_move, i;
+    defParser_CHAR *dest = defParser_current_buffer->defParser_ch_buf;
+    defParser_CHAR *source = defParsertext - 1; /* copy prev. char, too */
+    int number_to_move, i;
     int ret_val;
 
     if ( defParser_c_buf_p > &defParser_current_buffer->defParser_ch_buf[defParser_n_chars + 1] )
@@ -993,10 +993,10 @@ static int defParser_get_next_buffer()
 static defParser_state_type defParser_get_previous_state()
 
     {
-    register defParser_state_type defParser_current_state;
-    register defParser_CHAR *defParser_cp;
+    defParser_state_type defParser_current_state;
+    defParser_CHAR *defParser_cp;
 
-    register defParser_CHAR *defParser_bp = defParsertext;
+    defParser_CHAR *defParser_bp = defParsertext;
 
     defParser_current_state = defParser_start;
     if ( defParser_bp[-1] == '\n' )
@@ -1004,7 +1004,7 @@ static defParser_state_type defParser_get_previous_state()
 
     for ( defParser_cp = defParsertext + defParser_MORE_ADJ; defParser_cp < defParser_c_buf_p; ++defParser_cp )
 	{
-	register defParser_CHAR defParser_c = (*defParser_cp ? defParser_ec[*defParser_cp] : 1);
+	defParser_CHAR defParser_c = (*defParser_cp ? defParser_ec[*defParser_cp] : 1);
 	if ( defParser_accept[defParser_current_state] )
 	    {
 	    defParser_last_accepting_state = defParser_current_state;
@@ -1030,17 +1030,17 @@ static defParser_state_type defParser_get_previous_state()
  */
 
 #ifdef defParser_USE_PROTOS
-static defParser_state_type defParser_try_NUL_trans( register defParser_state_type defParser_current_state )
+static defParser_state_type defParser_try_NUL_trans( defParser_state_type defParser_current_state )
 #else
 static defParser_state_type defParser_try_NUL_trans( defParser_current_state )
-register defParser_state_type defParser_current_state;
+defParser_state_type defParser_current_state;
 #endif
 
     {
-    register int defParser_is_jam;
-    register defParser_CHAR *defParser_cp = defParser_c_buf_p;
+    int defParser_is_jam;
+    defParser_CHAR *defParser_cp = defParser_c_buf_p;
 
-    register defParser_CHAR defParser_c = 1;
+    defParser_CHAR defParser_c = 1;
     if ( defParser_accept[defParser_current_state] )
 	{
 	defParser_last_accepting_state = defParser_current_state;
@@ -1061,25 +1061,25 @@ register defParser_state_type defParser_current_state;
 
 #if 0
 #ifdef defParser_USE_PROTOS
-static void defParserunput( defParser_CHAR c, register defParser_CHAR *defParser_bp )
+static void defParserunput( defParser_CHAR c, defParser_CHAR *defParser_bp )
 #else
 static void defParserunput( c, defParser_bp )
 defParser_CHAR c;
-register defParser_CHAR *defParser_bp;
+defParser_CHAR *defParser_bp;
 #endif
 
     {
-    register defParser_CHAR *defParser_cp = defParser_c_buf_p;
+    defParser_CHAR *defParser_cp = defParser_c_buf_p;
 
     /* undo effects of setting up defParsertext */
     *defParser_cp = defParser_hold_char;
 
     if ( defParser_cp < defParser_current_buffer->defParser_ch_buf + 2 )
 	{ /* need to shift things up to make room */
-	register int number_to_move = defParser_n_chars + 2; /* +2 for EOB chars */
-	register defParser_CHAR *dest =
+	int number_to_move = defParser_n_chars + 2; /* +2 for EOB chars */
+	defParser_CHAR *dest =
 	    &defParser_current_buffer->defParser_ch_buf[defParser_current_buffer->defParser_buf_size + 2];
-	register defParser_CHAR *source =
+	defParser_CHAR *source =
 	    &defParser_current_buffer->defParser_ch_buf[number_to_move];
 
 	while ( source > defParser_current_buffer->defParser_ch_buf )
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/style.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/style.C
index 7c07c26d..f94efc5e 100644
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/style.C
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/style.C
@@ -468,9 +468,9 @@ extern char *getenv(const char *);
 int
 styleparse()
 {
-    register int stylem, stylen, stylestate;
+    int stylem, stylen, stylestate;
 #if styleDEBUG
-    register char *styles;
+    char *styles;
 
     if (styles = getenv("styleDEBUG"))
     {
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C
index de648d31..235e0fdf 100644
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C
@@ -606,9 +606,9 @@ static int input style_PROTO(( void ));
 
 style_DECL
     {
-    register style_state_type style_current_state;
-    register style_CHAR *style_cp, *style_bp;
-    register int style_act;
+    style_state_type style_current_state;
+    style_CHAR *style_cp, *style_bp;
+    int style_act;
 
 
 
@@ -654,7 +654,7 @@ style_DECL
 style_match:
 	do
 	    {
-	    register style_CHAR style_c = style_ec[*style_cp];
+	    style_CHAR style_c = style_ec[*style_cp];
 	    if ( style_accept[style_current_state] )
 		{
 		style_last_accepting_state = style_current_state;
@@ -1160,9 +1160,9 @@ case style_STATE_EOF(quoted_string):
 static int style_get_next_buffer()
 
     {
-    register style_CHAR *dest = style_current_buffer->style_ch_buf;
-    register style_CHAR *source = styletext - 1; /* copy prev. char, too */
-    register int number_to_move, i;
+    style_CHAR *dest = style_current_buffer->style_ch_buf;
+    style_CHAR *source = styletext - 1; /* copy prev. char, too */
+    int number_to_move, i;
     int ret_val;
 
     if ( style_c_buf_p > &style_current_buffer->style_ch_buf[style_n_chars + 1] )
@@ -1241,10 +1241,10 @@ static int style_get_next_buffer()
 static style_state_type style_get_previous_state()
 
     {
-    register style_state_type style_current_state;
-    register style_CHAR *style_cp;
+    style_state_type style_current_state;
+    style_CHAR *style_cp;
 
-    register style_CHAR *style_bp = styletext;
+    style_CHAR *style_bp = styletext;
 
     style_current_state = style_start;
     if ( style_bp[-1] == '\n' )
@@ -1252,7 +1252,7 @@ static style_state_type style_get_previous_state()
 
     for ( style_cp = styletext + style_MORE_ADJ; style_cp < style_c_buf_p; ++style_cp )
 	{
-	register style_CHAR style_c = (*style_cp ? style_ec[*style_cp] : 1);
+	style_CHAR style_c = (*style_cp ? style_ec[*style_cp] : 1);
 	if ( style_accept[style_current_state] )
 	    {
 	    style_last_accepting_state = style_current_state;
@@ -1278,17 +1278,17 @@ static style_state_type style_get_previous_state()
  */
 
 #ifdef style_USE_PROTOS
-static style_state_type style_try_NUL_trans( register style_state_type style_current_state )
+static style_state_type style_try_NUL_trans( style_state_type style_current_state )
 #else
 static style_state_type style_try_NUL_trans( style_current_state )
-register style_state_type style_current_state;
+style_state_type style_current_state;
 #endif
 
     {
-    register int style_is_jam;
-    register style_CHAR *style_cp = style_c_buf_p;
+    int style_is_jam;
+    style_CHAR *style_cp = style_c_buf_p;
 
-    register style_CHAR style_c = 1;
+    style_CHAR style_c = 1;
     if ( style_accept[style_current_state] )
 	{
 	style_last_accepting_state = style_current_state;
@@ -1309,25 +1309,25 @@ register style_state_type style_current_state;
 
 #if 0
 #ifdef style_USE_PROTOS
-static void styleunput( style_CHAR c, register style_CHAR *style_bp )
+static void styleunput( style_CHAR c, style_CHAR *style_bp )
 #else
 static void styleunput( c, style_bp )
 style_CHAR c;
-register style_CHAR *style_bp;
+style_CHAR *style_bp;
 #endif
 
     {
-    register style_CHAR *style_cp = style_c_buf_p;
+    style_CHAR *style_cp = style_c_buf_p;
 
     /* undo effects of setting up styletext */
     *style_cp = style_hold_char;
 
     if ( style_cp < style_current_buffer->style_ch_buf + 2 )
 	{ /* need to shift things up to make room */
-	register int number_to_move = style_n_chars + 2; /* +2 for EOB chars */
-	register style_CHAR *dest =
+	int number_to_move = style_n_chars + 2; /* +2 for EOB chars */
+	style_CHAR *dest =
 	    &style_current_buffer->style_ch_buf[style_current_buffer->style_buf_size + 2];
-	register style_CHAR *source =
+	style_CHAR *source =
 	    &style_current_buffer->style_ch_buf[number_to_move];
 
 	while ( source > style_current_buffer->style_ch_buf )
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_delete.c b/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_delete.c
index c06f0878..d31aaf0c 100644
--- a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_delete.c
+++ b/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_delete.c
@@ -296,10 +296,10 @@ done2:	mpool_put(t->bt_mp, h, dirty1);
 int
 __bt_dleaf(BTREE *t, PAGE *h, int index)
 {
-	register BLEAF *bl;
-	register indx_t *ip, offset;
-	register size_t nbytes;
-	register int cnt;
+	BLEAF *bl;
+	indx_t *ip, offset;
+	size_t nbytes;
+	int cnt;
 	char *from;
 	void *to;
 
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_get.c b/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_get.c
index d947d1f3..f2ea0f14 100644
--- a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_get.c
+++ b/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_get.c
@@ -151,8 +151,8 @@ __bt_get(const DB *dbp, const DBT *key, DBT *data, u_int flags)
 EPG *
 __bt_first(BTREE *t, const DBT *key, int *exactp)
 {
-	register PAGE *h;
-	register EPG *e;
+	PAGE *h;
+	EPG *e;
 	EPG save;
 	pgno_t cpgno, pg;
 	indx_t cindex;
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_search.c b/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_search.c
index 134755a3..7ab48abd 100644
--- a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_search.c
+++ b/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_search.c
@@ -87,9 +87,9 @@ static char sccsid[] = "@(#)bt_search.c	8.1 (Berkeley) 6/4/93";
 EPG *
 __bt_search(BTREE *t, const DBT *key, int *exactp)
 {
-	register indx_t index;
-	register int base, cmp, lim;
-	register PAGE *h;
+	indx_t index;
+	int base, cmp, lim;
+	PAGE *h;
 	pgno_t pg;
 	static EPG e;
 
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_utils.c b/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_utils.c
index 0535b3cf..3e6f499e 100644
--- a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_utils.c
+++ b/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_utils.c
@@ -85,8 +85,8 @@ static char sccsid[] = "@(#)bt_utils.c	8.2 (Berkeley) 9/7/93";
 int
 __bt_ret(BTREE *t, EPG *e, DBT *key, DBT *data)
 {
-	register BLEAF *bl;
-	register void *p;
+	BLEAF *bl;
+	void *p;
 
 	bl = GETBLEAF(e->page, e->index);
 
@@ -217,8 +217,8 @@ __bt_cmp(BTREE *t, const DBT *k1, EPG *e)
 int
 __bt_defcmp(const DBT *a, const DBT *b)
 {
-	register u_char *p1, *p2;
-	register int diff, len;
+	u_char *p1, *p2;
+	int diff, len;
 
 	len = MIN(a->size, b->size);
 	for (p1 = a->data, p2 = b->data; len--; ++p1, ++p2)
@@ -240,8 +240,8 @@ __bt_defcmp(const DBT *a, const DBT *b)
 int
 __bt_defpfx(const DBT *a, const DBT *b)
 {
-	register u_char *p1, *p2;
-	register int len;
+	u_char *p1, *p2;
+	int len;
 	int cnt;
 
 	cnt = 1;
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/memmove.c b/cde/programs/dtinfo/DtMmdb/btree_berkeley/memmove.c
index 07218ec0..3568a01d 100644
--- a/cde/programs/dtinfo/DtMmdb/btree_berkeley/memmove.c
+++ b/cde/programs/dtinfo/DtMmdb/btree_berkeley/memmove.c
@@ -92,11 +92,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/cde/programs/dtinfo/DtMmdb/btree_berkeley/mktemp.c b/cde/programs/dtinfo/DtMmdb/btree_berkeley/mktemp.c
index e5ab9dda..4f043799 100644
--- a/cde/programs/dtinfo/DtMmdb/btree_berkeley/mktemp.c
+++ b/cde/programs/dtinfo/DtMmdb/btree_berkeley/mktemp.c
@@ -87,9 +87,9 @@ mktemp(char *path)
 }
 
 static int
-_gettemp(char *path, register int *doopen)
+_gettemp(char *path, int *doopen)
 {
-	register char *start, *trv;
+	char *start, *trv;
 	struct stat sbuf;
 	u_int pid;
 
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/mpool.c b/cde/programs/dtinfo/DtMmdb/btree_berkeley/mpool.c
index 973adf17..92ce371b 100644
--- a/cde/programs/dtinfo/DtMmdb/btree_berkeley/mpool.c
+++ b/cde/programs/dtinfo/DtMmdb/btree_berkeley/mpool.c
@@ -441,8 +441,8 @@ mpool_write(MPOOL *mp, BKT *b)
 static BKT *
 mpool_look(MPOOL *mp, pgno_t pgno)
 {
-	register BKT *b;
-	register BKTHDR *tb;
+	BKT *b;
+	BKTHDR *tb;
 
 	/* XXX
 	 * If find the buffer, put it first on the hash chain so can
diff --git a/cde/programs/dtinfo/DtMmdb/compression/ps.C b/cde/programs/dtinfo/DtMmdb/compression/ps.C
index 5a09ab53..747f7314 100644
--- a/cde/programs/dtinfo/DtMmdb/compression/ps.C
+++ b/cde/programs/dtinfo/DtMmdb/compression/ps.C
@@ -435,9 +435,9 @@ static int input ps_PROTO(( void ));
 
 ps_DECL
     {
-    register ps_state_type ps_current_state;
-    register ps_CHAR *ps_cp, *ps_bp;
-    register int ps_act;
+    ps_state_type ps_current_state;
+    ps_CHAR *ps_cp, *ps_bp;
+    int ps_act;
 
 
 
@@ -481,7 +481,7 @@ ps_DECL
 ps_match:
 	do
 	    {
-	    register ps_CHAR ps_c = ps_ec[*ps_cp];
+	    ps_CHAR ps_c = ps_ec[*ps_cp];
 	    if ( ps_accept[ps_current_state] )
 		{
 		ps_last_accepting_state = ps_current_state;
@@ -666,9 +666,9 @@ case ps_STATE_EOF(INITIAL):
 static int ps_get_next_buffer()
 
     {
-    register ps_CHAR *dest = ps_current_buffer->ps_ch_buf;
-    register ps_CHAR *source = pstext - 1; /* copy prev. char, too */
-    register int number_to_move, i;
+    ps_CHAR *dest = ps_current_buffer->ps_ch_buf;
+    ps_CHAR *source = pstext - 1; /* copy prev. char, too */
+    int number_to_move, i;
     int ret_val;
 
     if ( ps_c_buf_p > &ps_current_buffer->ps_ch_buf[ps_n_chars + 1] )
@@ -747,14 +747,14 @@ static int ps_get_next_buffer()
 static ps_state_type ps_get_previous_state()
 
     {
-    register ps_state_type ps_current_state;
-    register ps_CHAR *ps_cp;
+    ps_state_type ps_current_state;
+    ps_CHAR *ps_cp;
 
     ps_current_state = ps_start;
 
     for ( ps_cp = pstext + ps_MORE_ADJ; ps_cp < ps_c_buf_p; ++ps_cp )
 	{
-	register ps_CHAR ps_c = (*ps_cp ? ps_ec[*ps_cp] : 1);
+	ps_CHAR ps_c = (*ps_cp ? ps_ec[*ps_cp] : 1);
 	if ( ps_accept[ps_current_state] )
 	    {
 	    ps_last_accepting_state = ps_current_state;
@@ -780,17 +780,17 @@ static ps_state_type ps_get_previous_state()
  */
 
 #ifdef ps_USE_PROTOS
-static ps_state_type ps_try_NUL_trans( register ps_state_type ps_current_state )
+static ps_state_type ps_try_NUL_trans( ps_state_type ps_current_state )
 #else
 static ps_state_type ps_try_NUL_trans( ps_current_state )
-register ps_state_type ps_current_state;
+ps_state_type ps_current_state;
 #endif
 
     {
-    register int ps_is_jam;
-    register ps_CHAR *ps_cp = ps_c_buf_p;
+    int ps_is_jam;
+    ps_CHAR *ps_cp = ps_c_buf_p;
 
-    register ps_CHAR ps_c = 1;
+    ps_CHAR ps_c = 1;
     if ( ps_accept[ps_current_state] )
 	{
 	ps_last_accepting_state = ps_current_state;
@@ -811,25 +811,25 @@ register ps_state_type ps_current_state;
 
 #if 0
 #ifdef ps_USE_PROTOS
-static void psunput( ps_CHAR c, register ps_CHAR *ps_bp )
+static void psunput( ps_CHAR c, ps_CHAR *ps_bp )
 #else
 static void psunput( c, ps_bp )
 ps_CHAR c;
-register ps_CHAR *ps_bp;
+ps_CHAR *ps_bp;
 #endif
 
     {
-    register ps_CHAR *ps_cp = ps_c_buf_p;
+    ps_CHAR *ps_cp = ps_c_buf_p;
 
     /* undo effects of setting up pstext */
     *ps_cp = ps_hold_char;
 
     if ( ps_cp < ps_current_buffer->ps_ch_buf + 2 )
 	{ /* need to shift things up to make room */
-	register int number_to_move = ps_n_chars + 2; /* +2 for EOB chars */
-	register ps_CHAR *dest =
+	int number_to_move = ps_n_chars + 2; /* +2 for EOB chars */
+	ps_CHAR *dest =
 	    &ps_current_buffer->ps_ch_buf[ps_current_buffer->ps_buf_size + 2];
-	register ps_CHAR *source =
+	ps_CHAR *source =
 	    &ps_current_buffer->ps_ch_buf[number_to_move];
 
 	while ( source > ps_current_buffer->ps_ch_buf )
diff --git a/cde/programs/dtinfo/DtMmdb/compression/sgml.C b/cde/programs/dtinfo/DtMmdb/compression/sgml.C
index a06a0147..bcfd4cea 100644
--- a/cde/programs/dtinfo/DtMmdb/compression/sgml.C
+++ b/cde/programs/dtinfo/DtMmdb/compression/sgml.C
@@ -441,9 +441,9 @@ static int input sgml_PROTO(( void ));
 
 sgml_DECL
     {
-    register sgml_state_type sgml_current_state;
-    register sgml_CHAR *sgml_cp, *sgml_bp;
-    register int sgml_act;
+    sgml_state_type sgml_current_state;
+    sgml_CHAR *sgml_cp, *sgml_bp;
+    int sgml_act;
 
 
 
@@ -487,7 +487,7 @@ sgml_DECL
 sgml_match:
 	do
 	    {
-	    register sgml_CHAR sgml_c = sgml_ec[*sgml_cp];
+	    sgml_CHAR sgml_c = sgml_ec[*sgml_cp];
 	    if ( sgml_accept[sgml_current_state] )
 		{
 		sgml_last_accepting_state = sgml_current_state;
@@ -677,9 +677,9 @@ case sgml_STATE_EOF(INITIAL):
 static int sgml_get_next_buffer()
 
     {
-    register sgml_CHAR *dest = sgml_current_buffer->sgml_ch_buf;
-    register sgml_CHAR *source = sgmltext - 1; /* copy prev. char, too */
-    register int number_to_move, i;
+    sgml_CHAR *dest = sgml_current_buffer->sgml_ch_buf;
+    sgml_CHAR *source = sgmltext - 1; /* copy prev. char, too */
+    int number_to_move, i;
     int ret_val;
 
     if ( sgml_c_buf_p > &sgml_current_buffer->sgml_ch_buf[sgml_n_chars + 1] )
@@ -758,14 +758,14 @@ static int sgml_get_next_buffer()
 static sgml_state_type sgml_get_previous_state()
 
     {
-    register sgml_state_type sgml_current_state;
-    register sgml_CHAR *sgml_cp;
+    sgml_state_type sgml_current_state;
+    sgml_CHAR *sgml_cp;
 
     sgml_current_state = sgml_start;
 
     for ( sgml_cp = sgmltext + sgml_MORE_ADJ; sgml_cp < sgml_c_buf_p; ++sgml_cp )
 	{
-	register sgml_CHAR sgml_c = (*sgml_cp ? sgml_ec[*sgml_cp] : 1);
+	sgml_CHAR sgml_c = (*sgml_cp ? sgml_ec[*sgml_cp] : 1);
 	if ( sgml_accept[sgml_current_state] )
 	    {
 	    sgml_last_accepting_state = sgml_current_state;
@@ -791,17 +791,17 @@ static sgml_state_type sgml_get_previous_state()
  */
 
 #ifdef sgml_USE_PROTOS
-static sgml_state_type sgml_try_NUL_trans( register sgml_state_type sgml_current_state )
+static sgml_state_type sgml_try_NUL_trans( sgml_state_type sgml_current_state )
 #else
 static sgml_state_type sgml_try_NUL_trans( sgml_current_state )
-register sgml_state_type sgml_current_state;
+sgml_state_type sgml_current_state;
 #endif
 
     {
-    register int sgml_is_jam;
-    register sgml_CHAR *sgml_cp = sgml_c_buf_p;
+    int sgml_is_jam;
+    sgml_CHAR *sgml_cp = sgml_c_buf_p;
 
-    register sgml_CHAR sgml_c = 1;
+    sgml_CHAR sgml_c = 1;
     if ( sgml_accept[sgml_current_state] )
 	{
 	sgml_last_accepting_state = sgml_current_state;
@@ -822,25 +822,25 @@ register sgml_state_type sgml_current_state;
 
 #if 0
 #ifdef sgml_USE_PROTOS
-static void sgmlunput( sgml_CHAR c, register sgml_CHAR *sgml_bp )
+static void sgmlunput( sgml_CHAR c, sgml_CHAR *sgml_bp )
 #else
 static void sgmlunput( c, sgml_bp )
 sgml_CHAR c;
-register sgml_CHAR *sgml_bp;
+sgml_CHAR *sgml_bp;
 #endif
 
     {
-    register sgml_CHAR *sgml_cp = sgml_c_buf_p;
+    sgml_CHAR *sgml_cp = sgml_c_buf_p;
 
     /* undo effects of setting up sgmltext */
     *sgml_cp = sgml_hold_char;
 
     if ( sgml_cp < sgml_current_buffer->sgml_ch_buf + 2 )
 	{ /* need to shift things up to make room */
-	register int number_to_move = sgml_n_chars + 2; /* +2 for EOB chars */
-	register sgml_CHAR *dest =
+	int number_to_move = sgml_n_chars + 2; /* +2 for EOB chars */
+	sgml_CHAR *dest =
 	    &sgml_current_buffer->sgml_ch_buf[sgml_current_buffer->sgml_buf_size + 2];
-	register sgml_CHAR *source =
+	sgml_CHAR *source =
 	    &sgml_current_buffer->sgml_ch_buf[number_to_move];
 
 	while ( source > sgml_current_buffer->sgml_ch_buf )
diff --git a/cde/programs/dtinfo/DtMmdb/schema/sheet.C b/cde/programs/dtinfo/DtMmdb/schema/sheet.C
index c512d669..14c59e9a 100644
--- a/cde/programs/dtinfo/DtMmdb/schema/sheet.C
+++ b/cde/programs/dtinfo/DtMmdb/schema/sheet.C
@@ -350,9 +350,9 @@ extern char *getenv(const char *);
 int
  schemaparse()
 {
-    register int  schemam,  scheman,  schemastate;
+    int  schemam,  scheman,  schemastate;
 #if  schemaDEBUG
-    register char * schemas;
+    char * schemas;
 
     if ( schemas = getenv(" schemaDEBUG"))
     {
diff --git a/cde/programs/dtinfo/DtMmdb/schema/token.C b/cde/programs/dtinfo/DtMmdb/schema/token.C
index 9b3b2c2d..842ba749 100644
--- a/cde/programs/dtinfo/DtMmdb/schema/token.C
+++ b/cde/programs/dtinfo/DtMmdb/schema/token.C
@@ -520,9 +520,9 @@ static int input  schema_PROTO(( void ));
 
  schema_DECL
     {
-    register  schema_state_type  schema_current_state;
-    register  schema_CHAR * schema_cp, * schema_bp;
-    register int  schema_act;
+     schema_state_type  schema_current_state;
+     schema_CHAR * schema_cp, * schema_bp;
+    int  schema_act;
 
 
 
@@ -568,7 +568,7 @@ static int input  schema_PROTO(( void ));
  schema_match:
 	do
 	    {
-	    register  schema_CHAR  schema_c =  schema_ec[* schema_cp];
+	     schema_CHAR  schema_c =  schema_ec[* schema_cp];
 	    if (  schema_accept[ schema_current_state] )
 		{
 		 schema_last_accepting_state =  schema_current_state;
@@ -922,9 +922,9 @@ case  schema_STATE_EOF(INITIAL):
 static int  schema_get_next_buffer()
 
     {
-    register  schema_CHAR *dest =  schema_current_buffer-> schema_ch_buf;
-    register  schema_CHAR *source =  schematext - 1; /* copy prev. char, too */
-    register int number_to_move, i;
+     schema_CHAR *dest =  schema_current_buffer-> schema_ch_buf;
+     schema_CHAR *source =  schematext - 1; /* copy prev. char, too */
+    int number_to_move, i;
     int ret_val;
 
     if (  schema_c_buf_p > & schema_current_buffer-> schema_ch_buf[ schema_n_chars + 1] )
@@ -1003,10 +1003,10 @@ static int  schema_get_next_buffer()
 static  schema_state_type  schema_get_previous_state()
 
     {
-    register  schema_state_type  schema_current_state;
-    register  schema_CHAR * schema_cp;
+     schema_state_type  schema_current_state;
+     schema_CHAR * schema_cp;
 
-    register  schema_CHAR * schema_bp =  schematext;
+     schema_CHAR * schema_bp =  schematext;
 
      schema_current_state =  schema_start;
     if (  schema_bp[-1] == '\n' )
@@ -1014,7 +1014,7 @@ static  schema_state_type  schema_get_previous_state()
 
     for (  schema_cp =  schematext +  schema_MORE_ADJ;  schema_cp <  schema_c_buf_p; ++ schema_cp )
 	{
-	register  schema_CHAR  schema_c = (* schema_cp ?  schema_ec[* schema_cp] : 1);
+	 schema_CHAR  schema_c = (* schema_cp ?  schema_ec[* schema_cp] : 1);
 	if (  schema_accept[ schema_current_state] )
 	    {
 	     schema_last_accepting_state =  schema_current_state;
@@ -1040,17 +1040,17 @@ static  schema_state_type  schema_get_previous_state()
  */
 
 #ifdef  schema_USE_PROTOS
-static  schema_state_type  schema_try_NUL_trans( register  schema_state_type  schema_current_state )
+static  schema_state_type  schema_try_NUL_trans(  schema_state_type  schema_current_state )
 #else
 static  schema_state_type  schema_try_NUL_trans(  schema_current_state )
-register  schema_state_type  schema_current_state;
+ schema_state_type  schema_current_state;
 #endif
 
     {
-    register int  schema_is_jam;
-    register  schema_CHAR * schema_cp =  schema_c_buf_p;
+    int  schema_is_jam;
+     schema_CHAR * schema_cp =  schema_c_buf_p;
 
-    register  schema_CHAR  schema_c = 1;
+     schema_CHAR  schema_c = 1;
     if (  schema_accept[ schema_current_state] )
 	{
 	 schema_last_accepting_state =  schema_current_state;
@@ -1071,25 +1071,25 @@ register  schema_state_type  schema_current_state;
 
 #if 0
 #ifdef  schema_USE_PROTOS
-static void  schemaunput(  schema_CHAR c, register  schema_CHAR * schema_bp )
+static void  schemaunput(  schema_CHAR c,  schema_CHAR * schema_bp )
 #else
 static void  schemaunput( c,  schema_bp )
  schema_CHAR c;
-register  schema_CHAR * schema_bp;
+ schema_CHAR * schema_bp;
 #endif
 
     {
-    register  schema_CHAR * schema_cp =  schema_c_buf_p;
+     schema_CHAR * schema_cp =  schema_c_buf_p;
 
     /* undo effects of setting up  schematext */
     * schema_cp =  schema_hold_char;
 
     if (  schema_cp <  schema_current_buffer-> schema_ch_buf + 2 )
 	{ /* need to shift things up to make room */
-	register int number_to_move =  schema_n_chars + 2; /* +2 for EOB chars */
-	register  schema_CHAR *dest =
+	int number_to_move =  schema_n_chars + 2; /* +2 for EOB chars */
+	 schema_CHAR *dest =
 	    & schema_current_buffer-> schema_ch_buf[ schema_current_buffer-> schema_buf_size + 2];
-	register  schema_CHAR *source =
+	 schema_CHAR *source =
 	    & schema_current_buffer-> schema_ch_buf[number_to_move];
 
 	while ( source >  schema_current_buffer-> schema_ch_buf )
diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/Atomizer.C b/cde/programs/dtinfo/dtinfo/src/Basic/Atomizer.C
index 7b5825c5..4d0b88d2 100644
--- a/cde/programs/dtinfo/dtinfo/src/Basic/Atomizer.C
+++ b/cde/programs/dtinfo/dtinfo/src/Basic/Atomizer.C
@@ -82,7 +82,7 @@ public: // variables
 Atomizer::Atomizer (const char *string)
 {
   // Try to find the string in the pool of strings
-  register unsigned int i;
+  unsigned int i;
 
   for (i = 0; i < f_pool.length(); i++)
     if (((PoolString *)f_pool[i])->equals (string))
diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/HashTbl.C b/cde/programs/dtinfo/dtinfo/src/Basic/HashTbl.C
index 5c8e5a70..43969084 100644
--- a/cde/programs/dtinfo/dtinfo/src/Basic/HashTbl.C
+++ b/cde/programs/dtinfo/dtinfo/src/Basic/HashTbl.C
@@ -68,7 +68,7 @@ public: // functions
 int
 HashBucket::find (FolioObject &element)
 {
-  register int i;
+  int i;
 
   for (i = 0; i < f_length; i++)
     {
@@ -87,7 +87,7 @@ HashBucket::find (FolioObject &element)
 void
 HashBucket::remove (FolioObject &element)
 {
-  register int i;
+  int i;
 
   for (i = 0; i < f_length; i++)
     {
diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/List.C b/cde/programs/dtinfo/dtinfo/src/Basic/List.C
index 7f4c1d59..bd925141 100644
--- a/cde/programs/dtinfo/dtinfo/src/Basic/List.C
+++ b/cde/programs/dtinfo/dtinfo/src/Basic/List.C
@@ -188,7 +188,7 @@ int
 List::find (FolioObject &element)
 {
   /* -------- Search through the list, looking for element. -------- */
-  register int i;
+  int i;
 
   for (i = 0; i < f_length; i++)
     if (f_list_element[i] == &element)
diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/StringHash.C b/cde/programs/dtinfo/dtinfo/src/Basic/StringHash.C
index d9720f76..03f9046e 100644
--- a/cde/programs/dtinfo/dtinfo/src/Basic/StringHash.C
+++ b/cde/programs/dtinfo/dtinfo/src/Basic/StringHash.C
@@ -76,8 +76,8 @@ string_hash (const char *key)
 {
   assert (key != NULL);
 
-  register u_int pos, sum = 0;
-  register char c;
+  u_int pos, sum = 0;
+  char c;
 
   for (pos = 0; (c = *key++); pos++)
     sum = (sum << 5) + (sum >> (sizeof(int) * 8 - 6))
diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Panner.c b/cde/programs/dtinfo/dtinfo/src/Widgets/Panner.c
index f375f1b7..5e30837b 100644
--- a/cde/programs/dtinfo/dtinfo/src/Widgets/Panner.c
+++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Panner.c
@@ -305,7 +305,7 @@ static void reset_xor_gc (PannerWidget pw)		/* used when resources change */
 }
 
 
-static void check_knob (register PannerWidget pw, Boolean knob)
+static void check_knob (PannerWidget pw, Boolean knob)
 {
     Position pad = pw->panner.internal_border * 2;
     Position maxx = (((Position) pw->core.width) - pad -
@@ -335,14 +335,14 @@ static void check_knob (register PannerWidget pw, Boolean knob)
 }
 
 
-static void move_shadow (register PannerWidget pw)
+static void move_shadow (PannerWidget pw)
 {
     if (pw->panner.shadow_thickness > 0) {
 	int lw = pw->panner.shadow_thickness + pw->panner.line_width * 2;
 	int pad = pw->panner.internal_border;
 
 	if ((int)pw->panner.knob_height > lw && (int)pw->panner.knob_width > lw) {
-	    register XRectangle *r = pw->panner.shadow_rects;
+	    XRectangle *r = pw->panner.shadow_rects;
 	    r->x = (short) (pw->panner.knob_x + pad + pw->panner.knob_width);
 	    r->y = (short) (pw->panner.knob_y + pad + lw);
 	    r->width = pw->panner.shadow_thickness;
@@ -445,7 +445,7 @@ static Boolean get_event_xy (PannerWidget pw, XEvent *event, int *x, int *y)
     return FALSE;
 }
 
-static int parse_page_string (register char *s, int pagesize, int canvassize, Boolean *relative)
+static int parse_page_string (char *s, int pagesize, int canvassize, Boolean *relative)
 {
     char *cp;
     double val = 1.0;
diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Porthole.c b/cde/programs/dtinfo/dtinfo/src/Widgets/Porthole.c
index 1acd7e02..8c6dc20f 100644
--- a/cde/programs/dtinfo/dtinfo/src/Widgets/Porthole.c
+++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Porthole.c
@@ -166,10 +166,10 @@ WidgetClass portholeWidgetClass = (WidgetClass) &portholeClassRec;
  *                                                                           *
  *****************************************************************************/
 
-static Widget find_child (register PortholeWidget pw)
+static Widget find_child (PortholeWidget pw)
 {
-    register Widget *children;
-    register int i;
+    Widget *children;
+    int i;
 
     /*
      * Find the managed child on which we should operate.  Ignore multiple
@@ -251,7 +251,7 @@ static void layout_child (PortholeWidget pw, Widget child,
  *****************************************************************************/
 
 
-static void Realize (register Widget gw, Mask *valueMask, XSetWindowAttributes *attributes)
+static void Realize (Widget gw, Mask *valueMask, XSetWindowAttributes *attributes)
 {
     attributes->bit_gravity = NorthWestGravity;
     *valueMask |= CWBitGravity;
@@ -286,7 +286,7 @@ static void Resize (Widget gw)
 
 static XtGeometryResult QueryGeometry (Widget gw, XtWidgetGeometry *intended, XtWidgetGeometry *preferred)
 {
-    register PortholeWidget pw = (PortholeWidget) gw;
+    PortholeWidget pw = (PortholeWidget) gw;
     Widget child = find_child (pw);
 
     if (child) {
diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Simple.c b/cde/programs/dtinfo/dtinfo/src/Widgets/Simple.c
index 14b29738..53c11778 100644
--- a/cde/programs/dtinfo/dtinfo/src/Widgets/Simple.c
+++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Simple.c
@@ -159,8 +159,8 @@ static void ClassInitialize(void)
 
 static void ClassPartInitialize(WidgetClass class)
 {
-    register SimpleWidgetClass c = (SimpleWidgetClass)class;
-    register SimpleWidgetClass super = (SimpleWidgetClass) 
+    SimpleWidgetClass c = (SimpleWidgetClass)class;
+    SimpleWidgetClass super = (SimpleWidgetClass)
 	c->core_class.superclass;
 
     if (c->simple_class.change_sensitive == NULL) {
@@ -177,7 +177,7 @@ static void ClassPartInitialize(WidgetClass class)
 	c->simple_class.change_sensitive = super->simple_class.change_sensitive;
 }
 
-static void Realize(register Widget w, Mask *valueMask, XSetWindowAttributes *attributes)
+static void Realize(Widget w, Mask *valueMask, XSetWindowAttributes *attributes)
 {
     Pixmap border_pixmap = 0;
 
@@ -278,7 +278,7 @@ static Boolean SetValues(Widget current, Widget request, Widget new)
 }
 
 
-static Boolean ChangeSensitive(register Widget w)
+static Boolean ChangeSensitive(Widget w)
 {
     if (XtIsRealized(w)) {
 	if (XtIsSensitive(w))
diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Tree.c b/cde/programs/dtinfo/dtinfo/src/Widgets/Tree.c
index b0670c21..5bbd7860 100644
--- a/cde/programs/dtinfo/dtinfo/src/Widgets/Tree.c
+++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Tree.c
@@ -212,8 +212,8 @@ WidgetClass treeWidgetClass = (WidgetClass) &treeClassRec;
 
 static void initialize_dimensions (Dimension **listp, int *sizep, int n)
 {
-    register int i;
-    register Dimension *l;
+    int i;
+    Dimension *l;
 
     if (!*listp) {
 	*listp = (Dimension *) XtCalloc ((unsigned int) n,
@@ -579,7 +579,7 @@ static void Redisplay (TreeWidget tw, XEvent *event, Region region)
 	Window w = XtWindow (tw);
 
 	for (i = 0; i < tw->composite.num_children; i++) {
-	    register Widget child = tw->composite.children[i];
+	    Widget child = tw->composite.children[i];
 	    TreeConstraints tc = TREE_CONSTRAINT(child);
 
 	    /*
@@ -606,7 +606,7 @@ static void Redisplay (TreeWidget tw, XEvent *event, Region region)
 		}
 
 		for (j = 0; j < tc->tree.n_children; j++) {
-		    register Widget k = tc->tree.children[j];
+		    Widget k = tc->tree.children[j];
 		    GC gc = (tc->tree.gc ? tc->tree.gc : tw->tree.gc);
 
 		    switch (tw->tree.gravity) {
@@ -662,7 +662,7 @@ static void Redisplay (TreeWidget tw, XEvent *event, Region region)
 
 static XtGeometryResult QueryGeometry (Widget w, XtWidgetGeometry *intended, XtWidgetGeometry *preferred)
 {
-    register TreeWidget tw = (TreeWidget) w;
+    TreeWidget tw = (TreeWidget) w;
 
     preferred->request_mode = (CWWidth | CWHeight);
     preferred->width = tw->tree.maxwidth;
@@ -695,7 +695,7 @@ static XtGeometryResult QueryGeometry (Widget w, XtWidgetGeometry *intended, XtW
 static void compute_bounding_box_subtree (TreeWidget tree, Widget w, int depth)
 {
     TreeConstraints tc = TREE_CONSTRAINT(w);  /* info attached to all kids */
-    register int i;
+    int i;
     Bool horiz = IsHorizontal (tree);
     Dimension newwidth, newheight;
     Dimension bw2 = w->core.border_width * 2;
@@ -804,7 +804,7 @@ static void arrange_subtree (TreeWidget tree, Widget w, int depth, Position x, P
 {
     TreeConstraints tc = TREE_CONSTRAINT(w);  /* info attached to all kids */
     TreeConstraints firstcc, lastcc;
-    register int i;
+    int i;
     int newx, newy;
     Bool horiz = IsHorizontal (tree);
     Widget child = NULL;
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.C
index d2aa3d37..104c1d56 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.C
@@ -1768,9 +1768,9 @@ static int input ol_data_PROTO(( void ));
 
 ol_data_DECL
     {
-    register ol_data_state_type ol_data_current_state;
-    register ol_data_CHAR *ol_data_cp, *ol_data_bp;
-    register int ol_data_act;
+    ol_data_state_type ol_data_current_state;
+    ol_data_CHAR *ol_data_cp, *ol_data_bp;
+    int ol_data_act;
 
 
 
@@ -2065,9 +2065,9 @@ case ol_data_STATE_EOF(INITIAL):
 static int ol_data_get_next_buffer()
 
     {
-    register ol_data_CHAR *dest = ol_data_current_buffer->ol_data_ch_buf;
-    register ol_data_CHAR *source = ol_datatext - 1; /* copy prev. char, too */
-    register int number_to_move, i;
+    ol_data_CHAR *dest = ol_data_current_buffer->ol_data_ch_buf;
+    ol_data_CHAR *source = ol_datatext - 1; /* copy prev. char, too */
+    int number_to_move, i;
     int ret_val;
 
     if ( ol_data_c_buf_p > &ol_data_current_buffer->ol_data_ch_buf[ol_data_n_chars + 1] )
@@ -2146,8 +2146,8 @@ static int ol_data_get_next_buffer()
 static ol_data_state_type ol_data_get_previous_state()
 
     {
-    register ol_data_state_type ol_data_current_state;
-    register ol_data_CHAR *ol_data_cp;
+    ol_data_state_type ol_data_current_state;
+    ol_data_CHAR *ol_data_cp;
 
     ol_data_current_state = ol_data_start;
 
@@ -2177,15 +2177,15 @@ static ol_data_state_type ol_data_get_previous_state()
  */
 
 #ifdef ol_data_USE_PROTOS
-static ol_data_state_type ol_data_try_NUL_trans( register ol_data_state_type ol_data_current_state )
+static ol_data_state_type ol_data_try_NUL_trans( ol_data_state_type ol_data_current_state )
 #else
 static ol_data_state_type ol_data_try_NUL_trans( ol_data_current_state )
-register ol_data_state_type ol_data_current_state;
+ol_data_state_type ol_data_current_state;
 #endif
 
     {
-    register int ol_data_is_jam;
-    register ol_data_CHAR *ol_data_cp = ol_data_c_buf_p;
+    int ol_data_is_jam;
+    ol_data_CHAR *ol_data_cp = ol_data_c_buf_p;
 
     ol_data_current_state = ol_data_NUL_trans[ol_data_current_state];
     ol_data_is_jam = (ol_data_current_state == 0);
@@ -2205,25 +2205,25 @@ register ol_data_state_type ol_data_current_state;
 
 #if 0
 #ifdef ol_data_USE_PROTOS
-static void ol_dataunput( ol_data_CHAR c, register ol_data_CHAR *ol_data_bp )
+static void ol_dataunput( ol_data_CHAR c, ol_data_CHAR *ol_data_bp )
 #else
 static void ol_dataunput( c, ol_data_bp )
 ol_data_CHAR c;
-register ol_data_CHAR *ol_data_bp;
+ol_data_CHAR *ol_data_bp;
 #endif
 
     {
-    register ol_data_CHAR *ol_data_cp = ol_data_c_buf_p;
+    ol_data_CHAR *ol_data_cp = ol_data_c_buf_p;
 
     /* undo effects of setting up ol_datatext */
     *ol_data_cp = ol_data_hold_char;
 
     if ( ol_data_cp < ol_data_current_buffer->ol_data_ch_buf + 2 )
 	{ /* need to shift things up to make room */
-	register int number_to_move = ol_data_n_chars + 2; /* +2 for EOB chars */
-	register ol_data_CHAR *dest =
+	int number_to_move = ol_data_n_chars + 2; /* +2 for EOB chars */
+	ol_data_CHAR *dest =
 	    &ol_data_current_buffer->ol_data_ch_buf[ol_data_current_buffer->ol_data_buf_size + 2];
-	register ol_data_CHAR *source =
+	ol_data_CHAR *source =
 	    &ol_data_current_buffer->ol_data_ch_buf[number_to_move];
 
 	while ( source > ol_data_current_buffer->ol_data_ch_buf )
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.C
index 8ec441d3..8425d6a8 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.C
@@ -168,9 +168,9 @@ extern char *getenv(const char *);
 int
 ol_dataparse()
 {
-    register int ol_datam, ol_datan, ol_datastate;
+    int ol_datam, ol_datan, ol_datastate;
 #if ol_dataDEBUG
-    register char *ol_datas;
+    char *ol_datas;
 
     if ((ol_datas = getenv("ol_dataDEBUG")))
     {
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.C
index 65c9c832..97a203bf 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.C
@@ -2243,9 +2243,9 @@ static int input remote_PROTO(( void ));
 
 remote_DECL
     {
-    register remote_state_type remote_current_state;
-    register remote_CHAR *remote_cp, *remote_bp;
-    register int remote_act;
+    remote_state_type remote_current_state;
+    remote_CHAR *remote_cp, *remote_bp;
+    int remote_act;
 
 
 
@@ -2550,9 +2550,9 @@ case remote_STATE_EOF(OLIDREF_FILE):
 static int remote_get_next_buffer()
 
     {
-    register remote_CHAR *dest = remote_current_buffer->remote_ch_buf;
-    register remote_CHAR *source = remotetext - 1; /* copy prev. char, too */
-    register int number_to_move, i;
+    remote_CHAR *dest = remote_current_buffer->remote_ch_buf;
+    remote_CHAR *source = remotetext - 1; /* copy prev. char, too */
+    int number_to_move, i;
     int ret_val;
 
     if ( remote_c_buf_p > &remote_current_buffer->remote_ch_buf[remote_n_chars + 1] )
@@ -2631,8 +2631,8 @@ static int remote_get_next_buffer()
 static remote_state_type remote_get_previous_state()
 
     {
-    register remote_state_type remote_current_state;
-    register remote_CHAR *remote_cp;
+    remote_state_type remote_current_state;
+    remote_CHAR *remote_cp;
 
     remote_current_state = remote_start;
 
@@ -2662,15 +2662,15 @@ static remote_state_type remote_get_previous_state()
  */
 
 #ifdef remote_USE_PROTOS
-static remote_state_type remote_try_NUL_trans( register remote_state_type remote_current_state )
+static remote_state_type remote_try_NUL_trans( remote_state_type remote_current_state )
 #else
 static remote_state_type remote_try_NUL_trans( remote_current_state )
-register remote_state_type remote_current_state;
+remote_state_type remote_current_state;
 #endif
 
     {
-    register int remote_is_jam;
-    register remote_CHAR *remote_cp = remote_c_buf_p;
+    int remote_is_jam;
+    remote_CHAR *remote_cp = remote_c_buf_p;
 
     remote_current_state = remote_NUL_trans[remote_current_state];
     remote_is_jam = (remote_current_state == 0);
@@ -2690,25 +2690,25 @@ register remote_state_type remote_current_state;
 
 #if 0
 #ifdef remote_USE_PROTOS
-static void remoteunput( remote_CHAR c, register remote_CHAR *remote_bp )
+static void remoteunput( remote_CHAR c, remote_CHAR *remote_bp )
 #else
 static void remoteunput( c, remote_bp )
 remote_CHAR c;
-register remote_CHAR *remote_bp;
+remote_CHAR *remote_bp;
 #endif
 
     {
-    register remote_CHAR *remote_cp = remote_c_buf_p;
+    remote_CHAR *remote_cp = remote_c_buf_p;
 
     /* undo effects of setting up remotetext */
     *remote_cp = remote_hold_char;
 
     if ( remote_cp < remote_current_buffer->remote_ch_buf + 2 )
 	{ /* need to shift things up to make room */
-	register int number_to_move = remote_n_chars + 2; /* +2 for EOB chars */
-	register remote_CHAR *dest =
+	int number_to_move = remote_n_chars + 2; /* +2 for EOB chars */
+	remote_CHAR *dest =
 	    &remote_current_buffer->remote_ch_buf[remote_current_buffer->remote_buf_size + 2];
-	register remote_CHAR *source =
+	remote_CHAR *source =
 	    &remote_current_buffer->remote_ch_buf[number_to_move];
 
 	while ( source > remote_current_buffer->remote_ch_buf )
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.C
index 20a1e606..160cd96e 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.C
@@ -3048,9 +3048,9 @@ static int input nodedata_PROTO(( void ));
 
 nodedata_DECL
     {
-    register nodedata_state_type nodedata_current_state;
-    register nodedata_CHAR *nodedata_cp, *nodedata_bp;
-    register int nodedata_act;
+    nodedata_state_type nodedata_current_state;
+    nodedata_CHAR *nodedata_cp, *nodedata_bp;
+    int nodedata_act;
 
 
 
@@ -3381,9 +3381,9 @@ case nodedata_STATE_EOF(XREF):
 static int nodedata_get_next_buffer()
 
     {
-    register nodedata_CHAR *dest = nodedata_current_buffer->nodedata_ch_buf;
-    register nodedata_CHAR *source = nodedatatext - 1; /* copy prev. char, too */
-    register int number_to_move, i;
+    nodedata_CHAR *dest = nodedata_current_buffer->nodedata_ch_buf;
+    nodedata_CHAR *source = nodedatatext - 1; /* copy prev. char, too */
+    int number_to_move, i;
     int ret_val;
 
     if ( nodedata_c_buf_p > &nodedata_current_buffer->nodedata_ch_buf[nodedata_n_chars + 1] )
@@ -3462,8 +3462,8 @@ static int nodedata_get_next_buffer()
 static nodedata_state_type nodedata_get_previous_state()
 
     {
-    register nodedata_state_type nodedata_current_state;
-    register nodedata_CHAR *nodedata_cp;
+    nodedata_state_type nodedata_current_state;
+    nodedata_CHAR *nodedata_cp;
 
     nodedata_current_state = nodedata_start;
 
@@ -3493,15 +3493,15 @@ static nodedata_state_type nodedata_get_previous_state()
  */
 
 #ifdef nodedata_USE_PROTOS
-static nodedata_state_type nodedata_try_NUL_trans( register nodedata_state_type nodedata_current_state )
+static nodedata_state_type nodedata_try_NUL_trans( nodedata_state_type nodedata_current_state )
 #else
 static nodedata_state_type nodedata_try_NUL_trans( nodedata_current_state )
-register nodedata_state_type nodedata_current_state;
+nodedata_state_type nodedata_current_state;
 #endif
 
     {
-    register int nodedata_is_jam;
-    register nodedata_CHAR *nodedata_cp = nodedata_c_buf_p;
+    int nodedata_is_jam;
+    nodedata_CHAR *nodedata_cp = nodedata_c_buf_p;
 
     nodedata_current_state = nodedata_NUL_trans[nodedata_current_state];
     nodedata_is_jam = (nodedata_current_state == 0);
@@ -3521,25 +3521,25 @@ register nodedata_state_type nodedata_current_state;
 
 #if 0
 #ifdef nodedata_USE_PROTOS
-static void nodedataunput( nodedata_CHAR c, register nodedata_CHAR *nodedata_bp )
+static void nodedataunput( nodedata_CHAR c, nodedata_CHAR *nodedata_bp )
 #else
 static void nodedataunput( c, nodedata_bp )
 nodedata_CHAR c;
-register nodedata_CHAR *nodedata_bp;
+nodedata_CHAR *nodedata_bp;
 #endif
 
     {
-    register nodedata_CHAR *nodedata_cp = nodedata_c_buf_p;
+    nodedata_CHAR *nodedata_cp = nodedata_c_buf_p;
 
     /* undo effects of setting up nodedatatext */
     *nodedata_cp = nodedata_hold_char;
 
     if ( nodedata_cp < nodedata_current_buffer->nodedata_ch_buf + 2 )
 	{ /* need to shift things up to make room */
-	register int number_to_move = nodedata_n_chars + 2; /* +2 for EOB chars */
-	register nodedata_CHAR *dest =
+	int number_to_move = nodedata_n_chars + 2; /* +2 for EOB chars */
+	nodedata_CHAR *dest =
 	    &nodedata_current_buffer->nodedata_ch_buf[nodedata_current_buffer->nodedata_buf_size + 2];
-	register nodedata_CHAR *source =
+	nodedata_CHAR *source =
 	    &nodedata_current_buffer->nodedata_ch_buf[number_to_move];
 
 	while ( source > nodedata_current_buffer->nodedata_ch_buf )
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C
index 8bd09629..3c1688e3 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C
@@ -45,10 +45,10 @@ using namespace std;
  */
 
 int
-strcasecmp(register const char *s1,
-	   register const char *s2)
+strcasecmp(const char *s1,
+	   const char *s2)
 {
-    register int c1, c2;
+    int c1, c2;
 
     while (*s1 && *s2) {
 	c1 = isupper(*s1) ? tolower(*s1) : *s1;
@@ -63,11 +63,11 @@ strcasecmp(register const char *s1,
 
 
 int
-strncasecmp(register const char *s1,
-	    register const char *s2,
-	    register size_t count)
+strncasecmp(const char *s1,
+	    const char *s2,
+	    size_t count)
 {
-    register int c1, c2;
+    int c1, c2;
 
     if (!count)
       return 0;
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.C
index d4b04f92..7aaf15e3 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.C
@@ -1883,9 +1883,9 @@ static int input graphics_task_PROTO(( void ));
 
 graphics_task_DECL
     {
-    register graphics_task_state_type graphics_task_current_state;
-    register graphics_task_CHAR *graphics_task_cp, *graphics_task_bp;
-    register int graphics_task_act;
+    graphics_task_state_type graphics_task_current_state;
+    graphics_task_CHAR *graphics_task_cp, *graphics_task_bp;
+    int graphics_task_act;
 
 
 
@@ -2162,9 +2162,9 @@ case graphics_task_STATE_EOF(INITIAL):
 static int graphics_task_get_next_buffer()
 
     {
-    register graphics_task_CHAR *dest = graphics_task_current_buffer->graphics_task_ch_buf;
-    register graphics_task_CHAR *source = graphics_tasktext - 1; /* copy prev. char, too */
-    register int number_to_move, i;
+    graphics_task_CHAR *dest = graphics_task_current_buffer->graphics_task_ch_buf;
+    graphics_task_CHAR *source = graphics_tasktext - 1; /* copy prev. char, too */
+    int number_to_move, i;
     int ret_val;
 
     if ( graphics_task_c_buf_p > &graphics_task_current_buffer->graphics_task_ch_buf[graphics_task_n_chars + 1] )
@@ -2243,10 +2243,10 @@ static int graphics_task_get_next_buffer()
 static graphics_task_state_type graphics_task_get_previous_state()
 
     {
-    register graphics_task_state_type graphics_task_current_state;
-    register graphics_task_CHAR *graphics_task_cp;
+    graphics_task_state_type graphics_task_current_state;
+    graphics_task_CHAR *graphics_task_cp;
 
-    register graphics_task_CHAR *graphics_task_bp = graphics_tasktext;
+    graphics_task_CHAR *graphics_task_bp = graphics_tasktext;
 
     graphics_task_current_state = graphics_task_start;
     if ( graphics_task_bp[-1] == '\n' )
@@ -2278,15 +2278,15 @@ static graphics_task_state_type graphics_task_get_previous_state()
  */
 
 #ifdef graphics_task_USE_PROTOS
-static graphics_task_state_type graphics_task_try_NUL_trans( register graphics_task_state_type graphics_task_current_state )
+static graphics_task_state_type graphics_task_try_NUL_trans( graphics_task_state_type graphics_task_current_state )
 #else
 static graphics_task_state_type graphics_task_try_NUL_trans( graphics_task_current_state )
-register graphics_task_state_type graphics_task_current_state;
+graphics_task_state_type graphics_task_current_state;
 #endif
 
     {
-    register int graphics_task_is_jam;
-    register graphics_task_CHAR *graphics_task_cp = graphics_task_c_buf_p;
+    int graphics_task_is_jam;
+    graphics_task_CHAR *graphics_task_cp = graphics_task_c_buf_p;
 
     graphics_task_current_state = graphics_task_NUL_trans[graphics_task_current_state];
     graphics_task_is_jam = (graphics_task_current_state == 0);
@@ -2306,25 +2306,25 @@ register graphics_task_state_type graphics_task_current_state;
 
 #if 0
 #ifdef graphics_task_USE_PROTOS
-static void graphics_taskunput( graphics_task_CHAR c, register graphics_task_CHAR *graphics_task_bp )
+static void graphics_taskunput( graphics_task_CHAR c, graphics_task_CHAR *graphics_task_bp )
 #else
 static void graphics_taskunput( c, graphics_task_bp )
 graphics_task_CHAR c;
-register graphics_task_CHAR *graphics_task_bp;
+graphics_task_CHAR *graphics_task_bp;
 #endif
 
     {
-    register graphics_task_CHAR *graphics_task_cp = graphics_task_c_buf_p;
+    graphics_task_CHAR *graphics_task_cp = graphics_task_c_buf_p;
 
     /* undo effects of setting up graphics_tasktext */
     *graphics_task_cp = graphics_task_hold_char;
 
     if ( graphics_task_cp < graphics_task_current_buffer->graphics_task_ch_buf + 2 )
 	{ /* need to shift things up to make room */
-	register int number_to_move = graphics_task_n_chars + 2; /* +2 for EOB chars */
-	register graphics_task_CHAR *dest =
+	int number_to_move = graphics_task_n_chars + 2; /* +2 for EOB chars */
+	graphics_task_CHAR *dest =
 	    &graphics_task_current_buffer->graphics_task_ch_buf[graphics_task_current_buffer->graphics_task_buf_size + 2];
-	register graphics_task_CHAR *source =
+	graphics_task_CHAR *source =
 	    &graphics_task_current_buffer->graphics_task_ch_buf[number_to_move];
 
 	while ( source > graphics_task_current_buffer->graphics_task_ch_buf )
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.C
index e9b87af5..3cbbe714 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.C
@@ -1760,9 +1760,9 @@ static int input YY_PROTO(( void ));
 
 YY_DECL
     {
-    register yy_state_type yy_current_state;
-    register YY_CHAR *yy_cp, *yy_bp;
-    register int yy_act;
+    yy_state_type yy_current_state;
+    YY_CHAR *yy_cp, *yy_bp;
+    int yy_act;
 
 
 
@@ -2135,9 +2135,9 @@ case YY_STATE_EOF(ProcessData):
 static int yy_get_next_buffer()
 
     {
-    register YY_CHAR *dest = yy_current_buffer->yy_ch_buf;
-    register YY_CHAR *source = yytext - 1; /* copy prev. char, too */
-    register int number_to_move, i;
+    YY_CHAR *dest = yy_current_buffer->yy_ch_buf;
+    YY_CHAR *source = yytext - 1; /* copy prev. char, too */
+    int number_to_move, i;
     int ret_val;
 
     if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
@@ -2216,10 +2216,10 @@ static int yy_get_next_buffer()
 static yy_state_type yy_get_previous_state()
 
     {
-    register yy_state_type yy_current_state;
-    register YY_CHAR *yy_cp;
+    yy_state_type yy_current_state;
+    YY_CHAR *yy_cp;
 
-    register YY_CHAR *yy_bp = yytext;
+    YY_CHAR *yy_bp = yytext;
 
     yy_current_state = yy_start;
     if ( yy_bp[-1] == '\n' )
@@ -2251,15 +2251,15 @@ static yy_state_type yy_get_previous_state()
  */
 
 #ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( register yy_state_type yy_current_state )
+static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
 #else
 static yy_state_type yy_try_NUL_trans( yy_current_state )
-register yy_state_type yy_current_state;
+yy_state_type yy_current_state;
 #endif
 
     {
-    register int yy_is_jam;
-    register YY_CHAR *yy_cp = yy_c_buf_p;
+    int yy_is_jam;
+    YY_CHAR *yy_cp = yy_c_buf_p;
 
     yy_current_state = yy_NUL_trans[yy_current_state];
     yy_is_jam = (yy_current_state == 0);
@@ -2279,25 +2279,25 @@ register yy_state_type yy_current_state;
 
 #if 0
 #ifdef YY_USE_PROTOS
-static void yyunput( YY_CHAR c, register YY_CHAR *yy_bp )
+static void yyunput( YY_CHAR c, YY_CHAR *yy_bp )
 #else
 static void yyunput( c, yy_bp )
 YY_CHAR c;
-register YY_CHAR *yy_bp;
+YY_CHAR *yy_bp;
 #endif
 
     {
-    register YY_CHAR *yy_cp = yy_c_buf_p;
+    YY_CHAR *yy_cp = yy_c_buf_p;
 
     /* undo effects of setting up yytext */
     *yy_cp = yy_hold_char;
 
     if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 	{ /* need to shift things up to make room */
-	register int number_to_move = yy_n_chars + 2; /* +2 for EOB chars */
-	register YY_CHAR *dest =
+	int number_to_move = yy_n_chars + 2; /* +2 for EOB chars */
+	YY_CHAR *dest =
 	    &yy_current_buffer->yy_ch_buf[yy_current_buffer->yy_buf_size + 2];
-	register YY_CHAR *source =
+	YY_CHAR *source =
 	    &yy_current_buffer->yy_ch_buf[number_to_move];
 
 	while ( source > yy_current_buffer->yy_ch_buf )
diff --git a/cde/programs/dtinfo/tools/misc/msgsets.C b/cde/programs/dtinfo/tools/misc/msgsets.C
index 2f076a82..639fb839 100644
--- a/cde/programs/dtinfo/tools/misc/msgsets.C
+++ b/cde/programs/dtinfo/tools/misc/msgsets.C
@@ -422,9 +422,9 @@ static int input YY_PROTO(( void ));
 
 YY_DECL
     {
-    register yy_state_type yy_current_state;
-    register YY_CHAR *yy_cp, *yy_bp;
-    register int yy_act;
+    yy_state_type yy_current_state;
+    YY_CHAR *yy_cp, *yy_bp;
+    int yy_act;
 
 
 
@@ -470,7 +470,7 @@ YY_DECL
 yy_match:
 	do
 	    {
-	    register YY_CHAR yy_c = yy_ec[*yy_cp];
+	    YY_CHAR yy_c = yy_ec[*yy_cp];
 	    if ( yy_accept[yy_current_state] )
 		{
 		yy_last_accepting_state = yy_current_state;
@@ -734,9 +734,9 @@ ECHO;
 static int yy_get_next_buffer()
 
     {
-    register YY_CHAR *dest = yy_current_buffer->yy_ch_buf;
-    register YY_CHAR *source = yytext - 1; /* copy prev. char, too */
-    register int number_to_move, i;
+    YY_CHAR *dest = yy_current_buffer->yy_ch_buf;
+    YY_CHAR *source = yytext - 1; /* copy prev. char, too */
+    int number_to_move, i;
     int ret_val;
 
     if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
@@ -815,10 +815,10 @@ static int yy_get_next_buffer()
 static yy_state_type yy_get_previous_state()
 
     {
-    register yy_state_type yy_current_state;
-    register YY_CHAR *yy_cp;
+    yy_state_type yy_current_state;
+    YY_CHAR *yy_cp;
 
-    register YY_CHAR *yy_bp = yytext;
+    YY_CHAR *yy_bp = yytext;
 
     yy_current_state = yy_start;
     if ( yy_bp[-1] == '\n' )
@@ -826,7 +826,7 @@ static yy_state_type yy_get_previous_state()
 
     for ( yy_cp = yytext + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
 	{
-	register YY_CHAR yy_c = (*yy_cp ? yy_ec[*yy_cp] : 1);
+	YY_CHAR yy_c = (*yy_cp ? yy_ec[*yy_cp] : 1);
 	if ( yy_accept[yy_current_state] )
 	    {
 	    yy_last_accepting_state = yy_current_state;
@@ -852,17 +852,17 @@ static yy_state_type yy_get_previous_state()
  */
 
 #ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( register yy_state_type yy_current_state )
+static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
 #else
 static yy_state_type yy_try_NUL_trans( yy_current_state )
-register yy_state_type yy_current_state;
+yy_state_type yy_current_state;
 #endif
 
     {
-    register int yy_is_jam;
-    register YY_CHAR *yy_cp = yy_c_buf_p;
+    int yy_is_jam;
+    YY_CHAR *yy_cp = yy_c_buf_p;
 
-    register YY_CHAR yy_c = 1;
+    YY_CHAR yy_c = 1;
     if ( yy_accept[yy_current_state] )
 	{
 	yy_last_accepting_state = yy_current_state;
@@ -882,25 +882,25 @@ register yy_state_type yy_current_state;
 
 #if 0
 #ifdef YY_USE_PROTOS
-static void yyunput( YY_CHAR c, register YY_CHAR *yy_bp )
+static void yyunput( YY_CHAR c, YY_CHAR *yy_bp )
 #else
 static void yyunput( c, yy_bp )
 YY_CHAR c;
-register YY_CHAR *yy_bp;
+YY_CHAR *yy_bp;
 #endif
 
     {
-    register YY_CHAR *yy_cp = yy_c_buf_p;
+    YY_CHAR *yy_cp = yy_c_buf_p;
 
     /* undo effects of setting up yytext */
     *yy_cp = yy_hold_char;
 
     if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 	{ /* need to shift things up to make room */
-	register int number_to_move = yy_n_chars + 2; /* +2 for EOB chars */
-	register YY_CHAR *dest =
+	int number_to_move = yy_n_chars + 2; /* +2 for EOB chars */
+	YY_CHAR *dest =
 	    &yy_current_buffer->yy_ch_buf[yy_current_buffer->yy_buf_size + 2];
-	register YY_CHAR *source =
+	YY_CHAR *source =
 	    &yy_current_buffer->yy_ch_buf[number_to_move];
 
 	while ( source > yy_current_buffer->yy_ch_buf )