Skip to content

Commit 24cab6b

Browse files
bmomjianbmomjian
committed
Goodbye register keyword. Compiler knows better.
1 parent df10360 commit 24cab6b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+494
-500
lines changed

‎src/backend/access/common/heaptuple.c

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.35 1998/02/06 20:17:49 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.36 1998/02/11 19:09:21 momjian Exp $
1212
*
1313
* NOTES
1414
* The old interface functions have been converted to macros
@@ -44,12 +44,6 @@ long heap_sysoffset[] = {
4444
offsetof(HeapTupleData, t_cmax)
4545
};
4646

47-
/* this is so the sparcstation debugger works */
48-
49-
#if !defined(NO_ASSERT_CHECKING) && defined(sparc) && defined(sunos4)
50-
#define register
51-
#endif /* !NO_ASSERT_CHECKING && sparc && sunos4 */
52-
5347
/* ----------------------------------------------------------------
5448
* misc support routines
5549
* ----------------------------------------------------------------
@@ -476,10 +470,10 @@ nocachegetattr(HeapTuple tup,
476470
* ----------------
477471
*/
478472
{
479-
register int i = 0; /* current offset in bp */
480-
register int mask; /* bit in byte we're looking at */
481-
register char n; /* current byte in bp */
482-
register int byte,
473+
int i = 0; /* current offset in bp */
474+
int mask; /* bit in byte we're looking at */
475+
char n; /* current byte in bp */
476+
int byte,
483477
finalbit;
484478

485479
byte = attnum >> 3;
@@ -523,7 +517,7 @@ nocachegetattr(HeapTuple tup,
523517
}
524518
else if (!HeapTupleAllFixed(tup))
525519
{
526-
register int j = 0;
520+
int j = 0;
527521

528522
/*
529523
* In for(), we make this <= and not < because we want to
@@ -542,8 +536,8 @@ nocachegetattr(HeapTuple tup,
542536
*/
543537
if (!slow)
544538
{
545-
register int j = 1;
546-
register long off;
539+
int j = 1;
540+
long off;
547541

548542
/*
549543
* need to set cache for some atts
@@ -624,9 +618,9 @@ nocachegetattr(HeapTuple tup,
624618
}
625619
else
626620
{
627-
register bool usecache = true;
628-
register int off = 0;
629-
register int i;
621+
bool usecache = true;
622+
int off = 0;
623+
int i;
630624

631625
/*
632626
* Now we know that we have to walk the tuple CAREFULLY.
@@ -999,7 +993,7 @@ heap_addheader(uint32 natts, /* max domain index */
999993
int structlen, /* its length */
1000994
char *structure) /* pointer to the struct */
1001995
{
1002-
register char *tp; /* tuple data pointer */
996+
char *tp; /* tuple data pointer */
1003997
HeapTuple tup;
1004998
long len;
1005999
int hoff;

‎src/backend/access/common/indextuple.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.26 1998/02/06 20:17:51 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.27 1998/02/11 19:09:23 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -41,7 +41,7 @@ index_formtuple(TupleDesc tupleDescriptor,
4141
Datum value[],
4242
char null[])
4343
{
44-
register char *tp; /* tuple pointer */
44+
char *tp; /* tuple pointer */
4545
IndexTuple tuple; /* return tuple */
4646
Size size,
4747
hoff;
@@ -137,10 +137,10 @@ nocache_index_getattr(IndexTuple tup,
137137
TupleDesc tupleDesc,
138138
bool *isnull)
139139
{
140-
register char *tp; /* ptr to att in tuple */
141-
register char *bp = NULL; /* ptr to att in tuple */
140+
char *tp; /* ptr to att in tuple */
141+
char *bp = NULL; /* ptr to att in tuple */
142142
int slow; /* do we have to walk nulls? */
143-
register int data_off; /* tuple data offset */
143+
int data_off; /* tuple data offset */
144144
AttributeTupleForm *att = tupleDesc->attrs;
145145

146146
/* ----------------
@@ -219,10 +219,10 @@ nocache_index_getattr(IndexTuple tup,
219219
* ----------------
220220
*/
221221
{
222-
register int i = 0; /* current offset in bp */
223-
register int mask; /* bit in byte we're looking at */
224-
register char n; /* current byte in bp */
225-
register int byte,
222+
int i = 0; /* current offset in bp */
223+
int mask; /* bit in byte we're looking at */
224+
char n; /* current byte in bp */
225+
int byte,
226226
finalbit;
227227

228228
byte = attnum >> 3;
@@ -265,7 +265,7 @@ nocache_index_getattr(IndexTuple tup,
265265
}
266266
else if (!IndexTupleAllFixed(tup))
267267
{
268-
register int j = 0;
268+
int j = 0;
269269

270270
for (j = 0; j < attnum && !slow; j++)
271271
if (att[j]->attlen < 1 && !VARLENA_FIXED_SIZE(att[j]))
@@ -281,8 +281,8 @@ nocache_index_getattr(IndexTuple tup,
281281

282282
if (!slow)
283283
{
284-
register int j = 1;
285-
register long off;
284+
int j = 1;
285+
long off;
286286

287287
/*
288288
* need to set cache for some atts
@@ -346,9 +346,9 @@ nocache_index_getattr(IndexTuple tup,
346346
}
347347
else
348348
{
349-
register bool usecache = true;
350-
register int off = 0;
351-
register int i;
349+
bool usecache = true;
350+
int off = 0;
351+
int i;
352352

353353
/*
354354
* Now we know that we have to walk the tuple CAREFULLY.

‎src/backend/access/common/printtup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.25 1998/02/10 16:02:44 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.26 1998/02/11 19:09:25 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -176,7 +176,7 @@ showatts(char *name, TupleDesc tupleDesc)
176176
void
177177
debugtup(HeapTuple tuple, TupleDesc typeinfo)
178178
{
179-
register int i;
179+
int i;
180180
Datum attr;
181181
char *value;
182182
bool isnull;

‎src/backend/access/heap/heapam.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.25 1998/01/07 21:01:20 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.26 1998/02/11 19:09:30 momjian Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -791,7 +791,7 @@ heap_getnext(HeapScanDesc scandesc,
791791
int backw,
792792
Buffer *b)
793793
{
794-
register HeapScanDesc sdesc = scandesc;
794+
HeapScanDesc sdesc = scandesc;
795795
Buffer localb;
796796

797797
/* ----------------

‎src/backend/bootstrap/bootstrap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.35 1998/02/07 06:10:34 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.36 1998/02/11 19:09:34 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -979,7 +979,7 @@ LexIDStr(int ident_num)
979979
static int
980980
CompHash(char *str, int len)
981981
{
982-
register int result;
982+
int result;
983983

984984
result = (NUM * str[0] + NUMSQR * str[len - 1] + NUMCUBE * str[(len - 1) / 2]);
985985

‎src/backend/catalog/aclchk.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.4 1998/01/31 04:38:11 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.5 1998/02/11 19:09:42 momjian Exp $
1111
*
1212
* NOTES
1313
* See acl.h.
@@ -74,7 +74,7 @@ char *aclcheck_error_strings[] = {
7474
static
7575
dumpacl(Acl *acl)
7676
{
77-
register unsigned i;
77+
unsigned i;
7878
AclItem *aip;
7979

8080
elog(DEBUG, "acl size = %d, # acls = %d",
@@ -94,7 +94,7 @@ ChangeAcl(char *relname,
9494
AclItem *mod_aip,
9595
unsigned modechg)
9696
{
97-
register unsigned i;
97+
unsigned i;
9898
Acl *old_acl = (Acl *) NULL,
9999
*new_acl;
100100
Relation relation;
@@ -283,8 +283,8 @@ in_group(AclId uid, AclId gid)
283283
static int32
284284
aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode)
285285
{
286-
register unsigned i;
287-
register AclItem *aip,
286+
unsigned i;
287+
AclItem *aip,
288288
*aidat;
289289
unsigned num,
290290
found_group;

‎src/backend/catalog/catalog.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.13 1998/01/16 23:19:23 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.14 1998/02/11 19:09:47 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -155,7 +155,7 @@ void
155155
fillatt(TupleDesc tupleDesc)
156156
{
157157
AttributeTupleForm *attributeP;
158-
register TypeTupleForm typp;
158+
TypeTupleForm typp;
159159
HeapTuple tuple;
160160
int i;
161161
int natts = tupleDesc->natts;

‎src/backend/catalog/heap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.45 1998/02/07 06:10:39 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.46 1998/02/11 19:09:54 momjian Exp $
1111
*
1212
* INTERFACE ROUTINES
1313
* heap_create() - Create an uncataloged heap relation
@@ -171,7 +171,7 @@ Relation
171171
heap_create(char *name,
172172
TupleDesc tupDesc)
173173
{
174-
register unsigned i;
174+
unsigned i;
175175
Oid relid;
176176
Relation rdesc;
177177
int len;

‎src/backend/catalog/pg_aggregate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.11 1998/01/06 19:42:30 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.12 1998/02/11 19:10:03 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -64,7 +64,7 @@ AggregateCreate(char *aggName,
6464
char *agginitval1,
6565
char *agginitval2)
6666
{
67-
register i;
67+
int i;
6868
Relation aggdesc;
6969
HeapTuple tup;
7070
char nulls[Natts_pg_aggregate];

‎src/backend/catalog/pg_operator.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.20 1998/01/15 19:42:30 pgsql Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.21 1998/02/11 19:10:11 momjian Exp $
1111
*
1212
* NOTES
1313
* these routines moved here from commands/define.c and somewhat cleaned up.
@@ -224,7 +224,7 @@ OperatorShellMakeWithOpenRelation(Relation pg_operator_desc,
224224
Oid leftObjectId,
225225
Oid rightObjectId)
226226
{
227-
register int i;
227+
int i;
228228
HeapTuple tup;
229229
Datum values[Natts_pg_operator];
230230
char nulls[Natts_pg_operator];
@@ -452,7 +452,7 @@ OperatorDef(char *operatorName,
452452
char *leftSortName,
453453
char *rightSortName)
454454
{
455-
register i,
455+
int i,
456456
j;
457457
Relation pg_operator_desc;
458458

@@ -767,7 +767,7 @@ OperatorDef(char *operatorName,
767767
static void
768768
OperatorUpd(Oid baseId, Oid commId, Oid negId)
769769
{
770-
register i;
770+
int i;
771771
Relation pg_operator_desc;
772772
HeapScanDesc pg_operator_scan;
773773
HeapTuple tup;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy