*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.35 1998/02/06 20:17:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.36 1998/02/11 19:09:21 momjian Exp $
*
* NOTES
* The old interface functions have been converted to macros
offsetof(HeapTupleData, t_cmax)
};
-/* this is so the sparcstation debugger works */
-
-#if !defined(NO_ASSERT_CHECKING) && defined(sparc) && defined(sunos4)
-#define register
-#endif /* !NO_ASSERT_CHECKING && sparc && sunos4 */
-
/* ----------------------------------------------------------------
* misc support routines
* ----------------------------------------------------------------
* ----------------
*/
{
- register int i = 0; /* current offset in bp */
- register int mask; /* bit in byte we're looking at */
- register char n; /* current byte in bp */
- register int byte,
+ int i = 0; /* current offset in bp */
+ int mask; /* bit in byte we're looking at */
+ char n; /* current byte in bp */
+ int byte,
finalbit;
byte = attnum >> 3;
}
else if (!HeapTupleAllFixed(tup))
{
- register int j = 0;
+ int j = 0;
/*
* In for(), we make this <= and not < because we want to
*/
if (!slow)
{
- register int j = 1;
- register long off;
+ int j = 1;
+ long off;
/*
* need to set cache for some atts
}
else
{
- register bool usecache = true;
- register int off = 0;
- register int i;
+ bool usecache = true;
+ int off = 0;
+ int i;
/*
* Now we know that we have to walk the tuple CAREFULLY.
int structlen, /* its length */
char *structure) /* pointer to the struct */
{
- register char *tp; /* tuple data pointer */
+ char *tp; /* tuple data pointer */
HeapTuple tup;
long len;
int hoff;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.26 1998/02/06 20:17:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.27 1998/02/11 19:09:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
Datum value[],
char null[])
{
- register char *tp; /* tuple pointer */
+ char *tp; /* tuple pointer */
IndexTuple tuple; /* return tuple */
Size size,
hoff;
TupleDesc tupleDesc,
bool *isnull)
{
- register char *tp; /* ptr to att in tuple */
- register char *bp = NULL; /* ptr to att in tuple */
+ char *tp; /* ptr to att in tuple */
+ char *bp = NULL; /* ptr to att in tuple */
int slow; /* do we have to walk nulls? */
- register int data_off; /* tuple data offset */
+ int data_off; /* tuple data offset */
AttributeTupleForm *att = tupleDesc->attrs;
/* ----------------
* ----------------
*/
{
- register int i = 0; /* current offset in bp */
- register int mask; /* bit in byte we're looking at */
- register char n; /* current byte in bp */
- register int byte,
+ int i = 0; /* current offset in bp */
+ int mask; /* bit in byte we're looking at */
+ char n; /* current byte in bp */
+ int byte,
finalbit;
byte = attnum >> 3;
}
else if (!IndexTupleAllFixed(tup))
{
- register int j = 0;
+ int j = 0;
for (j = 0; j < attnum && !slow; j++)
if (att[j]->attlen < 1 && !VARLENA_FIXED_SIZE(att[j]))
if (!slow)
{
- register int j = 1;
- register long off;
+ int j = 1;
+ long off;
/*
* need to set cache for some atts
}
else
{
- register bool usecache = true;
- register int off = 0;
- register int i;
+ bool usecache = true;
+ int off = 0;
+ int i;
/*
* Now we know that we have to walk the tuple CAREFULLY.
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.25 1998/02/10 16:02:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.26 1998/02/11 19:09:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
void
debugtup(HeapTuple tuple, TupleDesc typeinfo)
{
- register int i;
+ int i;
Datum attr;
char *value;
bool isnull;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.25 1998/01/07 21:01:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.26 1998/02/11 19:09:30 momjian Exp $
*
*
* INTERFACE ROUTINES
int backw,
Buffer *b)
{
- register HeapScanDesc sdesc = scandesc;
+ HeapScanDesc sdesc = scandesc;
Buffer localb;
/* ----------------
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.35 1998/02/07 06:10:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.36 1998/02/11 19:09:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
static int
CompHash(char *str, int len)
{
- register int result;
+ int result;
result = (NUM * str[0] + NUMSQR * str[len - 1] + NUMCUBE * str[(len - 1) / 2]);
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.4 1998/01/31 04:38:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.5 1998/02/11 19:09:42 momjian Exp $
*
* NOTES
* See acl.h.
static
dumpacl(Acl *acl)
{
- register unsigned i;
+ unsigned i;
AclItem *aip;
elog(DEBUG, "acl size = %d, # acls = %d",
AclItem *mod_aip,
unsigned modechg)
{
- register unsigned i;
+ unsigned i;
Acl *old_acl = (Acl *) NULL,
*new_acl;
Relation relation;
static int32
aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode)
{
- register unsigned i;
- register AclItem *aip,
+ unsigned i;
+ AclItem *aip,
*aidat;
unsigned num,
found_group;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.13 1998/01/16 23:19:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.14 1998/02/11 19:09:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
fillatt(TupleDesc tupleDesc)
{
AttributeTupleForm *attributeP;
- register TypeTupleForm typp;
+ TypeTupleForm typp;
HeapTuple tuple;
int i;
int natts = tupleDesc->natts;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.45 1998/02/07 06:10:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.46 1998/02/11 19:09:54 momjian Exp $
*
* INTERFACE ROUTINES
* heap_create() - Create an uncataloged heap relation
heap_create(char *name,
TupleDesc tupDesc)
{
- register unsigned i;
+ unsigned i;
Oid relid;
Relation rdesc;
int len;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.11 1998/01/06 19:42:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.12 1998/02/11 19:10:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
char *agginitval1,
char *agginitval2)
{
- register i;
+ int i;
Relation aggdesc;
HeapTuple tup;
char nulls[Natts_pg_aggregate];
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.20 1998/01/15 19:42:30 pgsql Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.21 1998/02/11 19:10:11 momjian Exp $
*
* NOTES
* these routines moved here from commands/define.c and somewhat cleaned up.
Oid leftObjectId,
Oid rightObjectId)
{
- register int i;
+ int i;
HeapTuple tup;
Datum values[Natts_pg_operator];
char nulls[Natts_pg_operator];
char *leftSortName,
char *rightSortName)
{
- register i,
+ int i,
j;
Relation pg_operator_desc;
static void
OperatorUpd(Oid baseId, Oid commId, Oid negId)
{
- register i;
+ int i;
Relation pg_operator_desc;
HeapScanDesc pg_operator_scan;
HeapTuple tup;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.13 1998/01/06 19:42:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.14 1998/02/11 19:10:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
List *argList,
CommandDest dest)
{
- register i;
+ int i;
Relation rdesc;
HeapTuple tup;
bool defined;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.18 1998/01/15 19:42:30 pgsql Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.19 1998/02/11 19:10:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
static Oid
TypeShellMakeWithOpenRelation(Relation pg_type_desc, char *typeName)
{
- register int i;
+ int i;
HeapTuple tup;
Datum values[Natts_pg_type];
char nulls[Natts_pg_type];
bool passedByValue,
char alignment)
{
- register i,
+ int i,
j;
Relation pg_type_desc;
HeapScanDesc pg_type_scan;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.21 1998/01/15 19:42:38 pgsql Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.22 1998/02/11 19:10:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
ItemPointerData itemPointerData;
Buffer buffer;
static attnums[3] = {7, 8, 9}; /* left, right, return */
- register i;
+ int i;
ScanKeyEntryInitialize(&key[0],
0, 0, ObjectIdEqualRegProcedure, (Datum) typeOid);
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.17 1998/01/25 05:13:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.18 1998/02/11 19:10:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
static int
hashFunc(char *key, int len)
{
- register unsigned int h;
- register int l;
- register unsigned char *k;
+ unsigned int h;
+ int l;
+ unsigned char *k;
/*
* If this is a variable length type, then 'k' points to a "struct
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/lib/Attic/qsort.c,v 1.4 1997/09/08 02:23:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/lib/Attic/qsort.c,v 1.5 1998/02/11 19:10:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
static void
quick_sort(char *bot, int nmemb, int size, int (*compar) ())
{
- register int cnt;
- register u_char ch;
- register char *top,
+ int cnt;
+ u_char ch;
+ char *top,
*mid,
*t1,
*t2;
- register int n1,
+ int n1,
n2;
char *bsv;
static void
insertion_sort(char *bot, int nmemb, int size, int (*compar) ())
{
- register int cnt;
- register u_char ch;
- register char *s1,
+ int cnt;
+ u_char ch;
+ char *s1,
*s2,
*t1,
*t2,
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.14 1998/01/15 19:44:41 pgsql Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.15 1998/02/11 19:10:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
bool
index_info(Query *root, bool first, int relid, IdxInfoRetval *info)
{
- register i;
+ int i;
HeapTuple indexTuple,
amopTuple;
IndexTupleForm index;
float *idxPages,
float *idxSelec)
{
- register i,
+ int i,
n;
HeapTuple indexTuple,
amopTuple,
void *
dlopen(const char *path, int mode)
{
- register ModulePtr mp;
+ ModulePtr mp;
static void *mainModule;
/*
*/
if (mode & RTLD_GLOBAL)
{
- register ModulePtr mp1;
+ ModulePtr mp1;
for (mp1 = mp->next; mp1; mp1 = mp1->next)
if (loadbind(0, mp1->entry, mp->entry) == -1)
static void
caterr(char *s)
{
- register char *p = s;
+ char *p = s;
while (*p >= '0' && *p <= '9')
p++;
void *
dlsym(void *handle, const char *symbol)
{
- register ModulePtr mp = (ModulePtr) handle;
- register ExportPtr ep;
- register int i;
+ ModulePtr mp = (ModulePtr) handle;
+ ExportPtr ep;
+ int i;
/*
* Could speed up the search, but I assume that one assigns the result
int
dlclose(void *handle)
{
- register ModulePtr mp = (ModulePtr) handle;
+ ModulePtr mp = (ModulePtr) handle;
int result;
- register ModulePtr mp1;
+ ModulePtr mp1;
if (--mp->refCnt > 0)
return 0;
}
if (mp->exports)
{
- register ExportPtr ep;
- register int i;
+ ExportPtr ep;
+ int i;
for (ep = mp->exports, i = mp->nExports; i; i--, ep++)
if (ep->name)
-/* $Id: getrusage.c,v 1.4 1998/02/01 00:02:59 scrappy Exp $ */
+/* $Id: getrusage.c,v 1.5 1998/02/11 19:10:57 momjian Exp $ */
#include <math.h> /* for pow() prototype */
getrusage(int who, struct rusage * rusage)
{
struct tms tms;
- register int tick_rate = CLK_TCK; /* ticks per second */
+ int tick_rate = CLK_TCK; /* ticks per second */
clock_t u,
s;
-/* $Id: inet_aton.c,v 1.12 1998/01/23 19:13:14 scrappy Exp $
+/* $Id: inet_aton.c,v 1.13 1998/02/11 19:11:05 momjian Exp $
*
* This inet_aton() function was taken from the GNU C library and
* incorporated into Postgres for those systems which do not have this
int
inet_aton(const char *cp, struct in_addr * addr)
{
- register unsigned int val;
- register int base,
+ unsigned int val;
+ int base,
n;
- register char c;
+ char c;
u_int parts[4];
- register u_int *pp = parts;
+ u_int *pp = parts;
for (;;)
{
-/* $Id: strcasecmp.c,v 1.2 1997/12/19 13:34:32 scrappy Exp $ */
+/* $Id: strcasecmp.c,v 1.3 1998/02/11 19:11:10 momjian Exp $ */
/*
* Copyright (c) 1987 Regents of the University of California.
int
strcasecmp(char *s1, char *s2)
{
- register unsigned char u1,
+ unsigned char u1,
u2;
for (;;)
strtol(nptr, endptr, base)
const char *nptr;
char **endptr;
-register int base;
+int base;
{
- register const char *s = nptr;
- register unsigned long acc;
- register int c;
- register unsigned long cutoff;
- register int neg = 0,
+ const char *s = nptr;
+ unsigned long acc;
+ int c;
+ unsigned long cutoff;
+ int neg = 0,
any,
cutlim;
/*
- matcher - the actual matching engine
- == static int matcher(register struct re_guts *g, char *string, \
+ == static int matcher(struct re_guts *g, char *string, \
== size_t nmatch, regmatch_t pmatch[], int eflags);
*/
static int /* 0 success, REG_NOMATCH failure */
matcher(g, string, nmatch, pmatch, eflags)
-register struct re_guts *g;
+struct re_guts *g;
char *string;
size_t nmatch;
regmatch_t pmatch[];
int eflags;
{
- register char *endp;
- register int i;
+ char *endp;
+ int i;
struct match mv;
- register struct match *m = &mv;
- register char *dp;
- register const sopno gf = g->firststate + 1; /* +1 for OEND */
- register const sopno gl = g->laststate;
+ struct match *m = &mv;
+ char *dp;
+ const sopno gf = g->firststate + 1; /* +1 for OEND */
+ const sopno gl = g->laststate;
char *start;
char *stop;
/*
- dissect - figure out what matched what, no back references
- == static char *dissect(register struct match *m, char *start, \
+ == static char *dissect(struct match *m, char *start, \
== char *stop, sopno startst, sopno stopst);
*/
static char * /* == stop (success) always */
dissect(m, start, stop, startst, stopst)
-register struct match *m;
+struct match *m;
char *start;
char *stop;
sopno startst;
sopno stopst;
{
- register int i;
- register sopno ss; /* start sop of current subRE */
- register sopno es; /* end sop of current subRE */
- register char *sp; /* start of string matched by it */
- register char *stp; /* string matched by it cannot pass here */
- register char *rest; /* start of rest of string */
- register char *tail; /* string unmatched by rest of RE */
- register sopno ssub; /* start sop of subsubRE */
- register sopno esub; /* end sop of subsubRE */
- register char *ssp; /* start of string matched by subsubRE */
- register char *sep; /* end of string matched by subsubRE */
- register char *oldssp; /* previous ssp */
- register char *dp;
+ int i;
+ sopno ss; /* start sop of current subRE */
+ sopno es; /* end sop of current subRE */
+ char *sp; /* start of string matched by it */
+ char *stp; /* string matched by it cannot pass here */
+ char *rest; /* start of rest of string */
+ char *tail; /* string unmatched by rest of RE */
+ sopno ssub; /* start sop of subsubRE */
+ sopno esub; /* end sop of subsubRE */
+ char *ssp; /* start of string matched by subsubRE */
+ char *sep; /* end of string matched by subsubRE */
+ char *oldssp; /* previous ssp */
+ char *dp;
AT("diss", start, stop, startst, stopst);
sp = start;
/*
- backref - figure out what matched what, figuring in back references
- == static char *backref(register struct match *m, char *start, \
+ == static char *backref(struct match *m, char *start, \
== char *stop, sopno startst, sopno stopst, sopno lev);
*/
static char * /* == stop (success) or NULL (failure) */
backref(m, start, stop, startst, stopst, lev)
-register struct match *m;
+struct match *m;
char *start;
char *stop;
sopno startst;
sopno stopst;
sopno lev; /* PLUS nesting level */
{
- register int i;
- register sopno ss; /* start sop of current subRE */
- register char *sp; /* start of string matched by it */
- register sopno ssub; /* start sop of subsubRE */
- register sopno esub; /* end sop of subsubRE */
- register char *ssp; /* start of string matched by subsubRE */
- register char *dp;
- register size_t len;
- register int hard;
- register sop s;
- register regoff_t offsave;
- register cset *cs;
+ int i;
+ sopno ss; /* start sop of current subRE */
+ char *sp; /* start of string matched by it */
+ sopno ssub; /* start sop of subsubRE */
+ sopno esub; /* end sop of subsubRE */
+ char *ssp; /* start of string matched by subsubRE */
+ char *dp;
+ size_t len;
+ int hard;
+ sop s;
+ regoff_t offsave;
+ cset *cs;
AT("back", start, stop, startst, stopst);
sp = start;
/*
- fast - step through the string at top speed
- == static char *fast(register struct match *m, char *start, \
+ == static char *fast(struct match *m, char *start, \
== char *stop, sopno startst, sopno stopst);
*/
static char * /* where tentative match ended, or NULL */
fast(m, start, stop, startst, stopst)
-register struct match *m;
+struct match *m;
char *start;
char *stop;
sopno startst;
sopno stopst;
{
- register states st = m->st;
- register states fresh = m->fresh;
- register states tmp = m->tmp;
- register char *p = start;
- register int c = (start == m->beginp) ? OUT : *(start - 1);
- register int lastc; /* previous c */
- register int flagch;
- register int i;
- register char *coldp; /* last p after which no match was
+ states st = m->st;
+ states fresh = m->fresh;
+ states tmp = m->tmp;
+ char *p = start;
+ int c = (start == m->beginp) ? OUT : *(start - 1);
+ int lastc; /* previous c */
+ int flagch;
+ int i;
+ char *coldp; /* last p after which no match was
* underway */
CLEAR(st);
/*
- slow - step through the string more deliberately
- == static char *slow(register struct match *m, char *start, \
+ == static char *slow(struct match *m, char *start, \
== char *stop, sopno startst, sopno stopst);
*/
static char * /* where it ended */
slow(m, start, stop, startst, stopst)
-register struct match *m;
+struct match *m;
char *start;
char *stop;
sopno startst;
sopno stopst;
{
- register states st = m->st;
- register states empty = m->empty;
- register states tmp = m->tmp;
- register char *p = start;
- register int c = (start == m->beginp) ? OUT : *(start - 1);
- register int lastc; /* previous c */
- register int flagch;
- register int i;
- register char *matchp; /* last p at which a match ended */
+ states st = m->st;
+ states empty = m->empty;
+ states tmp = m->tmp;
+ char *p = start;
+ int c = (start == m->beginp) ? OUT : *(start - 1);
+ int lastc; /* previous c */
+ int flagch;
+ int i;
+ char *matchp; /* last p at which a match ended */
AT("slow", start, stop, startst, stopst);
CLEAR(st);
/*
- step - map set of states reachable before char to set reachable after
- == static states step(register struct re_guts *g, sopno start, sopno stop, \
- == register states bef, int ch, register states aft);
+ == static states step(struct re_guts *g, sopno start, sopno stop, \
+ == states bef, int ch, states aft);
== #define BOL (OUT+1)
== #define EOL (BOL+1)
== #define BOLEOL (BOL+2)
*/
static states
step(g, start, stop, bef, ch, aft)
-register struct re_guts *g;
+struct re_guts *g;
sopno start; /* start state within strip */
sopno stop; /* state after stop state within strip */
-register states bef; /* states reachable before */
+states bef; /* states reachable before */
int ch; /* character or NONCHAR code */
-register states aft; /* states already known reachable after */
+states aft; /* states already known reachable after */
{
- register cset *cs;
- register sop s;
- register sopno pc;
- register onestate here; /* note, macros know this name */
- register sopno look;
- register int i;
+ cset *cs;
+ sop s;
+ sopno pc;
+ onestate here; /* note, macros know this name */
+ sopno look;
+ int i;
for (pc = start, INIT(here, pc); pc != stop; pc++, INC(here))
{
int ch;
FILE *d;
{
- register struct re_guts *g = m->g;
- register int i;
- register int first = 1;
+ struct re_guts *g = m->g;
+ int i;
+ int first = 1;
if (!(m->eflags & REG_TRACE))
return;
int cflags;
{
struct parse pa;
- register struct re_guts *g;
- register struct parse *p = &pa;
- register int i;
- register size_t len;
+ struct re_guts *g;
+ struct parse *p = &pa;
+ int i;
+ size_t len;
#ifdef REDEBUG
#define GOODFLAGS(f) (f)
/*
- p_ere - ERE parser top level, concatenation and alternation
- == static void p_ere(register struct parse *p, int stop);
+ == static void p_ere(struct parse *p, int stop);
*/
static void
p_ere(p, stop)
-register struct parse *p;
+struct parse *p;
int stop; /* character this ERE should end at */
{
- register char c;
- register sopno prevback = 0;
- register sopno prevfwd = 0;
- register sopno conc;
- register int first = 1; /* is this the first alternative? */
+ char c;
+ sopno prevback = 0;
+ sopno prevfwd = 0;
+ sopno conc;
+ int first = 1; /* is this the first alternative? */
for (;;)
{
/*
- p_ere_exp - parse one subERE, an atom possibly followed by a repetition op
- == static void p_ere_exp(register struct parse *p);
+ == static void p_ere_exp(struct parse *p);
*/
static void
p_ere_exp(p)
-register struct parse *p;
+struct parse *p;
{
- register char c;
- register sopno pos;
- register int count;
- register int count2;
- register sopno subno;
+ char c;
+ sopno pos;
+ int count;
+ int count2;
+ sopno subno;
int wascaret = 0;
assert(MORE()); /* caller should have ensured this */
/*
- p_str - string (no metacharacters) "parser"
- == static void p_str(register struct parse *p);
+ == static void p_str(struct parse *p);
*/
static void
p_str(p)
-register struct parse *p;
+struct parse *p;
{
REQUIRE(MORE(), REG_EMPTY);
while (MORE())
/*
- p_bre - BRE parser top level, anchoring and concatenation
- == static void p_bre(register struct parse *p, register int end1, \
- == register int end2);
+ == static void p_bre(struct parse *p, int end1, \
+ == int end2);
* Giving end1 as OUT essentially eliminates the end1/end2 check.
*
* This implementation is a bit of a kludge, in that a trailing $ is first
*/
static void
p_bre(p, end1, end2)
-register struct parse *p;
-register int end1; /* first terminating character */
-register int end2; /* second terminating character */
+struct parse *p;
+int end1; /* first terminating character */
+int end2; /* second terminating character */
{
- register sopno start = HERE();
- register int first = 1; /* first subexpression? */
- register int wasdollar = 0;
+ sopno start = HERE();
+ int first = 1; /* first subexpression? */
+ int wasdollar = 0;
if (EAT('^'))
{
/*
- p_simp_re - parse a simple RE, an atom possibly followed by a repetition
- == static int p_simp_re(register struct parse *p, int starordinary);
+ == static int p_simp_re(struct parse *p, int starordinary);
*/
static int /* was the simple RE an unbackslashed $? */
p_simp_re(p, starordinary)
-register struct parse *p;
+struct parse *p;
int starordinary; /* is a leading * an ordinary character? */
{
- register int c;
- register int count;
- register int count2;
- register sopno pos;
- register int i;
- register sopno subno;
+ int c;
+ int count;
+ int count2;
+ sopno pos;
+ int i;
+ sopno subno;
#define BACKSL (1<<CHAR_BIT)
/*
- p_count - parse a repetition count
- == static int p_count(register struct parse *p);
+ == static int p_count(struct parse *p);
*/
static int /* the value */
p_count(p)
-register struct parse *p;
+struct parse *p;
{
- register int count = 0;
- register int ndigits = 0;
+ int count = 0;
+ int ndigits = 0;
while (MORE() && isdigit(PEEK()) && count <= DUPMAX)
{
/*
- p_bracket - parse a bracketed character list
- == static void p_bracket(register struct parse *p);
+ == static void p_bracket(struct parse *p);
*
* Note a significant property of this code: if the allocset() did SETERROR,
* no set operations are done.
*/
static void
p_bracket(p)
-register struct parse *p;
+struct parse *p;
{
- register cset *cs = allocset(p);
- register int invert = 0;
+ cset *cs = allocset(p);
+ int invert = 0;
/* Dept of Truly Sickening Special-Case Kludges */
if (p->next + 5 < p->end && strncmp(p->next, "[:<:]]", 6) == 0)
if (p->g->cflags & REG_ICASE)
{
- register int i;
- register int ci;
+ int i;
+ int ci;
for (i = p->g->csetsize - 1; i >= 0; i--)
if (CHIN(cs, i) && isalpha(i))
}
if (invert)
{
- register int i;
+ int i;
for (i = p->g->csetsize - 1; i >= 0; i--)
if (CHIN(cs, i))
/*
- p_b_term - parse one term of a bracketed character list
- == static void p_b_term(register struct parse *p, register cset *cs);
+ == static void p_b_term(struct parse *p, cset *cs);
*/
static void
p_b_term(p, cs)
-register struct parse *p;
-register cset *cs;
+struct parse *p;
+cset *cs;
{
- register char c;
- register char start,
+ char c;
+ char start,
finish;
- register int i;
+ int i;
/* classify what we've got */
switch ((MORE()) ? PEEK() : '\0')
/*
- p_b_cclass - parse a character-class name and deal with it
- == static void p_b_cclass(register struct parse *p, register cset *cs);
+ == static void p_b_cclass(struct parse *p, cset *cs);
*/
static void
p_b_cclass(p, cs)
-register struct parse *p;
-register cset *cs;
+struct parse *p;
+cset *cs;
{
- register char *sp = p->next;
- register struct cclass *cp;
- register size_t len;
- register char *u;
- register char c;
+ char *sp = p->next;
+ struct cclass *cp;
+ size_t len;
+ char *u;
+ char c;
while (MORE() && isalpha(PEEK()))
NEXT();
/*
- p_b_eclass - parse an equivalence-class name and deal with it
- == static void p_b_eclass(register struct parse *p, register cset *cs);
+ == static void p_b_eclass(struct parse *p, cset *cs);
*
* This implementation is incomplete. xxx
*/
static void
p_b_eclass(p, cs)
-register struct parse *p;
-register cset *cs;
+struct parse *p;
+cset *cs;
{
- register char c;
+ char c;
c = p_b_coll_elem(p, '=');
CHadd(cs, c);
/*
- p_b_symbol - parse a character or [..]ed multicharacter collating symbol
- == static char p_b_symbol(register struct parse *p);
+ == static char p_b_symbol(struct parse *p);
*/
static char /* value of symbol */
p_b_symbol(p)
-register struct parse *p;
+struct parse *p;
{
- register char value;
+ char value;
REQUIRE(MORE(), REG_EBRACK);
if (!EATTWO('[', '.'))
/*
- p_b_coll_elem - parse a collating-element name and look it up
- == static char p_b_coll_elem(register struct parse *p, int endc);
+ == static char p_b_coll_elem(struct parse *p, int endc);
*/
static char /* value of collating element */
p_b_coll_elem(p, endc)
-register struct parse *p;
+struct parse *p;
int endc; /* name ended by endc,']' */
{
- register char *sp = p->next;
- register struct cname *cp;
- register int len;
+ char *sp = p->next;
+ struct cname *cp;
+ int len;
while (MORE() && !SEETWO(endc, ']'))
NEXT();
/*
- bothcases - emit a dualcase version of a two-case character
- == static void bothcases(register struct parse *p, int ch);
+ == static void bothcases(struct parse *p, int ch);
*
* Boy, is this implementation ever a kludge...
*/
static void
bothcases(p, ch)
-register struct parse *p;
+struct parse *p;
int ch;
{
- register char *oldnext = p->next;
- register char *oldend = p->end;
+ char *oldnext = p->next;
+ char *oldend = p->end;
char bracket[3];
assert(othercase(ch) != ch);/* p_bracket() would recurse */
/*
- ordinary - emit an ordinary character
- == static void ordinary(register struct parse *p, register int ch);
+ == static void ordinary(struct parse *p, int ch);
*/
static void
ordinary(p, ch)
-register struct parse *p;
-register int ch;
+struct parse *p;
+int ch;
{
- register cat_t *cap = p->g->categories;
+ cat_t *cap = p->g->categories;
if ((p->g->cflags & REG_ICASE) && isalpha(ch) && othercase(ch) != ch)
bothcases(p, ch);
/*
- nonnewline - emit REG_NEWLINE version of OANY
- == static void nonnewline(register struct parse *p);
+ == static void nonnewline(struct parse *p);
*
* Boy, is this implementation ever a kludge...
*/
static void
nonnewline(p)
-register struct parse *p;
+struct parse *p;
{
- register char *oldnext = p->next;
- register char *oldend = p->end;
+ char *oldnext = p->next;
+ char *oldend = p->end;
char bracket[4];
p->next = bracket;
/*
- repeat - generate code for a bounded repetition, recursively if needed
- == static void repeat(register struct parse *p, sopno start, int from, int to);
+ == static void repeat(struct parse *p, sopno start, int from, int to);
*/
static void
repeat(p, start, from, to)
-register struct parse *p;
+struct parse *p;
sopno start; /* operand from here to end of strip */
int from; /* repeated from this number */
int to; /* to this number of times (maybe
* INFINITY) */
{
- register sopno finish = HERE();
+ sopno finish = HERE();
#define N 2
#define INF 3
#define REP(f, t) ((f)*8 + (t))
#define MAP(n) (((n) <= 1) ? (n) : ((n) == INFINITY) ? INF : N)
- register sopno copy;
+ sopno copy;
if (p->error != 0) /* head off possible runaway recursion */
return;
/*
- seterr - set an error condition
- == static int seterr(register struct parse *p, int e);
+ == static int seterr(struct parse *p, int e);
*/
static int /* useless but makes type checking happy */
seterr(p, e)
-register struct parse *p;
+struct parse *p;
int e;
{
if (p->error == 0) /* keep earliest error condition */
/*
- allocset - allocate a set of characters for []
- == static cset *allocset(register struct parse *p);
+ == static cset *allocset(struct parse *p);
*/
static cset *
allocset(p)
-register struct parse *p;
+struct parse *p;
{
- register int no = p->g->ncsets++;
- register size_t nc;
- register size_t nbytes;
- register cset *cs;
- register size_t css = (size_t) p->g->csetsize;
- register int i;
+ int no = p->g->ncsets++;
+ size_t nc;
+ size_t nbytes;
+ cset *cs;
+ size_t css = (size_t) p->g->csetsize;
+ int i;
if (no >= p->ncsalloc)
{ /* need another column of space */
/*
- freeset - free a now-unused set
- == static void freeset(register struct parse *p, register cset *cs);
+ == static void freeset(struct parse *p, cset *cs);
*/
static void
freeset(p, cs)
-register struct parse *p;
-register cset *cs;
+struct parse *p;
+cset *cs;
{
- register int i;
- register cset *top = &p->g->sets[p->g->ncsets];
- register size_t css = (size_t) p->g->csetsize;
+ int i;
+ cset *top = &p->g->sets[p->g->ncsets];
+ size_t css = (size_t) p->g->csetsize;
for (i = 0; i < css; i++)
CHsub(cs, i);
/*
- freezeset - final processing on a set of characters
- == static int freezeset(register struct parse *p, register cset *cs);
+ == static int freezeset(struct parse *p, cset *cs);
*
* The main task here is merging identical sets. This is usually a waste
* of time (although the hash code minimizes the overhead), but can win
*/
static int /* set number */
freezeset(p, cs)
-register struct parse *p;
-register cset *cs;
+struct parse *p;
+cset *cs;
{
- register uch h = cs->hash;
- register int i;
- register cset *top = &p->g->sets[p->g->ncsets];
- register cset *cs2;
- register size_t css = (size_t) p->g->csetsize;
+ uch h = cs->hash;
+ int i;
+ cset *top = &p->g->sets[p->g->ncsets];
+ cset *cs2;
+ size_t css = (size_t) p->g->csetsize;
/* look for an earlier one which is the same */
for (cs2 = &p->g->sets[0]; cs2 < top; cs2++)
/*
- firstch - return first character in a set (which must have at least one)
- == static int firstch(register struct parse *p, register cset *cs);
+ == static int firstch(struct parse *p, cset *cs);
*/
static int /* character; there is no "none" value */
firstch(p, cs)
-register struct parse *p;
-register cset *cs;
+struct parse *p;
+cset *cs;
{
- register int i;
- register size_t css = (size_t) p->g->csetsize;
+ int i;
+ size_t css = (size_t) p->g->csetsize;
for (i = 0; i < css; i++)
if (CHIN(cs, i))
/*
- nch - number of characters in a set
- == static int nch(register struct parse *p, register cset *cs);
+ == static int nch(struct parse *p, cset *cs);
*/
static int
nch(p, cs)
-register struct parse *p;
-register cset *cs;
+struct parse *p;
+cset *cs;
{
- register int i;
- register size_t css = (size_t) p->g->csetsize;
- register int n = 0;
+ int i;
+ size_t css = (size_t) p->g->csetsize;
+ int n = 0;
for (i = 0; i < css; i++)
if (CHIN(cs, i))
/*
- mcadd - add a collating element to a cset
- == static void mcadd(register struct parse *p, register cset *cs, \
- == register char *cp);
+ == static void mcadd(struct parse *p, cset *cs, \
+ == char *cp);
*/
static void
mcadd(p, cs, cp)
-register struct parse *p;
-register cset *cs;
-register char *cp;
+struct parse *p;
+cset *cs;
+char *cp;
{
- register size_t oldend = cs->smultis;
+ size_t oldend = cs->smultis;
cs->smultis += strlen(cp) + 1;
if (cs->multis == NULL)
/*
- mcsub - subtract a collating element from a cset
- == static void mcsub(register cset *cs, register char *cp);
+ == static void mcsub(cset *cs, char *cp);
*/
/*
static void
mcsub(cs, cp)
-register cset *cs;
-register char *cp;
+cset *cs;
+char *cp;
{
- register char *fp = mcfind(cs, cp);
- register size_t len = strlen(fp);
+ char *fp = mcfind(cs, cp);
+ size_t len = strlen(fp);
assert(fp != NULL);
memmove(fp, fp + len + 1,
/*
- mcin - is a collating element in a cset?
- == static int mcin(register cset *cs, register char *cp);
+ == static int mcin(cset *cs, char *cp);
*/
/*
static int
mcin(cs, cp)
-register cset *cs;
-register char *cp;
+cset *cs;
+char *cp;
{
return(mcfind(cs, cp) != NULL);
}
/*
- mcfind - find a collating element in a cset
- == static char *mcfind(register cset *cs, register char *cp);
+ == static char *mcfind(cset *cs, char *cp);
*/
/*
static char *
mcfind(cs, cp)
-register cset *cs;
-register char *cp;
+cset *cs;
+char *cp;
{
- register char *p;
+ char *p;
if (cs->multis == NULL)
return(NULL);
*/
/*
- mcinvert - invert the list of collating elements in a cset
- == static void mcinvert(register struct parse *p, register cset *cs);
+ == static void mcinvert(struct parse *p, cset *cs);
*
* This would have to know the set of possibilities. Implementation
* is deferred.
*/
static void
mcinvert(p, cs)
-register struct parse *p;
-register cset *cs;
+struct parse *p;
+cset *cs;
{
assert(cs->multis == NULL); /* xxx */
}
/*
- mccase - add case counterparts of the list of collating elements in a cset
- == static void mccase(register struct parse *p, register cset *cs);
+ == static void mccase(struct parse *p, cset *cs);
*
* This would have to know the set of possibilities. Implementation
* is deferred.
*/
static void
mccase(p, cs)
-register struct parse *p;
-register cset *cs;
+struct parse *p;
+cset *cs;
{
assert(cs->multis == NULL); /* xxx */
}
/*
- isinsets - is this character in any sets?
- == static int isinsets(register struct re_guts *g, int c);
+ == static int isinsets(struct re_guts *g, int c);
*/
static int /* predicate */
isinsets(g, c)
-register struct re_guts *g;
+struct re_guts *g;
int c;
{
- register uch *col;
- register int i;
- register int ncols = (g->ncsets + (CHAR_BIT - 1)) / CHAR_BIT;
- register unsigned uc = (unsigned char) c;
+ uch *col;
+ int i;
+ int ncols = (g->ncsets + (CHAR_BIT - 1)) / CHAR_BIT;
+ unsigned uc = (unsigned char) c;
for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize)
if (col[uc] != 0)
/*
- samesets - are these two characters in exactly the same sets?
- == static int samesets(register struct re_guts *g, int c1, int c2);
+ == static int samesets(struct re_guts *g, int c1, int c2);
*/
static int /* predicate */
samesets(g, c1, c2)
-register struct re_guts *g;
+struct re_guts *g;
int c1;
int c2;
{
- register uch *col;
- register int i;
- register int ncols = (g->ncsets + (CHAR_BIT - 1)) / CHAR_BIT;
- register unsigned uc1 = (unsigned char) c1;
- register unsigned uc2 = (unsigned char) c2;
+ uch *col;
+ int i;
+ int ncols = (g->ncsets + (CHAR_BIT - 1)) / CHAR_BIT;
+ unsigned uc1 = (unsigned char) c1;
+ unsigned uc2 = (unsigned char) c2;
for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize)
if (col[uc1] != col[uc2])
/*
- categorize - sort out character categories
- == static void categorize(struct parse *p, register struct re_guts *g);
+ == static void categorize(struct parse *p, struct re_guts *g);
*/
static void
categorize(p, g)
struct parse *p;
-register struct re_guts *g;
+struct re_guts *g;
{
- register cat_t *cats = g->categories;
- register int c;
- register int c2;
- register cat_t cat;
+ cat_t *cats = g->categories;
+ int c;
+ int c2;
+ cat_t cat;
/* avoid making error situations worse */
if (p->error != 0)
/*
- dupl - emit a duplicate of a bunch of sops
- == static sopno dupl(register struct parse *p, sopno start, sopno finish);
+ == static sopno dupl(struct parse *p, sopno start, sopno finish);
*/
static sopno /* start of duplicate */
dupl(p, start, finish)
-register struct parse *p;
+struct parse *p;
sopno start; /* from here */
sopno finish; /* to this less one */
{
- register sopno ret = HERE();
- register sopno len = finish - start;
+ sopno ret = HERE();
+ sopno len = finish - start;
assert(finish >= start);
if (len == 0)
/*
- doemit - emit a strip operator
- == static void doemit(register struct parse *p, sop op, size_t opnd);
+ == static void doemit(struct parse *p, sop op, size_t opnd);
*
* It might seem better to implement this as a macro with a function as
* hard-case backup, but it's just too big and messy unless there are
*/
static void
doemit(p, op, opnd)
-register struct parse *p;
+struct parse *p;
sop op;
size_t opnd;
{
/*
- doinsert - insert a sop into the strip
- == static void doinsert(register struct parse *p, sop op, size_t opnd, sopno pos);
+ == static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
*/
static void
doinsert(p, op, opnd, pos)
-register struct parse *p;
+struct parse *p;
sop op;
size_t opnd;
sopno pos;
{
- register sopno sn;
- register sop s;
- register int i;
+ sopno sn;
+ sop s;
+ int i;
/* avoid making error situations worse */
if (p->error != 0)
/*
- dofwd - complete a forward reference
- == static void dofwd(register struct parse *p, sopno pos, sop value);
+ == static void dofwd(struct parse *p, sopno pos, sop value);
*/
static void
dofwd(p, pos, value)
-register struct parse *p;
-register sopno pos;
+struct parse *p;
+sopno pos;
sop value;
{
/* avoid making error situations worse */
/*
- enlarge - enlarge the strip
- == static void enlarge(register struct parse *p, sopno size);
+ == static void enlarge(struct parse *p, sopno size);
*/
static void
enlarge(p, size)
-register struct parse *p;
-register sopno size;
+struct parse *p;
+sopno size;
{
- register sop *sp;
+ sop *sp;
if (p->ssize >= size)
return;
/*
- stripsnug - compact the strip
- == static void stripsnug(register struct parse *p, register struct re_guts *g);
+ == static void stripsnug(struct parse *p, struct re_guts *g);
*/
static void
stripsnug(p, g)
-register struct parse *p;
-register struct re_guts *g;
+struct parse *p;
+struct re_guts *g;
{
g->nstates = p->slen;
g->strip = (sop *) realloc((char *) p->strip, p->slen * sizeof(sop));
/*
- findmust - fill in must and mlen with longest mandatory literal string
- == static void findmust(register struct parse *p, register struct re_guts *g);
+ == static void findmust(struct parse *p, struct re_guts *g);
*
* This algorithm could do fancy things like analyzing the operands of |
* for common subsequences. Someday. This code is simple and finds most
static void
findmust(p, g)
struct parse *p;
-register struct re_guts *g;
+struct re_guts *g;
{
- register sop *scan;
+ sop *scan;
sop *start = 0;
- register sop *newstart = 0;
- register sopno newlen;
- register sop s;
- register char *cp;
- register sopno i;
+ sop *newstart = 0;
+ sopno newlen;
+ sop s;
+ char *cp;
+ sopno i;
/* avoid making error situations worse */
if (p->error != 0)
/*
- pluscount - count + nesting
- == static sopno pluscount(register struct parse *p, register struct re_guts *g);
+ == static sopno pluscount(struct parse *p, struct re_guts *g);
*/
static sopno /* nesting depth */
pluscount(p, g)
struct parse *p;
-register struct re_guts *g;
+struct re_guts *g;
{
- register sop *scan;
- register sop s;
- register sopno plusnest = 0;
- register sopno maxnest = 0;
+ sop *scan;
+ sop s;
+ sopno plusnest = 0;
+ sopno maxnest = 0;
if (p->error != 0)
return (0); /* there may not be an OEND */
char *errbuf;
size_t errbuf_size;
{
- register struct rerr *r;
- register size_t len;
- register int target = errcode & ~REG_ITOA;
- register char *s;
+ struct rerr *r;
+ size_t len;
+ int target = errcode & ~REG_ITOA;
+ char *s;
char convbuf[50];
if (errcode == REG_ATOI)
const regex_t *preg;
char *localbuf;
{
- register struct rerr *r;
+ struct rerr *r;
for (r = rerrs; r->code != 0; r++)
if (strcmp(r->name, preg->re_endp) == 0)
regmatch_t pmatch[];
int eflags;
{
- register struct re_guts *g = preg->re_g;
+ struct re_guts *g = preg->re_g;
#ifdef REDEBUG
#define GOODFLAGS(f) (f)
pg95_regfree(preg)
regex_t *preg;
{
- register struct re_guts *g;
+ struct re_guts *g;
if (preg->re_magic != MAGIC1) /* oops */
return; /* nice to complain, but hard */
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.33 1998/02/02 13:16:31 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.34 1998/02/11 19:11:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
void
ResetBufferPool()
{
- register int i;
+ int i;
for (i = 1; i <= NBuffers; i++)
{
int
BufferPoolCheckLeak()
{
- register int i;
+ int i;
int error = 0;
for (i = 1; i <= NBuffers; i++)
void
ReleaseRelationBuffers(Relation rdesc)
{
- register int i;
+ int i;
int holding = 0;
BufferDesc *buf;
void
DropBuffers(Oid dbid)
{
- register int i;
+ int i;
BufferDesc *buf;
SpinAcquire(BufMgrLock);
void
BufferPoolBlowaway()
{
- register int i;
+ int i;
BufferSync();
for (i = 1; i <= NBuffers; i++)
int
BlowawayRelationBuffers(Relation rdesc, BlockNumber block)
{
- register int i;
+ int i;
BufferDesc *buf;
if (rdesc->rd_islocal)
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.13 1998/01/07 21:05:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.14 1998/02/11 19:11:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
OffsetNumber offsetNumber,
ItemIdFlags flags)
{
- register i;
+ int i;
Size alignedSize;
Offset lower;
Offset upper;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.23 1998/01/05 16:39:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.24 1998/02/11 19:12:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
char *
aclitemout(AclItem *aip)
{
- register char *p;
+ char *p;
char *out;
HeapTuple htp;
unsigned i;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.14 1998/01/13 04:04:47 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.15 1998/02/11 19:12:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
* compute the number of page fetches for a given chunk size (d[])
* and access pattern (A[][])
*/
- register int i,
+ int i,
j,
nc;
static int
get_next(int d[], int k, int C, int dmax[])
{
- register int i,
+ int i,
j,
temp;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.22 1998/01/07 18:46:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.23 1998/02/11 19:12:19 momjian Exp $
*
* NOTES
* This code is actually (almost) unused.
#if FALSE
char *timestring;
long quantity;
-register int i;
+int i;
int unitnr;
timestring = (char *) palloc(Max(strlen(INVALID_RELTIME_STR),
} /* isreltime() */
#if FALSE
-register char *p;
-register char c;
+char *p;
+char c;
int i;
char unit[UNITMAXLEN];
char direction[DIRMAXLEN];
AbsoluteTime *i_start,
AbsoluteTime *i_end)
{
- register char *p,
+ char *p,
*p1;
- register char c;
+ char c;
p = i_string;
/* skip leading blanks up to '[' */
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.50 1998/01/07 18:46:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.51 1998/02/11 19:12:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
static datetkn *
datebsearch(char *key, datetkn *base, unsigned int nel)
{
- register datetkn *last = base + nel - 1,
+ datetkn *last = base + nel - 1,
*position;
- register int result;
+ int result;
while (last >= base)
{
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.13 1998/01/07 18:46:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.14 1998/02/11 19:12:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
int16 *
int28in(char *shs)
{
- register int16 (*result)[];
+ int16 (*result)[];
int nums;
if (shs == NULL)
char *
int28out(int16 (*shs)[])
{
- register int num;
- register int16 *sp;
- register char *rp;
+ int num;
+ int16 *sp;
+ char *rp;
char *result;
if (shs == NULL)
int44in(char *input_string)
{
int32 *foo = (int32 *) palloc(4 * sizeof(int32));
- register int i = 0;
+ int i = 0;
i = sscanf(input_string,
"%d, %d, %d, %d",
}
-/* $Revision: 1.10 $
+/* $Revision: 1.11 $
** "like.c" A first attempt at a LIKE operator for Postgres95.
**
** Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
** Match text and p, return LIKE_TRUE, LIKE_FALSE, or LIKE_ABORT.
*/
static int
-DoMatch(register char *text, register char *p)
+DoMatch(char *text, char *p)
{
- register int matched;
+ int matched;
for (; *p; text ++, p++)
{
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.21 1998/01/05 16:40:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.22 1998/02/11 19:12:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#else
auto int expon;
auto int sign;
- register int avail = 0;
- register char *a = NULL;
- register char *p = NULL;
+ int avail = 0;
+ char *a = NULL;
+ char *p = NULL;
char mode;
int lowercase;
int prec;
int
atof1(char *str, double *val)
{
- register char *p;
+ char *p;
double v;
double fact;
int minus;
- register char c;
+ char c;
int expon;
- register int gotmant;
+ int gotmant;
v = 0.0;
p = str;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.13 1998/01/07 18:46:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.14 1998/02/11 19:12:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
Oid *
oid8in(char *oidString)
{
- register Oid (*result)[];
+ Oid (*result)[];
int nums;
if (oidString == NULL)
char *
oid8out(Oid (*oidArray)[])
{
- register int num;
- register Oid *sp;
- register char *rp;
+ int num;
+ Oid *sp;
+ char *rp;
char *result;
if (oidArray == NULL)
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.13 1998/01/31 04:38:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.14 1998/02/11 19:12:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
HeapTuple typetup;
text *result;
ScanKeyData key;
- register int num;
- register Oid *sp;
+ int num;
+ Oid *sp;
if (oidArray == NULL)
{
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.16 1998/02/05 21:19:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.17 1998/02/11 19:12:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
char **high,
char **low)
{
- register Relation rdesc;
- register HeapScanDesc sdesc;
+ Relation rdesc;
+ HeapScanDesc sdesc;
static ScanKeyData key[3] = {
{0, Anum_pg_statistic_starelid, F_OIDEQ, {0, 0, F_OIDEQ}},
{0, Anum_pg_statistic_staattnum, F_INT2EQ, {0, 0, F_INT2EQ}},
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.21 1998/01/15 19:45:28 pgsql Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.22 1998/02/11 19:12:47 momjian Exp $
*
* Notes:
* XXX This needs to use exception.h to handle recovery when
* ----------------
*/
static long
-comphash(long l, register char *v)
+comphash(long l, char *v)
{
long i;
NameData n;
HeapTuple (*iScanfuncP) ())
{
CatCache *cp;
- register int i;
+ int i;
MemoryContext oldcxt;
char *indname;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.13 1998/01/31 04:38:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.14 1998/02/11 19:12:49 momjian Exp $
*
* NOTES
* These routines allow the parser/planner/executor to perform
Datum key3,
Datum key4)
{
- register HeapTuple tp;
+ HeapTuple tp;
if (cacheId < 0 || cacheId >= SysCacheSize)
{
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.25 1998/01/25 05:14:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.26 1998/02/11 19:12:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
va_list ap;
char buf[ELOG_MAXLEN],
line[ELOG_MAXLEN];
- register char *bp;
- register const char *cp;
+ char *bp;
+ const char *cp;
extern int errno,
sys_nerr;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.18 1997/09/08 21:49:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.19 1998/02/11 19:12:52 momjian Exp $
*
* NOTE
* XXX this code needs improvement--check for state violations and
ExcData data,
ExcMessage message)
{
- register ExcFrame *efp;
+ ExcFrame *efp;
efp = ExcCurFrameP;
if (efp == NULL)
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.13 1998/01/31 05:31:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.14 1998/02/11 19:12:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
fmgr(Oid procedureId,...)
{
va_list pvar;
- register i;
+ int i;
int pronargs;
FmgrValues values;
FmgrInfo finfo;
fmgr_ptr(FmgrInfo *finfo, ...)
{
va_list pvar;
- register i;
+ int i;
int n_arguments;
FmgrInfo local_finfo;
FmgrValues values;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.11 1997/09/18 20:22:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.12 1998/02/11 19:13:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
HTAB *
hash_create(int nelem, HASHCTL *info, int flags)
{
- register HHDR *hctl;
+ HHDR *hctl;
HTAB *hashp;
static int
init_htab(HTAB *hashp, int nelem)
{
- register SEG_OFFSET *segp;
- register int nbuckets;
- register int nsegs;
+ SEG_OFFSET *segp;
+ int nbuckets;
+ int nsegs;
int l2;
HHDR *hctl;
if (hashp != NULL)
{
- register SEG_OFFSET segNum;
+ SEG_OFFSET segNum;
SEGMENT segp;
int nsegs = hashp->hctl->nsegs;
int j;
long segment_num;
long segment_ndx;
SEGMENT segp;
- register ELEMENT *curr;
+ ELEMENT *curr;
HHDR *hctl;
BUCKET_INDEX currIndex;
BUCKET_INDEX *prevIndexPtr;
ELEMENT *chain;
BUCKET_INDEX *old,
*newbi;
- register BUCKET_INDEX chainIndex,
+ BUCKET_INDEX chainIndex,
nextIndex;
#ifdef HASH_STATISTICS
static int
dir_realloc(HTAB *hashp)
{
- register char *p;
+ char *p;
char **p_ptr;
long old_dirsize;
long new_dirsize;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.5 1997/09/08 02:31:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.6 1998/02/11 19:13:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
string_hash(char *key, int keysize)
{
int h;
- register unsigned char *k = (unsigned char *) key;
+ unsigned char *k = (unsigned char *) key;
h = 0;
long
tag_hash(int *key, int keysize)
{
- register long h = 0;
+ long h = 0;
/*
* Convert tag to integer; Use four byte chunks in a "jump table" to
long
disk_hash(char *key)
{
- register int n = 0;
- register char *str = key;
- register int len = strlen(key);
- register int loop;
+ int n = 0;
+ char *str = key;
+ int len = strlen(key);
+ int loop;
#define HASHC n = *str++ + 65599 * n
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.6 1997/09/08 21:49:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.7 1998/02/11 19:13:17 momjian Exp $
*
* NOTE
* XXX This is a preliminary implementation which lacks fail-fast
Pointer
OrderedSetGetHead(OrderedSet set)
{
- register OrderedElem elem;
+ OrderedElem elem;
elem = set->head;
if (elem->next)
Pointer
OrderedSetGetTail(OrderedSet set)
{
- register OrderedElem elem;
+ OrderedElem elem;
elem = set->tail;
if (elem->prev)
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.11 1998/01/31 04:39:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.12 1998/02/11 19:13:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
struct leftist *
lmerge(struct leftist * pt, struct leftist * qt, LeftistContext context)
{
- register struct leftist *root,
+ struct leftist *root,
*majorLeftist,
*minorLeftist;
int dist;
static struct leftist *
linsert(struct leftist * root, struct leftist * new1, LeftistContext context)
{
- register struct leftist *left,
+ struct leftist *left,
*right;
if (!tuplecmp(root->lt_tuple, new1->lt_tuple, context))
short *devnum, /* device from which tuple came */
LeftistContext context)
{
- register struct leftist *tp;
+ struct leftist *tp;
HeapTuple tup;
tp = *treep;
short devnum,
LeftistContext context)
{
- register struct leftist *new1;
- register struct leftist *tp;
+ struct leftist *new1;
+ struct leftist *tp;
new1 = (struct leftist *) palloc((unsigned) sizeof(struct leftist));
new1->lt_dist = 1;
int
tuplecmp(HeapTuple ltup, HeapTuple rtup, LeftistContext context)
{
- register Datum lattr,
+ Datum lattr,
rattr;
int nkey = 0;
int result = 0;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.36 1998/02/01 22:20:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.37 1998/02/11 19:13:47 momjian Exp $
*
* NOTES
* Sorts the first relation into the second relation.
static void
inittapes(Sort * node)
{
- register int i;
- register struct tape *tp;
+ int i;
+ struct tape *tp;
Assert(node != (Sort *) NULL);
Assert(PS(node) != (Psortstate *) NULL);
static void
initialrun(Sort * node)
{
- /* register struct tuple *tup; */
- register struct tape *tp;
+ /* struct tuple *tup; */
+ struct tape *tp;
int baseruns; /* D:(a) */
int extrapasses; /* EOF */
if ( LACKMEM (node) ) /* in-memory sort is impossible */
{
- register int t;
+ int t;
Assert (!foundeor);
inittapes(node);
static bool
createrun(Sort * node, FILE * file)
{
- register HeapTuple lasttuple;
- register HeapTuple tup;
+ HeapTuple lasttuple;
+ HeapTuple tup;
TupleTableSlot *cr_slot;
HeapTuple *memtuples;
int t_last = -1;
/* put tuples for the next run into leftist tree */
if ( t_last >= 1 )
{
- register int t;
+ int t;
PsortTupDesc = PS(node)->treeContext.tupDesc;
PsortKeys = PS(node)->treeContext.scanKeys;
static FILE *
mergeruns(Sort * node)
{
- register struct tape *tp;
+ struct tape *tp;
Assert(node != (Sort *) NULL);
Assert(PS(node) != (Psortstate *) NULL);
static void
merge(Sort * node, struct tape * dest)
{
- register HeapTuple tup;
- register struct tape *lasttp; /* (TAPE[P]) */
- register struct tape *tp;
+ HeapTuple tup;
+ struct tape *lasttp; /* (TAPE[P]) */
+ struct tape *tp;
struct leftist *tuples;
FILE *destfile;
int times; /* runs left to merge */
static void
dumptuples(FILE * file, Sort * node)
{
- register struct leftist *tp;
- register struct leftist *newp;
+ struct leftist *tp;
+ struct leftist *newp;
struct leftist **treep = &PS(node)->Tuples;
LeftistContext context = &PS(node)->treeContext;
HeapTuple tup;
HeapTuple
psort_grabtuple(Sort * node, bool * should_free)
{
- register HeapTuple tup;
+ HeapTuple tup;
Assert(node != (Sort *) NULL);
Assert(PS(node) != (Psortstate *) NULL);
void
psort_end(Sort * node)
{
- register struct tape *tp;
+ struct tape *tp;
if (!node->cleaned)
{
static FILE *
gettape()
{
- register struct tapelst *tp;
+ struct tapelst *tp;
FILE *file;
static int tapeinit = 0;
char *mktemp();
static void
resettape(FILE * file)
{
- register struct tapelst *tp;
- register int fd;
+ struct tapelst *tp;
+ int fd;
Assert(PointerIsValid(file));
static void
destroytape(FILE * file)
{
- register struct tapelst *tp,
+ struct tapelst *tp,
*tq;
- register int fd;
+ int fd;
if ((tp = Tapes) == NULL)
elog(FATAL, "destroytape: tape not found");
static int
_psort_cmp (HeapTuple *ltup, HeapTuple *rtup)
{
- register Datum lattr, rattr;
+ Datum lattr, rattr;
int nkey;
int result = 0;
bool isnull1, isnull2;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.19 1997/11/21 19:12:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.20 1998/02/11 19:13:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
static inline char *
translate_escape(char *p, int isArray)
{
- register char c,
+ char c,
*q,
*s;
{
int literal,
last;
- register char *p;
+ char *p;
if (!value)
{
/*
- * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.21 1998/01/07 18:47:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.22 1998/02/11 19:14:04 momjian Exp $
*/
#include <float.h> /* faked on sunos */
reverse_c16(string)
char *string;
{
- register i;
+ int i;
int len;
char *new_string;
projects / postgresql / commitdiff