Skip to content

Commit de160e2

Browse files
peterepetere
committed
Make backend header files C++ safe
This alters various incidental uses of C++ key words to use other similar identifiers, so that a C++ compiler won't choke outright. You still (probably) need extern "C" { }; around the inclusion of backend headers. based on a patch by Kurt Harriman <harriman@acm.org> Also add a script cpluspluscheck to check for C++ compatibility in the future. As of right now, this passes without error for me.
1 parent 4ef8dc7 commit de160e2

Some content is hidden

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

52 files changed

+392
-359
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/common/tupdesc.c,v 1.126 2009/06/11 14:48:53 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/common/tupdesc.c,v 1.127 2009/07/16 06:33:42 petere Exp $
1212
*
1313
* NOTES
1414
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -538,10 +538,10 @@ BuildDescForRelation(List *schema)
538538
attnum++;
539539

540540
attname = entry->colname;
541-
atttypid = typenameTypeId(NULL, entry->typename, &atttypmod);
542-
attdim = list_length(entry->typename->arrayBounds);
541+
atttypid = typenameTypeId(NULL, entry->typeName, &atttypmod);
542+
attdim = list_length(entry->typeName->arrayBounds);
543543

544-
if (entry->typename->setof)
544+
if (entry->typeName->setof)
545545
ereport(ERROR,
546546
(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
547547
errmsg("column \"%s\" cannot be declared SETOF",

‎src/backend/catalog/pg_constraint.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/pg_constraint.c,v 1.45 2009/06/11 14:48:55 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/pg_constraint.c,v 1.46 2009/07/16 06:33:42 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -419,7 +419,7 @@ ConstraintNameIsUsed(ConstraintCategory conCat, Oid objId,
419419
*/
420420
char *
421421
ChooseConstraintName(const char *name1, const char *name2,
422-
const char *label, Oid namespace,
422+
const char *label, Oid namespaceid,
423423
List *others)
424424
{
425425
int pass = 0;
@@ -461,7 +461,7 @@ ChooseConstraintName(const char *name1, const char *name2,
461461
ScanKeyInit(&skey[1],
462462
Anum_pg_constraint_connamespace,
463463
BTEqualStrategyNumber, F_OIDEQ,
464-
ObjectIdGetDatum(namespace));
464+
ObjectIdGetDatum(namespaceid));
465465

466466
conscan = systable_beginscan(conDesc, ConstraintNameNspIndexId, true,
467467
SnapshotNow, 2, skey);

‎src/backend/commands/indexcmds.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.185 2009/06/11 14:48:55 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.186 2009/07/16 06:33:42 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1237,7 +1237,7 @@ makeObjectName(const char *name1, const char *name2, const char *label)
12371237
*/
12381238
char *
12391239
ChooseRelationName(const char *name1, const char *name2,
1240-
const char *label, Oid namespace)
1240+
const char *label, Oid namespaceid)
12411241
{
12421242
int pass = 0;
12431243
char *relname = NULL;
@@ -1250,7 +1250,7 @@ ChooseRelationName(const char *name1, const char *name2,
12501250
{
12511251
relname = makeObjectName(name1, name2, modlabel);
12521252

1253-
if (!OidIsValid(get_relname_relid(relname, namespace)))
1253+
if (!OidIsValid(get_relname_relid(relname, namespaceid)))
12541254
break;
12551255

12561256
/* found a conflict, so try a new name component */

‎src/backend/commands/sequence.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.160 2009/06/11 14:48:56 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.161 2009/07/16 06:33:42 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -141,53 +141,53 @@ DefineSequence(CreateSeqStmt *seq)
141141
switch (i)
142142
{
143143
case SEQ_COL_NAME:
144-
coldef->typename = makeTypeNameFromOid(NAMEOID, -1);
144+
coldef->typeName = makeTypeNameFromOid(NAMEOID, -1);
145145
coldef->colname = "sequence_name";
146146
namestrcpy(&name, seq->sequence->relname);
147147
value[i - 1] = NameGetDatum(&name);
148148
break;
149149
case SEQ_COL_LASTVAL:
150-
coldef->typename = makeTypeNameFromOid(INT8OID, -1);
150+
coldef->typeName = makeTypeNameFromOid(INT8OID, -1);
151151
coldef->colname = "last_value";
152152
value[i - 1] = Int64GetDatumFast(new.last_value);
153153
break;
154154
case SEQ_COL_STARTVAL:
155-
coldef->typename = makeTypeNameFromOid(INT8OID, -1);
155+
coldef->typeName = makeTypeNameFromOid(INT8OID, -1);
156156
coldef->colname = "start_value";
157157
value[i - 1] = Int64GetDatumFast(new.start_value);
158158
break;
159159
case SEQ_COL_INCBY:
160-
coldef->typename = makeTypeNameFromOid(INT8OID, -1);
160+
coldef->typeName = makeTypeNameFromOid(INT8OID, -1);
161161
coldef->colname = "increment_by";
162162
value[i - 1] = Int64GetDatumFast(new.increment_by);
163163
break;
164164
case SEQ_COL_MAXVALUE:
165-
coldef->typename = makeTypeNameFromOid(INT8OID, -1);
165+
coldef->typeName = makeTypeNameFromOid(INT8OID, -1);
166166
coldef->colname = "max_value";
167167
value[i - 1] = Int64GetDatumFast(new.max_value);
168168
break;
169169
case SEQ_COL_MINVALUE:
170-
coldef->typename = makeTypeNameFromOid(INT8OID, -1);
170+
coldef->typeName = makeTypeNameFromOid(INT8OID, -1);
171171
coldef->colname = "min_value";
172172
value[i - 1] = Int64GetDatumFast(new.min_value);
173173
break;
174174
case SEQ_COL_CACHE:
175-
coldef->typename = makeTypeNameFromOid(INT8OID, -1);
175+
coldef->typeName = makeTypeNameFromOid(INT8OID, -1);
176176
coldef->colname = "cache_value";
177177
value[i - 1] = Int64GetDatumFast(new.cache_value);
178178
break;
179179
case SEQ_COL_LOG:
180-
coldef->typename = makeTypeNameFromOid(INT8OID, -1);
180+
coldef->typeName = makeTypeNameFromOid(INT8OID, -1);
181181
coldef->colname = "log_cnt";
182182
value[i - 1] = Int64GetDatum((int64) 1);
183183
break;
184184
case SEQ_COL_CYCLE:
185-
coldef->typename = makeTypeNameFromOid(BOOLOID, -1);
185+
coldef->typeName = makeTypeNameFromOid(BOOLOID, -1);
186186
coldef->colname = "is_cycled";
187187
value[i - 1] = BoolGetDatum(new.is_cycled);
188188
break;
189189
case SEQ_COL_CALLED:
190-
coldef->typename = makeTypeNameFromOid(BOOLOID, -1);
190+
coldef->typeName = makeTypeNameFromOid(BOOLOID, -1);
191191
coldef->colname = "is_called";
192192
value[i - 1] = BoolGetDatum(false);
193193
break;

‎src/backend/commands/tablecmds.c

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.289 2009/07/12 17:12:33 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.290 2009/07/16 06:33:42 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -305,7 +305,7 @@ static void ATPrepAlterColumnType(List **wqueue,
305305
bool recurse, bool recursing,
306306
AlterTableCmd *cmd);
307307
static void ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
308-
const char *colName, TypeName *typename);
308+
const char *colName, TypeName *typeName);
309309
static void ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab);
310310
static void ATPostAlterTypeParse(char *cmd, List **wqueue);
311311
static void change_owner_recurse_to_sequences(Oid relationOid,
@@ -1280,15 +1280,15 @@ MergeAttributes(List *schema, List *supers, bool istemp,
12801280
(errmsg("merging multiple inherited definitions of column \"%s\"",
12811281
attributeName)));
12821282
def = (ColumnDef *) list_nth(inhSchema, exist_attno - 1);
1283-
defTypeId = typenameTypeId(NULL, def->typename, &deftypmod);
1283+
defTypeId = typenameTypeId(NULL, def->typeName, &deftypmod);
12841284
if (defTypeId != attribute->atttypid ||
12851285
deftypmod != attribute->atttypmod)
12861286
ereport(ERROR,
12871287
(errcode(ERRCODE_DATATYPE_MISMATCH),
12881288
errmsg("inherited column \"%s\" has a type conflict",
12891289
attributeName),
12901290
errdetail("%s versus %s",
1291-
TypeNameToString(def->typename),
1291+
TypeNameToString(def->typeName),
12921292
format_type_be(attribute->atttypid))));
12931293
def->inhcount++;
12941294
/* Merge of NOT NULL constraints = OR 'em together */
@@ -1303,7 +1303,7 @@ MergeAttributes(List *schema, List *supers, bool istemp,
13031303
*/
13041304
def = makeNode(ColumnDef);
13051305
def->colname = pstrdup(attributeName);
1306-
def->typename = makeTypeNameFromOid(attribute->atttypid,
1306+
def->typeName = makeTypeNameFromOid(attribute->atttypid,
13071307
attribute->atttypmod);
13081308
def->inhcount = 1;
13091309
def->is_local = false;
@@ -1438,16 +1438,16 @@ MergeAttributes(List *schema, List *supers, bool istemp,
14381438
(errmsg("merging column \"%s\" with inherited definition",
14391439
attributeName)));
14401440
def = (ColumnDef *) list_nth(inhSchema, exist_attno - 1);
1441-
defTypeId = typenameTypeId(NULL, def->typename, &deftypmod);
1442-
newTypeId = typenameTypeId(NULL, newdef->typename, &newtypmod);
1441+
defTypeId = typenameTypeId(NULL, def->typeName, &deftypmod);
1442+
newTypeId = typenameTypeId(NULL, newdef->typeName, &newtypmod);
14431443
if (defTypeId != newTypeId || deftypmod != newtypmod)
14441444
ereport(ERROR,
14451445
(errcode(ERRCODE_DATATYPE_MISMATCH),
14461446
errmsg("column \"%s\" has a type conflict",
14471447
attributeName),
14481448
errdetail("%s versus %s",
1449-
TypeNameToString(def->typename),
1450-
TypeNameToString(newdef->typename))));
1449+
TypeNameToString(def->typeName),
1450+
TypeNameToString(newdef->typeName))));
14511451
/* Mark the column as locally defined */
14521452
def->is_local = true;
14531453
/* Merge of NOT NULL constraints = OR 'em together */
@@ -1598,22 +1598,22 @@ change_varattnos_walker(Node *node, const AttrNumber *newattno)
15981598
* matching according to column name.
15991599
*/
16001600
AttrNumber *
1601-
varattnos_map(TupleDesc old, TupleDesc new)
1601+
varattnos_map(TupleDesc olddesc, TupleDesc newdesc)
16021602
{
16031603
AttrNumber *attmap;
16041604
int i,
16051605
j;
16061606

1607-
attmap = (AttrNumber *) palloc0(sizeof(AttrNumber) * old->natts);
1608-
for (i = 1; i <= old->natts; i++)
1607+
attmap = (AttrNumber *) palloc0(sizeof(AttrNumber) * olddesc->natts);
1608+
for (i = 1; i <= olddesc->natts; i++)
16091609
{
1610-
if (old->attrs[i - 1]->attisdropped)
1610+
if (olddesc->attrs[i - 1]->attisdropped)
16111611
continue; /* leave the entry as zero */
16121612

1613-
for (j = 1; j <= new->natts; j++)
1613+
for (j = 1; j <= newdesc->natts; j++)
16141614
{
1615-
if (strcmp(NameStr(old->attrs[i - 1]->attname),
1616-
NameStr(new->attrs[j - 1]->attname)) == 0)
1615+
if (strcmp(NameStr(olddesc->attrs[i - 1]->attname),
1616+
NameStr(newdesc->attrs[j - 1]->attname)) == 0)
16171617
{
16181618
attmap[i - 1] = j;
16191619
break;
@@ -3530,7 +3530,7 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
35303530
int32 ctypmod;
35313531

35323532
/* Child column must match by type */
3533-
ctypeId = typenameTypeId(NULL, colDef->typename, &ctypmod);
3533+
ctypeId = typenameTypeId(NULL, colDef->typeName, &ctypmod);
35343534
if (ctypeId != childatt->atttypid ||
35353535
ctypmod != childatt->atttypmod)
35363536
ereport(ERROR,
@@ -3597,7 +3597,7 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
35973597
MaxHeapAttributeNumber)));
35983598
}
35993599

3600-
typeTuple = typenameType(NULL, colDef->typename, &typmod);
3600+
typeTuple = typenameType(NULL, colDef->typeName, &typmod);
36013601
tform = (Form_pg_type) GETSTRUCT(typeTuple);
36023602
typeOid = HeapTupleGetOid(typeTuple);
36033603

@@ -3614,7 +3614,7 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
36143614
attribute.atttypmod = typmod;
36153615
attribute.attnum = newattnum;
36163616
attribute.attbyval = tform->typbyval;
3617-
attribute.attndims = list_length(colDef->typename->arrayBounds);
3617+
attribute.attndims = list_length(colDef->typeName->arrayBounds);
36183618
attribute.attstorage = tform->typstorage;
36193619
attribute.attalign = tform->typalign;
36203620
attribute.attnotnull = colDef->is_not_null;
@@ -3788,7 +3788,7 @@ ATPrepAddOids(List **wqueue, Relation rel, bool recurse, AlterTableCmd *cmd)
37883788
ColumnDef *cdef = makeNode(ColumnDef);
37893789

37903790
cdef->colname = pstrdup("oid");
3791-
cdef->typename = makeTypeNameFromOid(OIDOID, -1);
3791+
cdef->typeName = makeTypeNameFromOid(OIDOID, -1);
37923792
cdef->inhcount = 0;
37933793
cdef->is_local = true;
37943794
cdef->is_not_null = true;
@@ -5548,7 +5548,7 @@ ATPrepAlterColumnType(List **wqueue,
55485548
AlterTableCmd *cmd)
55495549
{
55505550
char *colName = cmd->name;
5551-
TypeName *typename = (TypeName *) cmd->def;
5551+
TypeName *typeName = (TypeName *) cmd->def;
55525552
HeapTuple tuple;
55535553
Form_pg_attribute attTup;
55545554
AttrNumber attnum;
@@ -5583,7 +5583,7 @@ ATPrepAlterColumnType(List **wqueue,
55835583
colName)));
55845584

55855585
/* Look up the target type */
5586-
targettype = typenameTypeId(NULL, typename, &targettypmod);
5586+
targettype = typenameTypeId(NULL, typeName, &targettypmod);
55875587

55885588
/* make sure datatype is legal for a column */
55895589
CheckAttributeType(colName, targettype);
@@ -5678,7 +5678,7 @@ ATPrepAlterColumnType(List **wqueue,
56785678

56795679
static void
56805680
ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
5681-
const char *colName, TypeName *typename)
5681+
const char *colName, TypeName *typeName)
56825682
{
56835683
HeapTuple heapTup;
56845684
Form_pg_attribute attTup;
@@ -5715,7 +5715,7 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
57155715
colName)));
57165716

57175717
/* Look up the target type (should not fail, since prep found it) */
5718-
typeTuple = typenameType(NULL, typename, &targettypmod);
5718+
typeTuple = typenameType(NULL, typeName, &targettypmod);
57195719
tform = (Form_pg_type) GETSTRUCT(typeTuple);
57205720
targettype = HeapTupleGetOid(typeTuple);
57215721

@@ -5962,7 +5962,7 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
59625962
*/
59635963
attTup->atttypid = targettype;
59645964
attTup->atttypmod = targettypmod;
5965-
attTup->attndims = list_length(typename->arrayBounds);
5965+
attTup->attndims = list_length(typeName->arrayBounds);
59665966
attTup->attlen = tform->typlen;
59675967
attTup->attbyval = tform->typbyval;
59685968
attTup->attalign = tform->typalign;

‎src/backend/commands/typecmds.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.134 2009/06/11 14:48:56 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.135 2009/07/16 06:33:42 petere Exp $
1212
*
1313
* DESCRIPTION
1414
* The "DefineFoo" routines take the parse tree and pick out the
@@ -759,7 +759,7 @@ DefineDomain(CreateDomainStmt *stmt)
759759
bool saw_default = false;
760760
bool typNotNull = false;
761761
bool nullDefined = false;
762-
int32 typNDims = list_length(stmt->typename->arrayBounds);
762+
int32 typNDims = list_length(stmt->typeName->arrayBounds);
763763
HeapTuple typeTup;
764764
List *schema = stmt->constraints;
765765
ListCell *listptr;
@@ -799,7 +799,7 @@ DefineDomain(CreateDomainStmt *stmt)
799799
/*
800800
* Look up the base type.
801801
*/
802-
typeTup = typenameType(NULL, stmt->typename, &basetypeMod);
802+
typeTup = typenameType(NULL, stmt->typeName, &basetypeMod);
803803
baseType = (Form_pg_type) GETSTRUCT(typeTup);
804804
basetypeoid = HeapTupleGetOid(typeTup);
805805

@@ -815,7 +815,7 @@ DefineDomain(CreateDomainStmt *stmt)
815815
ereport(ERROR,
816816
(errcode(ERRCODE_DATATYPE_MISMATCH),
817817
errmsg("\"%s\" is not a valid base type for a domain",
818-
TypeNameToString(stmt->typename))));
818+
TypeNameToString(stmt->typeName))));
819819

820820
/* passed by value */
821821
byValue = baseType->typbyval;
@@ -1097,7 +1097,7 @@ DefineEnum(CreateEnumStmt *stmt)
10971097
Relation pg_type;
10981098

10991099
/* Convert list of names to a name and namespace */
1100-
enumNamespace = QualifiedNameGetCreationNamespace(stmt->typename,
1100+
enumNamespace = QualifiedNameGetCreationNamespace(stmt->typeName,
11011101
&enumName);
11021102

11031103
/* Check we have creation rights in target namespace */

‎src/backend/commands/view.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.116 2009/06/11 14:48:56 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.117 2009/07/16 06:33:42 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -119,7 +119,7 @@ DefineVirtualRelation(const RangeVar *relation, List *tlist, bool replace)
119119
ColumnDef *def = makeNode(ColumnDef);
120120

121121
def->colname = pstrdup(tle->resname);
122-
def->typename = makeTypeNameFromOid(exprType((Node *) tle->expr),
122+
def->typeName = makeTypeNameFromOid(exprType((Node *) tle->expr),
123123
exprTypmod((Node *) tle->expr));
124124
def->inhcount = 0;
125125
def->is_local = true;

0 commit comments

Comments
 (0)