From 8e48100c12645a0961634298da604f3f08210fd1 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Wed, 27 Jun 2018 14:37:24 -0600 Subject: [PATCH] DtSearch/raima: remove register keyword --- cde/lib/DtSearch/raima/connect.c | 6 +-- cde/lib/DtSearch/raima/dblfcns.c | 78 +++++++++++++++---------------- cde/lib/DtSearch/raima/delete.c | 2 +- cde/lib/DtSearch/raima/destroy.c | 4 +- cde/lib/DtSearch/raima/dio.c | 28 +++++------ cde/lib/DtSearch/raima/disdel.c | 6 +-- cde/lib/DtSearch/raima/inittab.c | 8 ++-- cde/lib/DtSearch/raima/keyfcns.c | 52 ++++++++++----------- cde/lib/DtSearch/raima/keyfind.c | 4 +- cde/lib/DtSearch/raima/libfcns.c | 6 +-- cde/lib/DtSearch/raima/recfcns.c | 28 +++++------ cde/lib/DtSearch/raima/recwrite.c | 4 +- cde/lib/DtSearch/raima/renfile.c | 2 +- cde/lib/DtSearch/raima/setmm.c | 4 +- cde/lib/DtSearch/raima/setmo.c | 4 +- cde/lib/DtSearch/raima/setmr.c | 4 +- 16 files changed, 120 insertions(+), 120 deletions(-) diff --git a/cde/lib/DtSearch/raima/connect.c b/cde/lib/DtSearch/raima/connect.c index 5b9cd85e..97162452 100644 --- a/cde/lib/DtSearch/raima/connect.c +++ b/cde/lib/DtSearch/raima/connect.c @@ -313,11 +313,11 @@ char FAR *mem2; /* member record 2 */ { INT rn1, rn2; /* record numbers for mem1 & mem2 */ MEMBER_ENTRY FAR *mt1, FAR *mt2; - register MEMBER_ENTRY FAR *mt; + MEMBER_ENTRY FAR *mt; int mem, memtot; int cmp; /* fldcmp result */ - register int maxflds; - register SORT_ENTRY FAR *srt1_ptr, FAR *srt2_ptr; + int maxflds; + SORT_ENTRY FAR *srt1_ptr, FAR *srt2_ptr; FIELD_ENTRY FAR *fld_ptr; /* extract record numbers from record header */ diff --git a/cde/lib/DtSearch/raima/dblfcns.c b/cde/lib/DtSearch/raima/dblfcns.c index 04886a6f..83eaf320 100644 --- a/cde/lib/DtSearch/raima/dblfcns.c +++ b/cde/lib/DtSearch/raima/dblfcns.c @@ -447,12 +447,12 @@ int initdbt(dbnames ) CONST char FAR *dbnames; { - register int dbt_lc; /* loop control */ + int dbt_lc; /* loop control */ char dbfile [DtSrFILENMLEN]; char FAR *ptr; #ifndef ONE_DB CONST char FAR *cp; - register int i; + int i; #endif #ifndef ONE_DB @@ -534,8 +534,8 @@ static recovery_check() #ifndef SINGLE_USER LM_TREND trend_pkt; #ifndef GENERAL - register int tn; /* transaction number */ - register int tc; /* transaction count */ + int tn; /* transaction number */ + int tc; /* transaction count */ #endif #endif @@ -586,12 +586,12 @@ static int initses() { LM_DBOPEN_P Send_pkt; LR_DBOPEN_P Recv_pkt; - register int ft_lc; /* loop control */ + int ft_lc; /* loop control */ LM_TREND trend_pkt; int send_size, recv_size, recvd_sz; struct stat stbuf; LM_FILEID *fi_ptr; - register FILE_ENTRY FAR *file_ptr; + FILE_ENTRY FAR *file_ptr; FILE_NO FAR *fref_ptr; INT FAR *rcv_fref_ptr; @@ -719,20 +719,20 @@ send_open: static int bld_lock_tables() { #ifndef SINGLE_USER - register int fd_lc; /* loop control */ - register int st_lc; /* loop control */ + int fd_lc; /* loop control */ + int st_lc; /* loop control */ INT_P File_used; #define file_used File_used.ptr int rec; int mem, memtot; - register FILE_NO i; + FILE_NO i; FILE_NO fl_cnt; struct lock_descr FAR *ld_ptr; RECORD_ENTRY FAR *rec_ptr; FIELD_ENTRY FAR *fld_ptr; SET_ENTRY FAR *set_ptr; MEMBER_ENTRY FAR *mem_ptr; - register int FAR *fu_ptr; + int FAR *fu_ptr; FILE_NO FAR *fl_ptr; unsigned new_size; unsigned old_size; @@ -908,7 +908,7 @@ int d_close(TASK_ONLY) TASK_DECL { - register int i; + int i; DB_ENTER(NO_DB_ID TASK_ID LOCK_SET(LOCK_ALL)); @@ -1006,10 +1006,10 @@ TASK_DECL termses() { LM_DBCLOSE_P Send_pkt; - register int ft_lc; /* loop control */ + int ft_lc; /* loop control */ int send_size; - register FILE_NO FAR *fref_ptr; - register INT FAR *snd_fref_ptr; + FILE_NO FAR *fref_ptr; + INT FAR *snd_fref_ptr; if ( session_active ) { send_size = sizeof(LM_DBCLOSE) + (size_ft-1)*sizeof(INT); @@ -1043,8 +1043,8 @@ termses() void termfree() { #ifndef SINGLE_USER - register int i; - register struct lock_descr FAR *ld_ptr; + int i; + struct lock_descr FAR *ld_ptr; #endif /* free all allocated memory */ @@ -1355,9 +1355,9 @@ DBN_DECL #ifdef SINGLE_USER return (db_status = S_OKAY); #else - register int item; - register int i; - register LOCK_REQUEST FAR *lrpkt_ptr; + int item; + int i; + LOCK_REQUEST FAR *lrpkt_ptr; struct lock_descr FAR *ld_ptr; DB_ENTER(DB_ID TASK_ID LOCK_SET(LOCK_IO)); @@ -1425,10 +1425,10 @@ static process_lock(ld_ptr, type ) struct lock_descr FAR *ld_ptr; char type; { - register int fl_lc; /* loop control */ + int fl_lc; /* loop control */ int fno; - register int i; - register LM_LOCKREQ FAR *lockreq_ptr; + int i; + LM_LOCKREQ FAR *lockreq_ptr; FILE_NO FAR *fl_ptr, fref; db_status = S_OKAY; @@ -1504,10 +1504,10 @@ int count; LOCK_REQUEST FAR *lrpkt; { #ifndef SINGLE_USER - register int fl_lc; /* loop control */ + int fl_lc; /* loop control */ struct lock_descr FAR *ld_ptr; FILE_NO fno; - register int item; + int item; int l; LOCK_REQUEST FAR *lrpkt_ptr; int FAR *appl_ptr, FAR *excl_ptr; @@ -1689,8 +1689,8 @@ DBN_DECL static keep_locks( ld_ptr ) struct lock_descr FAR *ld_ptr; /* Lock descriptor */ { - register int fl_lc; /* loop control */ - register FILE_NO FAR *fl_ptr; + int fl_lc; /* loop control */ + FILE_NO FAR *fl_ptr; /* Mark lock as kept */ ld_ptr->fl_kept = TRUE; @@ -1788,12 +1788,12 @@ DBN_DECL static int free_files(ld_ptr) struct lock_descr FAR *ld_ptr; { - register int fl_lc; /* loop control */ + int fl_lc; /* loop control */ FILE_NO fno; LM_LOCKREQ FAR *lockreq_ptr; int FAR *appl_ptr; FILE_NO fref; - register FILE_NO FAR *fl_ptr; + FILE_NO FAR *fl_ptr; /* fill free packet */ lock_pkt->nfiles = free_pkt->nfiles = 0; @@ -1853,9 +1853,9 @@ TASK_DECL #ifdef SINGLE_USER return (db_status = S_OKAY); #else - register int i; - register FILE_NO FAR *fref_ptr; - register int FAR *appl_ptr; + int i; + FILE_NO FAR *fref_ptr; + int FAR *appl_ptr; DB_ENTER(NO_DB_ID TASK_ID LOCK_SET(LOCK_IO)); @@ -1899,8 +1899,8 @@ TASK_DECL static void reset_locks() { int beg, end; - register int i; - register struct lock_descr FAR *ld_ptr; + int i; + struct lock_descr FAR *ld_ptr; /* reset record lock descriptors */ beg = 0; @@ -2160,12 +2160,12 @@ d_trend(TASK_ONLY) TASK_DECL { #ifndef SINGLE_USER - register int ft_lc; /* loop control */ + int ft_lc; /* loop control */ LM_TRCOMMIT trcom_pkt; LM_TREND trend_pkt; LM_LOCKREQ FAR *lockreq_ptr; - register FILE_NO FAR *fref_ptr; - register int FAR *appl_ptr, FAR *keptl_ptr, FAR *excl_ptr; + FILE_NO FAR *fref_ptr; + int FAR *appl_ptr, FAR *keptl_ptr, FAR *excl_ptr; #endif DB_ENTER(NO_DB_ID TASK_ID LOCK_SET(LOCK_IO)); @@ -2283,9 +2283,9 @@ TASK_DECL dio_clear(); /*[353] clear cache */ RETURN (db_status = S_OKAY); #else - register int i; - register int FAR *keptl_ptr; - register struct lock_descr FAR *ld_ptr; + int i; + int FAR *keptl_ptr; + struct lock_descr FAR *ld_ptr; DB_ENTER(NO_DB_ID TASK_ID LOCK_SET(LOCK_IO)); diff --git a/cde/lib/DtSearch/raima/delete.c b/cde/lib/DtSearch/raima/delete.c index d8f99c53..643cc2ff 100644 --- a/cde/lib/DtSearch/raima/delete.c +++ b/cde/lib/DtSearch/raima/delete.c @@ -57,7 +57,7 @@ d_delete(TASK_DBN_ONLY) TASK_DECL DBN_DECL { - register int st_lc, mt_lc; /* loop control */ + int st_lc, mt_lc; /* loop control */ INT i, rt; char FAR *ptr; SET_ENTRY FAR *set_ptr; diff --git a/cde/lib/DtSearch/raima/destroy.c b/cde/lib/DtSearch/raima/destroy.c index 250c1231..e518fd03 100644 --- a/cde/lib/DtSearch/raima/destroy.c +++ b/cde/lib/DtSearch/raima/destroy.c @@ -59,8 +59,8 @@ d_destroy(dbname TASK_PARM) CONST char FAR *dbname; TASK_DECL { - register int ft_lc; /* loop control */ - register FILE_ENTRY FAR *file_ptr; + int ft_lc; /* loop control */ + FILE_ENTRY FAR *file_ptr; #ifndef NO_TRANS int ovfl_save; #endif diff --git a/cde/lib/DtSearch/raima/dio.c b/cde/lib/DtSearch/raima/dio.c index 3c36bf77..840fe38c 100644 --- a/cde/lib/DtSearch/raima/dio.c +++ b/cde/lib/DtSearch/raima/dio.c @@ -274,7 +274,7 @@ dio_open( fno ) FILE_NO fno; { FILE_ENTRY FAR *file_ptr, FAR *lru_file_ptr; - register int FAR *uf_ptr; + int FAR *uf_ptr; file_ptr = &file_table[fno]; if ( file_ptr->ft_status == CLOSED ) { @@ -458,7 +458,7 @@ LOOKUP_ENTRY FAR * lu_ptr; PAGE_ENTRY FAR * pg_ptr; int pgsize; { - register int pg_no; + int pg_no; #ifdef DEBUG_DIO if (debugging_dio_init) { @@ -511,8 +511,8 @@ int pgsize; */ void dio_free() { - register int pgt_lc; /* loop control */ - register PAGE_ENTRY FAR *pg_ptr; + int pgt_lc; /* loop control */ + PAGE_ENTRY FAR *pg_ptr; #ifdef MULTI_TASK if ( task_count > 1 ) { @@ -557,7 +557,7 @@ void dio_free() */ int dio_clrfile(fno ) -register FILE_NO fno; +FILE_NO fno; { return( clear_cache(fno, fno+1) ); } @@ -593,7 +593,7 @@ FILE_NO to_file; /* ..to (not thru) file "to_file" */ { FILE_NO s_file; /* start file to be cleared */ FILE_NO e_file; /* end file (+1) to be cleared */ - register int i; + int i; LOOKUP_ENTRY FAR *lu_ptr, FAR *lu2_ptr; int pg_slot; PAGE_ENTRY FAR *pg_ptr; @@ -707,7 +707,7 @@ FILE_NO to_file; /* ..to (not thru) file "to_file" */ */ int dio_flush() { - register int pgt_lc; /* loop control */ + int pgt_lc; /* loop control */ #ifndef NO_TRANS int fno; #endif @@ -1163,7 +1163,7 @@ LOOKUP_ENTRY FAR * FAR *xlu_ptr;/* pointer to lookup table slot for found page*/ int pgtab_sz; /* = db_pgtab_sz or ix_pgtab_sz */ long cmp; int cnt; - register int lu_slot, l, u; + int lu_slot, l, u; LOOKUP_ENTRY FAR *lu_ptr, FAR *replu_ptr; PAGE_ENTRY FAR *pg_ptr; int *lru_ptr; @@ -1631,7 +1631,7 @@ FILE_NO fno; */ static int dio_pzinit() { - register FILE_NO i; + FILE_NO i; PGZERO FAR *pgzero_ptr; #ifdef DEBUG_DIO @@ -1678,10 +1678,10 @@ static int dio_pzinit() */ static int dio_pzflush() { - register FILE_NO i; + FILE_NO i; int desc; - register PGZERO FAR *pgzero_ptr; - register FILE_ENTRY FAR *file_ptr; + PGZERO FAR *pgzero_ptr; + FILE_ENTRY FAR *file_ptr; LONG align_LONG; char *cptr; int j; @@ -1931,8 +1931,8 @@ FILE_NO fno; */ void dio_pzclr() { - register FILE_NO i; - register PGZERO FAR *pgzero_ptr; + FILE_NO i; + PGZERO FAR *pgzero_ptr; for (i = 0, pgzero_ptr = pgzero; i < size_ft; i++, pgzero_ptr++) { if (pgzero_ptr->pz_modified) { diff --git a/cde/lib/DtSearch/raima/disdel.c b/cde/lib/DtSearch/raima/disdel.c index 82c7c33a..dbba1d48 100644 --- a/cde/lib/DtSearch/raima/disdel.c +++ b/cde/lib/DtSearch/raima/disdel.c @@ -56,11 +56,11 @@ TASK_DECL DBN_DECL { int rectype, nset, cset; - register int set, mem; + int set, mem; DB_ADDR dba, odba, mdba; DB_ADDR FAR *co_ptr, FAR *cm_ptr; - register SET_ENTRY FAR *set_ptr; - register MEMBER_ENTRY FAR *mem_ptr; + SET_ENTRY FAR *set_ptr; + MEMBER_ENTRY FAR *mem_ptr; int memtot; DB_ENTER(DB_ID TASK_ID LOCK_SET(SET_IO)); diff --git a/cde/lib/DtSearch/raima/inittab.c b/cde/lib/DtSearch/raima/inittab.c index 24ea4fa2..62fd9c1f 100644 --- a/cde/lib/DtSearch/raima/inittab.c +++ b/cde/lib/DtSearch/raima/inittab.c @@ -97,8 +97,8 @@ static int initcurr(P0); int inittab() { - register int dbt_lc; /* loop control */ - register INT i, j; + int dbt_lc; /* loop control */ + INT i, j; int key_offset = 0, key_count; char dbfile[DtSrFILENMLEN], dbd_ver[DBD_COMPAT_LEN + 1]; char dbname[FILENMLEN]; /* Temporary working space */ @@ -680,8 +680,8 @@ static int alloc_dict() */ static int initcurr() { - register int dbt_lc; /* loop control */ - register int rec, i; + int dbt_lc; /* loop control */ + int rec, i; RECORD_ENTRY FAR *rec_ptr; SET_ENTRY FAR *set_ptr; DB_ADDR FAR *co_ptr; diff --git a/cde/lib/DtSearch/raima/keyfcns.c b/cde/lib/DtSearch/raima/keyfcns.c index ffb8f7a7..14fec477 100644 --- a/cde/lib/DtSearch/raima/keyfcns.c +++ b/cde/lib/DtSearch/raima/keyfcns.c @@ -152,12 +152,12 @@ static int unique; int key_open() { - register int fd_lc; /* loop control */ + int fd_lc; /* loop control */ long t; /* total keys thru level l */ int l; /* level number */ - register int i; /* field subscript */ - register FIELD_ENTRY FAR *fld_ptr; - register KEY_INFO FAR *ki_ptr; + int i; /* field subscript */ + FIELD_ENTRY FAR *fld_ptr; + KEY_INFO FAR *ki_ptr; FILE_ENTRY FAR *file_ptr; /* child ptr key number */ @@ -216,7 +216,7 @@ key_open() */ void key_close() { - register int k; + int k; KEY_INFO FAR *ki_ptr; if ( key_info ) { @@ -273,8 +273,8 @@ int key_reset(fno ) FILE_NO fno; { - register int i; - register KEY_INFO FAR *ki_ptr; + int i; + KEY_INFO FAR *ki_ptr; for (i = 0, ki_ptr = key_info; i < no_of_keys; ++i, ++ki_ptr) { if (((fno == size_ft) || (ki_ptr->keyfile == fno)) && @@ -389,7 +389,7 @@ int *slotno; /* slot number of key position in node */ int *slot_offset; /* slot position offset */ F_ADDR *child; /* child ptr of located key */ { - register int cmp, i, l, u, slot_pos; + int cmp, i, l, u, slot_pos; char FAR *node_slot_ptr; /* perform binary search on node */ @@ -445,7 +445,7 @@ DB_ADDR FAR *dba; /* database address included in comparison if not null */ > 0 if key_val > slot = 0 if key_val == slot */ - register int cmp; + int cmp; if (((cmp = INTcmp((char FAR *)&prefix, (char FAR *)&slot->keyno)) == 0) && ((cmp = fldcmp(cfld_ptr, key_val, slot->data)) == 0) && @@ -585,10 +585,10 @@ DB_ADDR *dba; /* to get dba of first or last key */ NODE FAR *node; /* pointer to node contents in cache */ int cmp; /* keycmp result */ int match_lvl; /* lowest level containing matched key */ - register int lvl; /* node_path level variable */ - register int slot; /* slot position in node */ - register NODE_PATH FAR *np_ptr; - register char FAR *node_slot_ptr; + int lvl; /* node_path level variable */ + int slot; /* slot position in node */ + NODE_PATH FAR *np_ptr; + char FAR *node_slot_ptr; if ( fcn == KEYFIND ) { curkey->lstat = KEYINIT; @@ -711,7 +711,7 @@ F_ADDR brother; /* page number of brother node */ NODE FAR *node; NODE_PATH FAR *np_ptr; int slot_pos; - register char FAR *node_slot_ptr; + char FAR *node_slot_ptr; MEM_LOCK(&curkey->Node_path); np_ptr = &curkey->node_path[curkey->level]; @@ -814,7 +814,7 @@ NODE FAR *node; { F_ADDR l_pg, r_pg; NODE FAR *l_node, FAR *r_node; - register int slot_pos; + int slot_pos; char FAR *node_slot_ptr; /* allocate two new nodes */ @@ -1107,8 +1107,8 @@ NODE FAR *node; int slot_pos; int n; { - register char FAR *dst, FAR *src; - register int amt, w, nw; + char FAR *dst, FAR *src; + int amt, w, nw; nw = NODE_WIDTH(node); w = n*slot_len; @@ -1130,8 +1130,8 @@ NODE FAR *node; int slot_pos; int n; { - register char FAR *dst, FAR *src; - register int w, amt; + char FAR *dst, FAR *src; + int w, amt; node->used_slots -= n; @@ -1153,7 +1153,7 @@ d_keyread(key_val TASK_PARM) char FAR *key_val; TASK_DECL { - register int kt_lc; /* loop control */ + int kt_lc; /* loop control */ #ifndef NO_FLOAT float fv; double dv; @@ -1161,7 +1161,7 @@ TASK_DECL char FAR *fptr; char FAR *kptr; FIELD_ENTRY FAR *fld_ptr; - register KEY_ENTRY FAR *key_ptr; + KEY_ENTRY FAR *key_ptr; DB_ENTER(NO_DB_ID TASK_ID LOCK_SET(RECORD_IO)); @@ -1230,14 +1230,14 @@ char FAR *rec; /* ptr to record data */ char FAR *key; /* ptr to array to recv constructed key */ int cflag; /* TRUE to compliment compound descending keys */ { - register int kt_lc; /* loop control */ + int kt_lc; /* loop control */ #ifndef NO_FLOAT float fv; double dv; #endif char FAR *fptr; FIELD_ENTRY FAR *fld_ptr, FAR *kfld_ptr; - register KEY_ENTRY FAR *key_ptr; + KEY_ENTRY FAR *key_ptr; /* clear key area */ fld_ptr = &field_table[fld]; @@ -1289,9 +1289,9 @@ int cflag; /* TRUE to compliment compound descending keys */ /* Complement and copy bytes */ void key_cmpcpy(s1, s2, n) -register char FAR *s1; -register char FAR *s2; -register INT n; +char FAR *s1; +char FAR *s2; +INT n; { while ( n-- ) { *s1++ = ~(*s2++); diff --git a/cde/lib/DtSearch/raima/keyfind.c b/cde/lib/DtSearch/raima/keyfind.c index 0c377bf4..be3819ae 100644 --- a/cde/lib/DtSearch/raima/keyfind.c +++ b/cde/lib/DtSearch/raima/keyfind.c @@ -108,7 +108,7 @@ FIELD_ENTRY FAR *fld_ptr; CONST char FAR *fldval; char FAR *ckey; { - register int kt_lc; /* loop control */ + int kt_lc; /* loop control */ #ifndef NO_FLOAT float fv; double dv; @@ -116,7 +116,7 @@ char FAR *ckey; char FAR *fptr; char FAR *tptr; FIELD_ENTRY FAR *kfld_ptr; - register KEY_ENTRY FAR *key_ptr; + KEY_ENTRY FAR *key_ptr; /* complement descending compound key values */ for (kt_lc = size_kt - fld_ptr->fd_ptr, diff --git a/cde/lib/DtSearch/raima/libfcns.c b/cde/lib/DtSearch/raima/libfcns.c index 16e2672f..509fab17 100644 --- a/cde/lib/DtSearch/raima/libfcns.c +++ b/cde/lib/DtSearch/raima/libfcns.c @@ -96,7 +96,7 @@ int dbn; */ int nset_check(nset, set, set_ptr ) -register int nset; +int nset; int *set; SET_ENTRY FAR * FAR *set_ptr; { @@ -154,7 +154,7 @@ RECORD_ENTRY FAR * FAR *rec_ptr; /* Internal record number check */ static int rec_okay(nrec, rec, rec_ptr) -register int nrec; +int nrec; int *rec; RECORD_ENTRY FAR * FAR *rec_ptr; { @@ -178,7 +178,7 @@ CONST char FAR *f2; /* pointer to field 2 */ > 0 if f1 > f2 */ { - register int kt_lc; /* loop control */ + int kt_lc; /* loop control */ int i, k, elt, result, len, cur_len, sub_len, entries; #ifdef DS int ui1, ui2; diff --git a/cde/lib/DtSearch/raima/recfcns.c b/cde/lib/DtSearch/raima/recfcns.c index 82aaac4e..52d4ab4b 100644 --- a/cde/lib/DtSearch/raima/recfcns.c +++ b/cde/lib/DtSearch/raima/recfcns.c @@ -152,9 +152,9 @@ DB_ADDR db_addr; #endif FILE_NO fno; F_ADDR rno; - register int fld; + int fld; RECORD_ENTRY FAR *rec_ptr; - register FIELD_ENTRY FAR *fld_ptr; + FIELD_ENTRY FAR *fld_ptr; if ( dio_read( db_addr, (char FAR * FAR *)&rec, PGHOLD) != S_OKAY ) return( db_status ); @@ -205,10 +205,10 @@ FIELD_ENTRY FAR *fld_ptr; char FAR *rec; /* pointer to record */ char FAR *data; /* pointer to data area to contain field contents */ { - register int kt_lc; /* loop control */ + int kt_lc; /* loop control */ INT rn; - register FIELD_ENTRY FAR *kfld_ptr; - register KEY_ENTRY FAR *key_ptr; + FIELD_ENTRY FAR *kfld_ptr; + KEY_ENTRY FAR *key_ptr; bytecpy(&rn, rec, sizeof(INT)); if ( rn < 0 ) @@ -260,9 +260,9 @@ char FAR *rec; /* pointer to record */ char FAR *mem_addr; /* pointer to member pointer */ { INT rt; - register int mem, memtot; + int mem, memtot; SET_ENTRY FAR *set_ptr; - register MEMBER_ENTRY FAR *mem_ptr; + MEMBER_ENTRY FAR *mem_ptr; /* search member list of set for record */ set_ptr = &set_table[set]; @@ -324,11 +324,11 @@ DB_ADDR FAR *db_addr; DB_ADDR mdba, odba, dba; int set, sn; char memp[MEMPSIZE]; - register char FAR *fptr; - register CONST char FAR *tfptr; - register int s, i, strfld; - register FIELD_ENTRY FAR *sfld_ptr; - register SORT_ENTRY FAR *srt_ptr; + char FAR *fptr; + CONST char FAR *tfptr; + int s, i, strfld; + FIELD_ENTRY FAR *sfld_ptr; + SORT_ENTRY FAR *srt_ptr; DB_ADDR FAR *co_ptr, FAR *cm_ptr; db_status = S_OKAY; @@ -444,9 +444,9 @@ char FAR *rec; /* pointer to record */ char FAR *mem_addr; /* pointer to member pointer */ { INT rt; - register int mem, memtot; + int mem, memtot; SET_ENTRY FAR *set_ptr; - register MEMBER_ENTRY FAR *mem_ptr; + MEMBER_ENTRY FAR *mem_ptr; /* search member list of set for record */ set_ptr = &set_table[set]; diff --git a/cde/lib/DtSearch/raima/recwrite.c b/cde/lib/DtSearch/raima/recwrite.c index f7e2ef9d..a1c24829 100644 --- a/cde/lib/DtSearch/raima/recwrite.c +++ b/cde/lib/DtSearch/raima/recwrite.c @@ -65,9 +65,9 @@ DBN_DECL char ckey[256]; /* current compound key data */ char nkey[256]; /* new compound key data */ int stat; - register int fld; + int fld; RECORD_ENTRY FAR *rec_ptr; - register FIELD_ENTRY FAR *fld_ptr; + FIELD_ENTRY FAR *fld_ptr; DB_ENTER(DB_ID TASK_ID LOCK_SET(SET_IO)); diff --git a/cde/lib/DtSearch/raima/renfile.c b/cde/lib/DtSearch/raima/renfile.c index 102d761a..78fbf347 100644 --- a/cde/lib/DtSearch/raima/renfile.c +++ b/cde/lib/DtSearch/raima/renfile.c @@ -90,7 +90,7 @@ TASK_DECL int renfiles() { - register int dbt_lc; /* loop control */ + int dbt_lc; /* loop control */ REN_ENTRY_P FAR *rp; #ifndef ONE_DB DB_ENTRY FAR *db_ptr; diff --git a/cde/lib/DtSearch/raima/setmm.c b/cde/lib/DtSearch/raima/setmm.c index 8701c446..340458be 100644 --- a/cde/lib/DtSearch/raima/setmm.c +++ b/cde/lib/DtSearch/raima/setmm.c @@ -57,9 +57,9 @@ TASK_DECL DBN_DECL /* database number */ { int cmtype; /* current member type */ - register int mem; + int mem; SET_ENTRY FAR *set_ptr; - register MEMBER_ENTRY FAR *mem_ptr; + MEMBER_ENTRY FAR *mem_ptr; int memtot; DB_ENTER(DB_ID TASK_ID LOCK_SET(SET_IO)); diff --git a/cde/lib/DtSearch/raima/setmo.c b/cde/lib/DtSearch/raima/setmo.c index a8b70c0b..9be31252 100644 --- a/cde/lib/DtSearch/raima/setmo.c +++ b/cde/lib/DtSearch/raima/setmo.c @@ -56,9 +56,9 @@ int seto; /* set table entry number of owner */ TASK_DECL DBN_DECL /* database number */ { - register int mem; + int mem; SET_ENTRY FAR *setm_ptr, FAR *seto_ptr; - register MEMBER_ENTRY FAR *mem_ptr; + MEMBER_ENTRY FAR *mem_ptr; int memtot; DB_ENTER(DB_ID TASK_ID LOCK_SET(SET_IO)); diff --git a/cde/lib/DtSearch/raima/setmr.c b/cde/lib/DtSearch/raima/setmr.c index 7b61e185..d1268be4 100644 --- a/cde/lib/DtSearch/raima/setmr.c +++ b/cde/lib/DtSearch/raima/setmr.c @@ -56,9 +56,9 @@ TASK_DECL DBN_DECL /* database number */ { int crtype; /* current record type */ - register int mem; + int mem; SET_ENTRY FAR *set_ptr; - register MEMBER_ENTRY FAR *mem_ptr; + MEMBER_ENTRY FAR *mem_ptr; int memtot; DB_ENTER(DB_ID TASK_ID LOCK_SET(SET_IO)); -- 2.25.1