aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/adt/acl.c4
-rw-r--r--src/backend/utils/adt/chunk.c6
-rw-r--r--src/backend/utils/adt/date.c12
-rw-r--r--src/backend/utils/adt/dt.c6
-rw-r--r--src/backend/utils/adt/int.c12
-rw-r--r--src/backend/utils/adt/like.c6
-rw-r--r--src/backend/utils/adt/numutils.c14
-rw-r--r--src/backend/utils/adt/oid.c10
-rw-r--r--src/backend/utils/adt/regproc.c6
-rw-r--r--src/backend/utils/adt/selfuncs.c6
-rw-r--r--src/backend/utils/cache/catcache.c6
-rw-r--r--src/backend/utils/cache/syscache.c4
-rw-r--r--src/backend/utils/error/elog.c6
-rw-r--r--src/backend/utils/error/exc.c4
-rw-r--r--src/backend/utils/fmgr/fmgr.c6
-rw-r--r--src/backend/utils/hash/dynahash.c18
-rw-r--r--src/backend/utils/hash/hashfn.c14
-rw-r--r--src/backend/utils/mmgr/oset.c6
-rw-r--r--src/backend/utils/sort/lselect.c14
-rw-r--r--src/backend/utils/sort/psort.c46
20 files changed, 103 insertions, 103 deletions
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 0e4c8eea157..5ca72ed0174 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -7,7 +7,7 @@
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
@@ -242,7 +242,7 @@ aclitemin(char *s)
char *
aclitemout(AclItem *aip)
{
- register char *p;
+ char *p;
char *out;
HeapTuple htp;
unsigned i;
diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c
index b75317fcfc3..9f38f5caadb 100644
--- a/src/backend/utils/adt/chunk.c
+++ b/src/backend/utils/adt/chunk.c
@@ -6,7 +6,7 @@
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
@@ -191,7 +191,7 @@ _FindBestChunk(int size,
* compute the number of page fetches for a given chunk size (d[])
* and access pattern (A[][])
*/
- register int i,
+ int i,
j,
nc;
@@ -224,7 +224,7 @@ _FindBestChunk(int size,
static int
get_next(int d[], int k, int C, int dmax[])
{
- register int i,
+ int i,
j,
temp;
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 4959ea4e727..e3dadad0f94 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -9,7 +9,7 @@
*
*
* 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.
@@ -206,7 +206,7 @@ reltime2tm(int32 time, struct tm * tm)
#if FALSE
char *timestring;
long quantity;
-register int i;
+int i;
int unitnr;
timestring = (char *) palloc(Max(strlen(INVALID_RELTIME_STR),
@@ -966,8 +966,8 @@ isreltime(char *str)
} /* isreltime() */
#if FALSE
-register char *p;
-register char c;
+char *p;
+char c;
int i;
char unit[UNITMAXLEN];
char direction[DIRMAXLEN];
@@ -1156,9 +1156,9 @@ istinterval(char *i_string,
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 '[' */
diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c
index 6265d084907..b80d08ea9a7 100644
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
@@ -7,7 +7,7 @@
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
@@ -4015,9 +4015,9 @@ DecodeUnits(int field, char *lowtoken, int *val)
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)
{
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 43d0d372be7..e7767e4cdbd 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -7,7 +7,7 @@
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
@@ -80,7 +80,7 @@ int2out(int16 sh)
int16 *
int28in(char *shs)
{
- register int16 (*result)[];
+ int16 (*result)[];
int nums;
if (shs == NULL)
@@ -109,9 +109,9 @@ int28in(char *shs)
char *
int28out(int16 (*shs)[])
{
- register int num;
- register int16 *sp;
- register char *rp;
+ int num;
+ int16 *sp;
+ char *rp;
char *result;
if (shs == NULL)
@@ -145,7 +145,7 @@ int32 *
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",
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 7886354e908..35446cd7da7 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -150,7 +150,7 @@ textnlike(struct varlena * s, struct varlena * p)
}
-/* $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.
@@ -185,9 +185,9 @@ textnlike(struct varlena * s, struct varlena * p)
** 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++)
{
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index ca17d7dc302..f3c9fb07adc 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,7 +10,7 @@
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
@@ -184,9 +184,9 @@ ftoa(double value, char *ascii, int width, int prec1, char format)
#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;
@@ -370,13 +370,13 @@ frac_out:
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;
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index 27f4a838856..c7224a04e18 100644
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -7,7 +7,7 @@
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
@@ -31,7 +31,7 @@
Oid *
oid8in(char *oidString)
{
- register Oid (*result)[];
+ Oid (*result)[];
int nums;
if (oidString == NULL)
@@ -60,9 +60,9 @@ oid8in(char *oidString)
char *
oid8out(Oid (*oidArray)[])
{
- register int num;
- register Oid *sp;
- register char *rp;
+ int num;
+ Oid *sp;
+ char *rp;
char *result;
if (oidArray == NULL)
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index b0b3f462e70..10b64a16b19 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -7,7 +7,7 @@
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
@@ -160,8 +160,8 @@ oid8types(Oid (*oidArray)[])
HeapTuple typetup;
text *result;
ScanKeyData key;
- register int num;
- register Oid *sp;
+ int num;
+ Oid *sp;
if (oidArray == NULL)
{
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index f647e8c85fb..94d31aa95a6 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -12,7 +12,7 @@
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
@@ -334,8 +334,8 @@ gethilokey(Oid relid,
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}},
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 89c3446cfbc..616d875dc3f 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -7,7 +7,7 @@
*
*
* 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
@@ -287,7 +287,7 @@ CatalogCacheSetId(CatCache *cacheInOutP, int id)
* ----------------
*/
static long
-comphash(long l, register char *v)
+comphash(long l, char *v)
{
long i;
NameData n;
@@ -654,7 +654,7 @@ InitSysCache(char *relname,
HeapTuple (*iScanfuncP) ())
{
CatCache *cp;
- register int i;
+ int i;
MemoryContext oldcxt;
char *indname;
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 3d80da1659b..e1b01f735bd 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -7,7 +7,7 @@
*
*
* 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
@@ -398,7 +398,7 @@ SearchSysCacheTuple(int cacheId, /* cache selection code */
Datum key3,
Datum key4)
{
- register HeapTuple tp;
+ HeapTuple tp;
if (cacheId < 0 || cacheId >= SysCacheSize)
{
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 8bf6ca03e61..36855ce6eb6 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -7,7 +7,7 @@
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
@@ -45,8 +45,8 @@ elog(int lev, const char *fmt,...)
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;
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 8a899354308..0851a92a5d7 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -7,7 +7,7 @@
*
*
* 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
@@ -179,7 +179,7 @@ ExcRaise(Exception *excP,
ExcData data,
ExcMessage message)
{
- register ExcFrame *efp;
+ ExcFrame *efp;
efp = ExcCurFrameP;
if (efp == NULL)
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index 878651b4fe0..0eb45503bb9 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -7,7 +7,7 @@
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
@@ -261,7 +261,7 @@ char *
fmgr(Oid procedureId,...)
{
va_list pvar;
- register i;
+ int i;
int pronargs;
FmgrValues values;
FmgrInfo finfo;
@@ -299,7 +299,7 @@ char *
fmgr_ptr(FmgrInfo *finfo, ...)
{
va_list pvar;
- register i;
+ int i;
int n_arguments;
FmgrInfo local_finfo;
FmgrValues values;
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index b1c6fa4f444..9a722a004c4 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -7,7 +7,7 @@
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
@@ -157,7 +157,7 @@ static long hash_accesses,
HTAB *
hash_create(int nelem, HASHCTL *info, int flags)
{
- register HHDR *hctl;
+ HHDR *hctl;
HTAB *hashp;
@@ -302,9 +302,9 @@ hdefault(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;
@@ -387,7 +387,7 @@ hash_destroy(HTAB *hashp)
if (hashp != NULL)
{
- register SEG_OFFSET segNum;
+ SEG_OFFSET segNum;
SEGMENT segp;
int nsegs = hashp->hctl->nsegs;
int j;
@@ -480,7 +480,7 @@ hash_search(HTAB *hashp,
long segment_num;
long segment_ndx;
SEGMENT segp;
- register ELEMENT *curr;
+ ELEMENT *curr;
HHDR *hctl;
BUCKET_INDEX currIndex;
BUCKET_INDEX *prevIndexPtr;
@@ -735,7 +735,7 @@ expand_table(HTAB *hashp)
ELEMENT *chain;
BUCKET_INDEX *old,
*newbi;
- register BUCKET_INDEX chainIndex,
+ BUCKET_INDEX chainIndex,
nextIndex;
#ifdef HASH_STATISTICS
@@ -811,7 +811,7 @@ expand_table(HTAB *hashp)
static int
dir_realloc(HTAB *hashp)
{
- register char *p;
+ char *p;
char **p_ptr;
long old_dirsize;
long new_dirsize;
diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c
index a0439fb0baa..609ca80d813 100644
--- a/src/backend/utils/hash/hashfn.c
+++ b/src/backend/utils/hash/hashfn.c
@@ -7,7 +7,7 @@
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
@@ -25,7 +25,7 @@ long
string_hash(char *key, int keysize)
{
int h;
- register unsigned char *k = (unsigned char *) key;
+ unsigned char *k = (unsigned char *) key;
h = 0;
@@ -43,7 +43,7 @@ string_hash(char *key, int keysize)
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
@@ -130,10 +130,10 @@ tag_hash(int *key, int keysize)
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
diff --git a/src/backend/utils/mmgr/oset.c b/src/backend/utils/mmgr/oset.c
index cca16b7457a..4c76d73d36a 100644
--- a/src/backend/utils/mmgr/oset.c
+++ b/src/backend/utils/mmgr/oset.c
@@ -7,7 +7,7 @@
*
*
* 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
@@ -64,7 +64,7 @@ OrderedSetContains(OrderedSet set, OrderedElem elem)
Pointer
OrderedSetGetHead(OrderedSet set)
{
- register OrderedElem elem;
+ OrderedElem elem;
elem = set->head;
if (elem->next)
@@ -81,7 +81,7 @@ OrderedSetGetHead(OrderedSet set)
Pointer
OrderedSetGetTail(OrderedSet set)
{
- register OrderedElem elem;
+ OrderedElem elem;
elem = set->tail;
if (elem->prev)
diff --git a/src/backend/utils/sort/lselect.c b/src/backend/utils/sort/lselect.c
index 28e18fd05d3..80b9fce42a5 100644
--- a/src/backend/utils/sort/lselect.c
+++ b/src/backend/utils/sort/lselect.c
@@ -8,7 +8,7 @@
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
@@ -37,7 +37,7 @@
struct leftist *
lmerge(struct leftist * pt, struct leftist * qt, LeftistContext context)
{
- register struct leftist *root,
+ struct leftist *root,
*majorLeftist,
*minorLeftist;
int dist;
@@ -76,7 +76,7 @@ lmerge(struct leftist * pt, struct leftist * qt, LeftistContext context)
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))
@@ -129,7 +129,7 @@ gettuple(struct leftist ** treep,
short *devnum, /* device from which tuple came */
LeftistContext context)
{
- register struct leftist *tp;
+ struct leftist *tp;
HeapTuple tup;
tp = *treep;
@@ -159,8 +159,8 @@ puttuple(struct leftist ** 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;
@@ -186,7 +186,7 @@ puttuple(struct leftist ** treep,
int
tuplecmp(HeapTuple ltup, HeapTuple rtup, LeftistContext context)
{
- register Datum lattr,
+ Datum lattr,
rattr;
int nkey = 0;
int result = 0;
diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c
index 4fa99d09e50..2c9b3213632 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -7,7 +7,7 @@
*
*
* 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.
@@ -175,8 +175,8 @@ psort_begin(Sort * node, int nkeys, ScanKey key)
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);
@@ -276,8 +276,8 @@ inittapes(Sort * node)
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 */
@@ -433,7 +433,7 @@ createfirstrun(Sort *node)
if ( LACKMEM (node) ) /* in-memory sort is impossible */
{
- register int t;
+ int t;
Assert (!foundeor);
inittapes(node);
@@ -466,8 +466,8 @@ createfirstrun(Sort *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;
@@ -554,7 +554,7 @@ createrun(Sort * node, FILE * file)
/* 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;
@@ -600,7 +600,7 @@ tuplecopy(HeapTuple tup)
static FILE *
mergeruns(Sort * node)
{
- register struct tape *tp;
+ struct tape *tp;
Assert(node != (Sort *) NULL);
Assert(PS(node) != (Psortstate *) NULL);
@@ -627,9 +627,9 @@ mergeruns(Sort * node)
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 */
@@ -734,8 +734,8 @@ merge(Sort * node, struct tape * dest)
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;
@@ -769,7 +769,7 @@ dumptuples(FILE * file, Sort * node)
HeapTuple
psort_grabtuple(Sort * node, bool * should_free)
{
- register HeapTuple tup;
+ HeapTuple tup;
Assert(node != (Sort *) NULL);
Assert(PS(node) != (Psortstate *) NULL);
@@ -920,7 +920,7 @@ psort_restorepos(Sort * node)
void
psort_end(Sort * node)
{
- register struct tape *tp;
+ struct tape *tp;
if (!node->cleaned)
{
@@ -978,7 +978,7 @@ static struct tapelst *Tapes = NULL;
static FILE *
gettape()
{
- register struct tapelst *tp;
+ struct tapelst *tp;
FILE *file;
static int tapeinit = 0;
char *mktemp();
@@ -1020,8 +1020,8 @@ gettape()
static void
resettape(FILE * file)
{
- register struct tapelst *tp;
- register int fd;
+ struct tapelst *tp;
+ int fd;
Assert(PointerIsValid(file));
@@ -1052,9 +1052,9 @@ resettape(FILE * 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");
@@ -1089,7 +1089,7 @@ destroytape(FILE * file)
static int
_psort_cmp (HeapTuple *ltup, HeapTuple *rtup)
{
- register Datum lattr, rattr;
+ Datum lattr, rattr;
int nkey;
int result = 0;
bool isnull1, isnull2;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 14:26:56 +0000