1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

lib/tt/mini_isam: remove register keyword

This commit is contained in:
Jon Trulson 2018-06-27 22:26:18 -06:00
parent 44f999c1de
commit d0dd809b74
43 changed files with 163 additions and 163 deletions

View file

@ -62,7 +62,7 @@ int
isaddindex(int isfd, struct keydesc *keydesc)
{
int _amaddindex();
register Fab *fab;
Fab *fab;
int ret;
/*

View file

@ -67,7 +67,7 @@ Static int _am_addprimary();
int
isaddprimary(int isfd, struct keydesc *keydesc)
{
register Fab *fab;
Fab *fab;
int ret;
/*
@ -92,7 +92,7 @@ isaddprimary(int isfd, struct keydesc *keydesc)
return (ret); /* Successful write */
}
Static int _am_addprimary(register Fab *fab, struct keydesc *keydesc)
Static int _am_addprimary(Fab *fab, struct keydesc *keydesc)
{
return (_amaddprimary(&fab->isfhandle, keydesc, &fab->errcode));
}

View file

@ -58,7 +58,7 @@ extern char *strdup();
char *_ismalloc(unsigned int nbytes)
{
register char *p;
char *p;
if ((p = (char *) malloc (nbytes)) == NULL)
_isfatal_error("malloc() failed");
@ -68,7 +68,7 @@ char *_ismalloc(unsigned int nbytes)
char *_isrealloc(char *oldaddr, unsigned int nbytes)
{
register char *p;
char *p;
if ((p = (char *) realloc (oldaddr, nbytes)) == NULL)
_isfatal_error("realloc() failed");
@ -86,7 +86,7 @@ char *_isrealloc(char *oldaddr, unsigned int nbytes)
char *
_isallocstring(char *str)
{
register char *p;
char *p;
if ((p = strdup(str)) == NULL)
_isfatal_error("strdup() failed");

View file

@ -142,10 +142,10 @@ _amdelrec(Bytearray *isfhandle, Recno recnum, struct errcode *errcode)
*/
void
_delkeys(register Fcb *fcb, char *record, Recno recnum)
_delkeys(Fcb *fcb, char *record, Recno recnum)
{
int nkeys = fcb->nkeys;
register int i;
int i;
for (i = 0; i < nkeys; i++) {
_del1key(fcb, fcb->keys + i, record, recnum);

View file

@ -88,7 +88,7 @@ static struct errstattab {
void
_amseterrcode(struct errcode *errcode, int is_errno)
{
register struct errstattab *p;
struct errstattab *p;
errcode->iserrno = is_errno;
/*

View file

@ -161,10 +161,10 @@ _amwrite(Bytearray *isfhandle, char *record, int reclen,
* Returns ISOK, or EDUPS.
*/
int _addkeys (register Fcb *fcb, char *record, Recno recnum)
int _addkeys (Fcb *fcb, char *record, Recno recnum)
{
int nkeys = fcb->nkeys;
register int i;
int i;
int err;
for (i = 0; i < nkeys; i++) {
@ -180,7 +180,7 @@ Static int
_addkeys2 (Fcb *fcb, char *record, Recno recnum, Bytearray *curpos)
{
int nkeys = fcb->nkeys;
register int i;
int i;
int err;
Crp *crp;
int keyid;

View file

@ -57,7 +57,7 @@ static char sccsid[] = "@(#)isapplmr.c 1.5 89/07/17 Copyr 1988 Sun Micro";
int
_isapplmr(int isfd, char *buffer)
{
register Fab *fab;
Fab *fab;
Fcb *fcb = NULL;
char cntl_page[CP_NKEYS_OFF];

View file

@ -56,7 +56,7 @@ static char sccsid[] = "@(#)isapplmw.c 1.5 89/07/17 Copyr 1988 Sun Micro";
int
_isapplmw(int isfd, char *magicstring)
{
register Fab *fab;
Fab *fab;
int ret;
Fcb *fcb;
char cntl_page[CP_NKEYS_OFF];

View file

@ -47,8 +47,8 @@ static char sccsid[] = "@(#)isbsearch.c 1.3 89/07/17 Copyr 1988 Sun Micro";
char *_isbsearch (char *key, char *table, int nelems, int keylen, int (*cmpf) ())
{
register int len,l1,result; /* current length of array to search */
register char *p,*low;
int len,l1,result; /* current length of array to search */
char *p,*low;
if (nelems <= 0) return (char *) 0;

View file

@ -55,7 +55,7 @@ extern int _iskeycmp();
Btree *
_isbtree_create(Fcb *fcb, Keydesc2 *pkeydesc2)
{
register Btree *p;
Btree *p;
p = (Btree *) _ismalloc(sizeof(*p));
memset((char *)p, 0, sizeof(*p));
@ -74,9 +74,9 @@ Btree *
*/
void
_isbtree_destroy(register Btree *btree)
_isbtree_destroy(Btree *btree)
{
register int i;
int i;
for (i = 0; i < btree->depth;i++) {
_isdisk_unfix(btree->bufhdr[i]);
@ -92,7 +92,7 @@ _isbtree_destroy(register Btree *btree)
*/
void
_isbtree_search( register Btree *btree, char *key)
_isbtree_search( Btree *btree, char *key)
{
Keydesc2 *pkeydesc2 = btree->keydesc2;
Blkno rootblkno = pkeydesc2->k2_rootnode;
@ -100,7 +100,7 @@ _isbtree_search( register Btree *btree, char *key)
int index; /* Index to tables in btree */
/* Has value of 1, next 2, etc. */
int elevation; /* Level - leaves have value 0 */
register char *p; /* Pointer to key page */
char *p; /* Pointer to key page */
int nkeys; /* Number of keys in the page */
char *key2; /* Equal or next lower key */
int curpos; /* index of key2 in key page */
@ -144,7 +144,7 @@ _isbtree_search( register Btree *btree, char *key)
*/
char *
_isbtree_current(register Btree *btree)
_isbtree_current(Btree *btree)
{
int curpos;
@ -163,12 +163,12 @@ _isbtree_current(register Btree *btree)
*/
char *
_isbtree_next(register Btree *btree)
_isbtree_next(Btree *btree)
{
int curpos;
int depth = btree->depth;
register char *p;
register int level;
char *p;
int level;
Blkno blkno;
assert(depth > 0);

View file

@ -61,7 +61,7 @@ _isbtree_insert(Btree *btree, char *key)
int nkeys; /* Number of keys in the page */
int capac;
char keybuf[MAXKEYSIZE];
register int i;
int i;
Blkno blkno;
char *pkp, *pkp2, *pkp3;
Bufhdr *kp2bhdr, *kp3bhdr;

View file

@ -56,7 +56,7 @@ _isbtree_remove(Btree *btree)
{
struct keydesc2 *pkeydesc2 = btree->keydesc2;
int nkeys; /* Number of keys in the page */
register int i;
int i;
char *pkp, *pkp2, *pkp3;
struct bufhdr *kp2bhdr;
Blkno blkno2;

View file

@ -95,7 +95,7 @@ _bytearr_dup(Bytearray *old)
*/
void
_bytearr_free(register Bytearray *barray)
_bytearr_free(Bytearray *barray)
{
if (barray->data)
free(barray->data);
@ -111,7 +111,7 @@ _bytearr_free(register Bytearray *barray)
*/
int
_bytearr_cmp(register Bytearray *l, register Bytearray *r)
_bytearr_cmp(Bytearray *l, Bytearray *r)
{
if (l->length == r->length)
return (memcmp(l->data, r->data, (int)l->length));

View file

@ -53,13 +53,13 @@ static char sccsid[] = "@(#)isdatconv.c 1.5 89/07/17 Copyr 1988 Sun Micro";
/* ldlong() - Load a long integer from a potentially unaligned address */
long
ldlong(register char *p)
ldlong(char *p)
{
int i;
#if LONG_BIT == 64
register unsigned long val;
unsigned long val;
#else
register unsigned int val;
unsigned int val;
#endif
val = 0;
@ -72,7 +72,7 @@ ldlong(register char *p)
/* stlong() - Store a long integer at a potentially unaligned address */
int
stlong(register long val, register char *p)
stlong(long val, char *p)
{
int i;
p += LONGSIZE;
@ -86,9 +86,9 @@ stlong(register long val, register char *p)
/* ldint() - Load a short integer from a potentially unaligned address */
short
ldint(register char *p)
ldint(char *p)
{
register unsigned int val;
unsigned int val;
val = *((unsigned char *)p++);
val = (val << 8) + *((unsigned char *)p++);
@ -100,9 +100,9 @@ ldint(register char *p)
/* ldunshort - load a unshort integer : for 64K record length */
u_short
ldunshort(register char *p)
ldunshort(char *p)
{
register unsigned int val;
unsigned int val;
val = *((unsigned char *)p++);
val = (val << 8) + *((unsigned char *)p++);
@ -113,7 +113,7 @@ ldunshort(register char *p)
/* stint() - Store a short integer at a potentially unaligned address */
int
stint(register short val, register char *p)
stint(short val, char *p)
{
p += SHORTSIZE;
*--p = val & 255;
@ -125,9 +125,9 @@ stint(register short val, register char *p)
/* ldchar() - Load character field */
int
ldchar(char *src, int len, register char *dst)
ldchar(char *src, int len, char *dst)
{
register char *p;
char *p;
if (len <= 0)
return 0;
@ -148,9 +148,9 @@ ldchar(char *src, int len, register char *dst)
}
int
stchar(register char *src, register char *dst, register int len)
stchar(char *src, char *dst, int len)
{
register char c;
char c;
if (len <= 0)
return 0;
@ -171,9 +171,9 @@ stchar(register char *src, register char *dst, register int len)
/* ldchar2() - Load character field (C style, NULL padded) */
int
ldchar2(char *src, int len, register char *dst)
ldchar2(char *src, int len, char *dst)
{
register char *p;
char *p;
if (len <= 0)
return 0;
@ -185,9 +185,9 @@ ldchar2(char *src, int len, register char *dst)
}
int
stchar2(register char *src, register char *dst, register int len)
stchar2(char *src, char *dst, int len)
{
register char c;
char c;
if (len <= 0)
return 0;
@ -208,13 +208,13 @@ stchar2(register char *src, register char *dst, register int len)
/* ldfloat() - Load a float number from a potentially unaligned address */
float
ldfloat(register char *p)
ldfloat(char *p)
{
union {
float fval;
int ival;
} uval;
register unsigned int val;
unsigned int val;
val = *((unsigned char *)p++);
val = (val << 8) + *((unsigned char *)p++);
@ -229,9 +229,9 @@ ldfloat(register char *p)
/* f, Bug - it is passed as double */
int
stfloat(float f, register char *p)
stfloat(float f, char *p)
{
register unsigned val;
unsigned val;
union {
float fval;
int ival;
@ -254,7 +254,7 @@ stfloat(float f, register char *p)
/* ldbld() - Load a double float number from a potentially unaligned address */
double
lddbl(register char *p)
lddbl(char *p)
{
double val;
@ -265,7 +265,7 @@ lddbl(register char *p)
/* stdbl() - Store a double float number at a potentially unaligned address */
int
stdbl(double val, register char *p)
stdbl(double val, char *p)
{
memcpy ( p,(char *)&val, DOUBLESIZE);
return 0;
@ -276,7 +276,7 @@ stdbl(double val, register char *p)
/* ldbld() - Load a double float number from a potentially unaligned address */
double
lddbl(register char *p)
lddbl(char *p)
{
union {
double rval;
@ -297,7 +297,7 @@ lddbl(register char *p)
/* stdbl() - Store a double float number at a potentially unaligned address */
int
stdbl(double val, register char *p)
stdbl(double val, char *p)
{
union {
double rval;

View file

@ -68,7 +68,7 @@ int
isdelcurr(int isfd)
{
int _am_delcurr();
register Fab *fab;
Fab *fab;
int ret;
int recnum;

View file

@ -66,7 +66,7 @@ int
isdelrec(int isfd, long recnum)
{
int _amdelrec();
register Fab *fab;
Fab *fab;
int ret;
/*

View file

@ -98,7 +98,7 @@ static int maxavailn; /* Stop flushing when
Bufhdr *
_isdisk_fix(Fcb *fcb, int unixfd, Blkno blkno, int mode)
{
register Bufhdr *p, *p2;
Bufhdr *p, *p2;
struct dlink *hashl;
/*
@ -196,7 +196,7 @@ _isdisk_fix(Fcb *fcb, int unixfd, Blkno blkno, int mode)
}
void
_isdisk_unfix (register Bufhdr *p)
_isdisk_unfix (Bufhdr *p)
{
if (!(p->isb_flags & ISB_FIXED))
assert(p->isb_flags & ISB_FIXED);
@ -225,7 +225,7 @@ _isdisk_commit1 (Bufhdr *p)
void
_isdisk_commit(void)
{
register Bufhdr *p;
Bufhdr *p;
struct dlink *e;
while ((e = _isdln_first(pfixl)) != pfixl) {
@ -238,7 +238,7 @@ _isdisk_commit(void)
void
_isdisk_rollback(void)
{
register Bufhdr *p;
Bufhdr *p;
struct dlink *e;
while ((e = _isdln_first(pfixl)) != pfixl) {
@ -272,7 +272,7 @@ void
_isdisk_sync(void)
{
extern time_t _istimeget();
register Bufhdr *p;
Bufhdr *p;
struct dlink *e;
while ((e = _isdln_first(pchangl)) != pchangl) {
@ -287,7 +287,7 @@ void
_isdisk_inval(void)
{
extern time_t _istimeget();
register Bufhdr *p;
Bufhdr *p;
struct dlink *e;
/* ensure pavail is initialized before using it */
@ -313,7 +313,7 @@ _isdisk_inval(void)
#if ISDEBUG
_isdisk_dumphd(void)
{
register Bufhdr *p;
Bufhdr *p;
int i;
(void)printf("\nInd isfd blkno mode temp oldcopy\n");
@ -327,7 +327,7 @@ _isdisk_dumphd(void)
aclistdump(struct dlink *lh)
{
register Bufhdr *p;
Bufhdr *p;
struct dlink *e;
for (e = _isdln_first(lh); e != lh; e = _isdln_next(e)) {
@ -341,7 +341,7 @@ aclistdump(struct dlink *lh)
flistdump(struct dlink *lh)
{
register Bufhdr *p;
Bufhdr *p;
struct dlink *e;
for (e = _isdln_first(lh); e != lh; e = _isdln_next(e)) {
@ -362,7 +362,7 @@ Static void
_disk_init(void)
{
static Bool initialized = FALSE;
register int i;
int i;
if (initialized == TRUE)
return;
@ -396,8 +396,8 @@ _disk_init(void)
Static Bufhdr *
_getavail(void)
{
register Bufhdr *p;
register struct dlink *q;
Bufhdr *p;
struct dlink *q;
if ((q = _isdln_first(pavail)) == pavail) {
_isfatal_error("No buffer in pool available");
@ -417,7 +417,7 @@ _getavail(void)
Static Bufhdr *
_findblock(Fcb *fcb, int unixfd, Blkno blkno)
{
register Bufhdr *p;
Bufhdr *p;
struct dlink *lh, *e;
int hashval;
@ -437,7 +437,7 @@ _findblock(Fcb *fcb, int unixfd, Blkno blkno)
/* _commit1buffer() - Commit changes to buffer */
Static void
_commit1buffer(register Bufhdr *p)
_commit1buffer(Bufhdr *p)
{
assert(p->isb_flags & ISB_WFIXED); /* Fixed for read buffers should */
/* go through _isdisk_unfix() */
@ -457,9 +457,9 @@ _commit1buffer(register Bufhdr *p)
/* _rollback1buffer() - Rollback changes to buffer */
Static void
_rollback1buffer(register Bufhdr *p)
_rollback1buffer(Bufhdr *p)
{
register Bufhdr *p2;
Bufhdr *p2;
assert(p->isb_flags & ISB_WFIXED); /* Fixed for read buffers should */
/* go through _isdisk_unfix() */
@ -487,7 +487,7 @@ _rollback1buffer(register Bufhdr *p)
/* _makenodata() - make buffer available with no data in it*/
Static void
_makenodata(register Bufhdr *p)
_makenodata(Bufhdr *p)
{
assert(p->isb_flags & ISB_READ);
@ -498,7 +498,7 @@ _makenodata(register Bufhdr *p)
/* _flush1buffer() - flush buffer to disk */
Static void
_flush1buffer(register Bufhdr *p)
_flush1buffer(Bufhdr *p)
{
assert(p->isb_flags & ISB_CHANGE);

View file

@ -43,8 +43,8 @@
#include "isam_impl.h"
/* _isdln_base_insert () - Insert element into list (at the front) -----------*/
void _isdln_base_insert (register char *base, register struct dlink *l,
register struct dlink *e)
void _isdln_base_insert (char *base, struct dlink *l,
struct dlink *e)
{
e->dln_forward = l->dln_forward;
l->dln_forward = (char *)e - base;
@ -54,8 +54,8 @@ void _isdln_base_insert (register char *base, register struct dlink *l,
}
/* _isdln_base_append () - Append element to list (at the end) -------------*/
void _isdln_base_append (register char *base, register struct dlink *l,
register struct dlink *e)
void _isdln_base_append (char *base, struct dlink *l,
struct dlink *e)
{
e->dln_backward = l->dln_backward;
l->dln_backward = (char *)e - base;
@ -65,14 +65,14 @@ void _isdln_base_append (register char *base, register struct dlink *l,
}
/* _isdln_base_remove () - Remove element from list -------------------------*/
void _isdln_base_remove (register char *base, register struct dlink *e)
void _isdln_base_remove (char *base, struct dlink *e)
{
((struct dlink *)(base + e->dln_backward))->dln_forward = e->dln_forward;
((struct dlink *)(base + e->dln_forward))->dln_backward = e->dln_backward;
}
/* _isdln_base_first () - Return first element of the list -------------------*/
struct dlink * _isdln_base_first(register char *base, register struct dlink *l)
struct dlink * _isdln_base_first(char *base, struct dlink *l)
{
struct dlink *val = (struct dlink *)(base + l->dln_forward);
@ -86,25 +86,25 @@ struct dlink * _isdln_base_first(register char *base, register struct dlink *l)
}
/* _isdln_base_next () - Return next element in the list --------------------*/
struct dlink * _isdln_base_next(register char *base, register struct dlink *l)
struct dlink * _isdln_base_next(char *base, struct dlink *l)
{
return (((struct dlink *)(base + l->dln_forward)));
}
/* _isdln_base_prev () - Return previous element in the list ----------------*/
struct dlink * _isdln_base_prev(register char *base, register struct dlink *l)
struct dlink * _isdln_base_prev(char *base, struct dlink *l)
{
return (((struct dlink *)(base + l->dln_backward)));
}
/* _isdln_base_makeempty () - Make head of empty list -----------------------*/
void _isdln_base_makeempty(register char *base, register struct dlink *l)
void _isdln_base_makeempty(char *base, struct dlink *l)
{
l->dln_forward = l->dln_backward = (char *)l - base;
}
/* _isdln_base_isempty () - Test if list is empty---------------------------*/
int _isdln_base_isempty(register char *base, register struct dlink *l)
int _isdln_base_isempty(char *base, struct dlink *l)
{
return (l->dln_forward == (char *)l - base &&
l->dln_backward == (char *)l - base);

View file

@ -58,7 +58,7 @@ static char sccsid[] = "@(#)isfab.c 1.8 89/07/17 Copyr 1988 Sun Micro";
Fab *
_fab_new(char *isfname, enum openmode openmode, Bool varlen, int minreclen, int maxreclen)
{
register Fab *fab;
Fab *fab;
/* Allocate memory for the fab object. */
fab = (Fab *) _ismalloc(sizeof(*fab));
@ -86,7 +86,7 @@ _fab_new(char *isfname, enum openmode openmode, Bool varlen, int minreclen, int
}
void
_fab_destroy(register Fab *fab)
_fab_destroy(Fab *fab)
{
assert(fab != NULL);
assert(fab->isfname != NULL);

View file

@ -66,7 +66,7 @@ Fcb *
_isfcb_create(char *isfname, int crdat, int crind, int crvar,
int owner, int group, int u_mask, struct errcode *errcode)
{
register Fcb *fcb;
Fcb *fcb;
int dat_fd = -1;
int ind_fd = -1;
int var_fd = -1;
@ -156,7 +156,7 @@ _isfcb_create(char *isfname, int crdat, int crind, int crvar,
*/
void
_isfcb_setreclength(register Fcb *fcb, Bool varflag, int minreclen, int maxreclen)
_isfcb_setreclength(Fcb *fcb, Bool varflag, int minreclen, int maxreclen)
{
fcb->varflag = varflag;
fcb->minreclen = minreclen;
@ -182,7 +182,7 @@ _isfcb_setreclength(register Fcb *fcb, Bool varflag, int minreclen, int maxrecle
Fcb *
_isfcb_open(char *isfname, struct errcode *errcode)
{
register Fcb *fcb;
Fcb *fcb;
int dat_fd = -1;
int ind_fd = -1;
int var_fd = -1;
@ -237,9 +237,9 @@ _isfcb_open(char *isfname, struct errcode *errcode)
*/
int
_isfcb_nfds(register Fcb *fcb)
_isfcb_nfds(Fcb *fcb)
{
register int count = 0;
int count = 0;
if (fcb->datfd != -1)
count++;
@ -261,7 +261,7 @@ _isfcb_nfds(register Fcb *fcb)
*/
void
_isfcb_remove(register Fcb *fcb)
_isfcb_remove(Fcb *fcb)
{
if (fcb->datfd)
_remove_datfile(fcb->isfname);
@ -280,7 +280,7 @@ _isfcb_remove(register Fcb *fcb)
*/
void
_isfcb_close(register Fcb *fcb)
_isfcb_close(Fcb *fcb)
{
assert (fcb != NULL);
assert (fcb->isfname != NULL);
@ -304,7 +304,7 @@ _isfcb_close(register Fcb *fcb)
*/
int
_isfcb_cntlpg_w(register Fcb *fcb)
_isfcb_cntlpg_w(Fcb *fcb)
{
char cntl_page[ISCNTLSIZE];
int dat_fd = fcb->datfd;
@ -393,7 +393,7 @@ _isfcb_cntlpg_w(register Fcb *fcb)
*/
int
_isfcb_cntlpg_w2(register Fcb *fcb)
_isfcb_cntlpg_w2(Fcb *fcb)
{
char cntl_page[CP_VAREND_OFF+CP_VAREND_LEN];
int dat_fd = fcb->datfd;
@ -452,7 +452,7 @@ _isfcb_cntlpg_w2(register Fcb *fcb)
*/
int
_isfcb_cntlpg_r(register Fcb *fcb)
_isfcb_cntlpg_r(Fcb *fcb)
{
char cntl_page[ISCNTLSIZE];
int dat_fd = fcb->datfd;
@ -552,7 +552,7 @@ _isfcb_cntlpg_r(register Fcb *fcb)
*/
int
_isfcb_cntlpg_r2(register Fcb *fcb)
_isfcb_cntlpg_r2(Fcb *fcb)
{
char cntl_page[CP_VAREND_OFF+CP_VAREND_LEN];
int dat_fd = fcb->datfd;

View file

@ -121,11 +121,11 @@ _isfcb_altkeyadd(Fcb *fcb, Keydesc2 *keydesc2)
*/
Keydesc2 *
_isfcb_findkey(register Fcb *fcb, Keydesc2 *keydesc2)
_isfcb_findkey(Fcb *fcb, Keydesc2 *keydesc2)
{
int nkeys = fcb->nkeys;
register Keydesc2 *kp2;
register int j, i;
Keydesc2 *kp2;
int j, i;
int nparts;
for (i = 0; i < nkeys; i++) {
@ -155,11 +155,11 @@ _isfcb_findkey(register Fcb *fcb, Keydesc2 *keydesc2)
*/
int
_isfcb_altkeydel(register Fcb *fcb, Keydesc2 *keydesc2)
_isfcb_altkeydel(Fcb *fcb, Keydesc2 *keydesc2)
{
int nkeys = fcb->nkeys;
register int i, j;
register Keydesc2 *kp2;
int i, j;
Keydesc2 *kp2;
int nparts;
for (i = 0; i < nkeys; i++) {
@ -200,7 +200,7 @@ _isfcb_altkeydel(register Fcb *fcb, Keydesc2 *keydesc2)
/* compare key parts */
Static int
_keypart2cmp(register struct keypart2 *l, register struct keypart2 *r)
_keypart2cmp(struct keypart2 *l, struct keypart2 *r)
{
return !(l->kp2_type == r->kp2_type && l->kp2_start == r->kp2_start &&
l->kp2_leng == r->kp2_leng);
@ -214,11 +214,11 @@ _keypart2cmp(register struct keypart2 *l, register struct keypart2 *r)
*/
Keydesc2 *
_isfcb_indfindkey(register Fcb *fcb, int keyid)
_isfcb_indfindkey(Fcb *fcb, int keyid)
{
int nkeys = fcb->nkeys;
register Keydesc2 *keys = fcb->keys;
register int i;
Keydesc2 *keys = fcb->keys;
int i;
for (i = 0; i < nkeys; i++) {
if (keys[i].k2_keyid == keyid)

View file

@ -57,7 +57,7 @@ static Fab *isfdtab[MAXISFD]; /* Table of pointers */
Isfd
_isfd_insert(Fab *fab)
{
register Isfd i;
Isfd i;
for (i = 0; i < MAXISFD; i++) {
if (isfdtab[i] == NULL) /* Empty entry found */
@ -81,7 +81,7 @@ _isfd_insert(Fab *fab)
*/
Fab *
_isfd_find(register Isfd isfd)
_isfd_find(Isfd isfd)
{
if (isfd < 0 || isfd >= MAXISFD || isfdtab[isfd] == NULL)
return (NULL);
@ -96,7 +96,7 @@ _isfd_find(register Isfd isfd)
*/
void
_isfd_delete(register Isfd isfd)
_isfd_delete(Isfd isfd)
{
if (isfd >= 0 && isfd < MAXISFD)
isfdtab[isfd] = NULL;

View file

@ -64,7 +64,7 @@ static void remove_from_chain(); /* used by _flrec_wrrec() */
/*ARGSUSED*/
int
_flrec_write(register Fcb *fcb, char *record, Recno *recnum, int reclen)
_flrec_write(Fcb *fcb, char *record, Recno *recnum, int reclen)
{
Recno recnum2;
long rec_position;
@ -127,7 +127,7 @@ _flrec_write(register Fcb *fcb, char *record, Recno *recnum, int reclen)
*/
int
_flrec_read(register Fcb *fcb, char *record, Recno recnum, int *reclen)
_flrec_read(Fcb *fcb, char *record, Recno recnum, int *reclen)
{
long rec_position;
char delflag;
@ -186,7 +186,7 @@ _fl_getpos(Fcb *fcb, Recno recnum)
/*ARGSUSED*/
int
_flrec_rewrite(register Fcb *fcb, char *record, Recno recnum, int reclen)
_flrec_rewrite(Fcb *fcb, char *record, Recno recnum, int reclen)
{
long rec_position;
char delflag;
@ -228,7 +228,7 @@ _flrec_rewrite(register Fcb *fcb, char *record, Recno recnum, int reclen)
*/
int
_flrec_delete(register Fcb *fcb, Recno recnum)
_flrec_delete(Fcb *fcb, Recno recnum)
{
long rec_position;
char delflag;
@ -285,7 +285,7 @@ _flrec_delete(register Fcb *fcb, Recno recnum)
/*ARGSUSED*/
int
_flrec_wrrec(register Fcb *fcb, char *record, Recno recnum, int reclen)
_flrec_wrrec(Fcb *fcb, char *record, Recno recnum, int reclen)
{
long rec_position;
char delflag;

View file

@ -98,7 +98,7 @@ _makevar_isfname(char *isfname)
void
_removelast(char *path)
{
register char *p;
char *p;
for (p = path + strlen(path); *--p != '/' && p >= path; )
*p = '\0';

View file

@ -45,8 +45,8 @@ void
stkey(Keydesc2 *pkeydesc2, char *p)
{
int i;
register struct keypart2 *ppart;
register char *pp;
struct keypart2 *ppart;
char *pp;
int nparts;
stshort(pkeydesc2->k2_flags, p + K2_FLAGS_OFF);
@ -80,11 +80,11 @@ stkey(Keydesc2 *pkeydesc2, char *p)
}
void
ldkey(register struct keydesc2 *pkeydesc2, register char *p)
ldkey(struct keydesc2 *pkeydesc2, char *p)
{
int i;
register struct keypart2 *ppart;
register char *pp;
struct keypart2 *ppart;
char *pp;
int nparts;
memset ((char *) pkeydesc2, 0, sizeof (*pkeydesc2));

View file

@ -63,7 +63,7 @@ static char sccsid[] = "@(#)isindexinfo.c 1.2 91/05/16 Copyr 1988 Sun Micro";
int
isindexinfo(int isfd, struct keydesc *buffer, int number)
{
register Fab *fab;
Fab *fab;
int ret;
Fcb *fcb = NULL;

View file

@ -53,8 +53,8 @@ Blkno _isgetfreekpage();
void
_iskey_extract (Keydesc2 *pkeydesc2, char *recp, char *keyp)
{
register int i;
register struct keypart2 *ppart;
int i;
struct keypart2 *ppart;
int nparts;
nparts = pkeydesc2->k2_nparts;

View file

@ -71,9 +71,9 @@ int
_iskeycmp(char *lkey, char *rkey)
{
int i, ret;
register struct keypart2 *p;
register char *l, *r;
register long llong, rlong;
struct keypart2 *p;
char *l, *r;
long llong, rlong;
double ldouble, rdouble;
ret = 0;

View file

@ -55,7 +55,7 @@ void
_iskey_itox(struct keydesc2 *pikdesc, struct keydesc *pxkdesc)
{
int nparts;
register int i;
int i;
memset ((char *)pxkdesc, 0, sizeof (*pxkdesc));
@ -82,7 +82,7 @@ void
_iskey_xtoi(struct keydesc2 *pikdesc, struct keydesc *pxkdesc)
{
int nparts;
register int i;
int i;
int offset; /* Keep track of offset in key */
memset ((char *)pikdesc, 0, sizeof (*pikdesc));

View file

@ -54,10 +54,10 @@ static int _check_typelen();
*/
int
_validate_keydesc(register struct keydesc *keydesc, int minreclen)
_validate_keydesc(struct keydesc *keydesc, int minreclen)
{
int nparts;
register int i;
int i;
int type, start, length;
int keylen = 0;

View file

@ -75,10 +75,10 @@ static float *isminfloat = (float *)isminfloatarr;
*/
void
_iskey_fillmax(struct keydesc2 *pkeydesc2, register char *keybuf)
_iskey_fillmax(struct keydesc2 *pkeydesc2, char *keybuf)
{
register int i;
register struct keypart2 *ppart;
int i;
struct keypart2 *ppart;
int nparts;
nparts = pkeydesc2->k2_nparts;
@ -141,10 +141,10 @@ _iskey_fillmax(struct keydesc2 *pkeydesc2, register char *keybuf)
*/
void
_iskey_fillmin(struct keydesc2 *pkeydesc2, register char *keybuf)
_iskey_fillmin(struct keydesc2 *pkeydesc2, char *keybuf)
{
register int i;
register struct keypart2 *ppart;
int i;
struct keypart2 *ppart;
int nparts;
nparts = pkeydesc2->k2_nparts;

View file

@ -78,7 +78,7 @@ void
_mngfcb_insert(Fcb *fcb, Bytearray *isfhandle)
{
int hashval = _hashisfhandle(isfhandle);
register int ind;
int ind;
int ntries;
/* Try to find an unused entry in the hash table. */
@ -115,7 +115,7 @@ Fcb *
_mngfcb_find(Bytearray *isfhandle)
{
int hashval = _hashisfhandle(isfhandle);
register int ind;
int ind;
int ntries;
/* Find the entry. */
@ -150,7 +150,7 @@ void
_mngfcb_delete(Bytearray *isfhandle)
{
int hashval = _hashisfhandle(isfhandle);
register int ind;
int ind;
int ntries;
/* Find the entry */
@ -187,7 +187,7 @@ _mngfcb_victim(void)
{
int victim_ind = -1;
long victim_time = 0; /* Assign to shut up lint */
register int i;
int i;
for (i = 0; i < FCBHASHSIZE; i++) {
@ -212,9 +212,9 @@ _mngfcb_victim(void)
Static int
_hashisfhandle(Bytearray *isfhandle)
{
register char *p;
register unsigned h, g;
register int len;
char *p;
unsigned h, g;
int len;
len = isfhandle->length;
p = isfhandle->data;

View file

@ -117,7 +117,7 @@ isopen(char *isfname, int mode)
return ((int)isfd); /* Successful isopen() */
}
Static int _am_open(register Fab *fab)
Static int _am_open(Fab *fab)
{
return (_amopen(fab->isfname, fab->openmode, &fab->varlength,
&fab->minreclen, &fab->maxreclen, &fab->isfhandle,

View file

@ -73,7 +73,7 @@ static int _amread();
int
isread(int isfd, char *record, int mode)
{
register Fab *fab;
Fab *fab;
int reclen;
Recno recnum;
int ret;

View file

@ -146,7 +146,7 @@ isrename(char *oldname, char *newname)
Static void
_removelast2(char *path)
{
register char *p;
char *p;
for (p = path + strlen(path); *--p != '/' && p >= path; )
*p = '\0';

View file

@ -73,7 +73,7 @@ static int _amrewcurr(), _changekeys2();
int
isrewcurr(int isfd, char *record)
{
register Fab *fab;
Fab *fab;
int reclen;
int ret;
int recnum;
@ -239,7 +239,7 @@ _changekeys2(Fcb *fcb, char *record, char *oldrecord,
Recno recnum, Bytearray *curpos)
{
int nkeys = fcb->nkeys;
register int i;
int i;
int err;
Crp *crp;
int keyid;

View file

@ -72,7 +72,7 @@ static int _amrewrec(), _changekeys();
int
isrewrec(int isfd, long recnum, char *record)
{
register Fab *fab;
Fab *fab;
int reclen;
int ret;
@ -210,7 +210,7 @@ static int
_changekeys (Fcb *fcb, char *record, char *oldrecord, Recno recnum)
{
int nkeys = fcb->nkeys;
register int i;
int i;
int err;
for (i = 0; i < nkeys; i++) {

View file

@ -94,7 +94,7 @@ _issort_destroy(Issort *srt)
*/
void
_issort_insert(register Issort *srt, char *record)
_issort_insert(Issort *srt, char *record)
{
assert(srt->ist_nrecs < srt->ist_allocrecs);
@ -138,7 +138,7 @@ _issort_rewind(Issort *srt)
*/
char *
_issort_read(register Issort *srt)
_issort_read(Issort *srt)
{
return((srt->ist_currec < srt->ist_nrecs) ?
(srt->ist_array + srt->ist_currec++ * srt->ist_reclength) :

View file

@ -70,7 +70,7 @@ int
isstart(int isfd, struct keydesc *keydesc, int length, char *record,
int mode)
{
register Fab *fab;
Fab *fab;
int reclen;
Recno recnum;
int ret;

View file

@ -81,7 +81,7 @@ int _issync(void)
int _isfsync(int isfd)
{
register Fab *fab;
Fab *fab;
Fcb *fcb;
int ret;

View file

@ -67,7 +67,7 @@ static _istail_read();
/*ARGSUSED*/
int
_vlrec_write(register Fcb *fcb, char *record, Recno *recnum, int reclen)
_vlrec_write(Fcb *fcb, char *record, Recno *recnum, int reclen)
{
Recno recnum2;
long rec_position;
@ -137,7 +137,7 @@ _vlrec_write(register Fcb *fcb, char *record, Recno *recnum, int reclen)
*/
int
_vlrec_read(register Fcb *fcb, char *record, Recno recnum, int *reclen)
_vlrec_read(Fcb *fcb, char *record, Recno recnum, int *reclen)
{
long rec_position;
long tailoff;
@ -206,7 +206,7 @@ _vl_getpos(Fcb *fcb, Recno recnum)
/*ARGSUSED*/
int
_vlrec_rewrite(register Fcb *fcb, char *record, Recno recnum, int reclen)
_vlrec_rewrite(Fcb *fcb, char *record, Recno recnum, int reclen)
{
long rec_position;
long tailoff;
@ -258,7 +258,7 @@ _vlrec_rewrite(register Fcb *fcb, char *record, Recno recnum, int reclen)
*/
int
_vlrec_delete(register Fcb *fcb, Recno recnum)
_vlrec_delete(Fcb *fcb, Recno recnum)
{
long rec_position;
long tailoff;
@ -322,7 +322,7 @@ _vlrec_delete(register Fcb *fcb, Recno recnum)
/*ARGSUSED*/
int
_vlrec_wrrec(register Fcb *fcb, char *record, Recno recnum, int reclen)
_vlrec_wrrec(Fcb *fcb, char *record, Recno recnum, int reclen)
{
long rec_position;
long tailoff;

View file

@ -74,7 +74,7 @@ int
iswrite(int isfd, char *record)
{
int _am_write();
register Fab *fab;
Fab *fab;
int reclen;
Recno recnum;
Bytearray curpos;
@ -121,7 +121,7 @@ iswrite(int isfd, char *record)
}
Static int _am_write(register Fab *fab, char *record, int reclen,
Static int _am_write(Fab *fab, char *record, int reclen,
Bytearray *curpos, Recno *recnum)
{
return (_amwrite(&fab->isfhandle, record, reclen,

View file

@ -72,7 +72,7 @@ static int _amwrrec();
int
iswrrec(int isfd, long recnum, char *record)
{
register Fab *fab;
Fab *fab;
int reclen;
int ret;