Skip to content

Commit 4853495

Browse files
bmomjianbmomjian
committed
Change error messages to oids come out as %u and not %d. Change has no
real affect now.
1 parent b7332c9 commit 4853495

Some content is hidden

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

66 files changed

+241
-269
lines changed

‎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.44 1999/04/25 19:27:43 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.45 1999/05/10 00:44:50 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -59,7 +59,7 @@ getTypeOutAndElem(Oid type, Oid* typOutput, Oid* typElem)
5959
return OidIsValid(*typOutput);
6060
}
6161

62-
elog(ERROR, "getTypeOutAndElem: Cache lookup of type %d failed", type);
62+
elog(ERROR, "getTypeOutAndElem: Cache lookup of type %u failed", type);
6363

6464
*typOutput = InvalidOid;
6565
*typElem = InvalidOid;

‎src/backend/access/gist/gist.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
11621162
0, 0, 0);
11631163
itupform = (Form_pg_index) GETSTRUCT(htup);
11641164
if (!HeapTupleIsValid(htup))
1165-
elog(ERROR, "initGISTstate: index %d not found",
1165+
elog(ERROR, "initGISTstate: index %u not found",
11661166
RelationGetRelid(index));
11671167
giststate->haskeytype = itupform->indhaskeytype;
11681168
if (giststate->haskeytype)
@@ -1174,7 +1174,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
11741174
0, 0);
11751175
if (!HeapTupleIsValid(htup))
11761176
{
1177-
elog(ERROR, "initGISTstate: no attribute tuple %d %d",
1177+
elog(ERROR, "initGISTstate: no attribute tuple %u %d",
11781178
itupform->indexrelid, FirstOffsetNumber);
11791179
return;
11801180
}

‎src/backend/bootstrap/bootparse.y

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/bootstrap/bootparse.y,v 1.24 1999/02/13 23:14:51 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.25 1999/05/10 00:44:51 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -178,7 +178,7 @@ Boot_CreateStmt:
178178
id = heap_create_with_catalog(LexIDStr($3),
179179
tupdesc, RELKIND_RELATION, false);
180180
if (!Quiet)
181-
printf("CREATED relation %s with OID %d\n",
181+
printf("CREATED relation %s with OID %u\n",
182182
LexIDStr($3), id);
183183
}
184184
DO_END;

‎src/backend/bootstrap/bootstrap.c

Lines changed: 5 additions & 5 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.58 1999/04/20 02:19:53 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.59 1999/05/10 00:44:52 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -630,7 +630,7 @@ InsertOneTuple(Oid objectid)
630630

631631
if (DebugMode)
632632
{
633-
printf("InsertOneTuple oid %d, %d attrs\n", objectid, numattr);
633+
printf("InsertOneTuple oid %u, %d attrs\n", objectid, numattr);
634634
fflush(stdout);
635635
}
636636

@@ -644,7 +644,7 @@ InsertOneTuple(Oid objectid)
644644
pfree(tuple);
645645
if (DebugMode)
646646
{
647-
printf("End InsertOneTuple, objectid=%d\n", objectid);
647+
printf("End InsertOneTuple, objectid=%u\n", objectid);
648648
fflush(stdout);
649649
}
650650

@@ -686,7 +686,7 @@ InsertOneValue(Oid objectid, char *value, int i)
686686
ap = *app;
687687
if (ap == NULL)
688688
{
689-
printf("Unable to find atttypid in Typ list! %d\n",
689+
printf("Unable to find atttypid in Typ list! %u\n",
690690
reldesc->rd_att->attrs[i]->atttypid
691691
);
692692
Assert(0);
@@ -707,7 +707,7 @@ InsertOneValue(Oid objectid, char *value, int i)
707707
{
708708
typeindex = attrtypes[i]->atttypid - FIRST_TYPE_OID;
709709
if (DebugMode)
710-
printf("Typ == NULL, typeindex = %d idx = %d\n", typeindex, i);
710+
printf("Typ == NULL, typeindex = %u idx = %d\n", typeindex, i);
711711
values[i] = fmgr(Procid[typeindex].inproc, value,
712712
Procid[typeindex].elem, -1);
713713
prt = fmgr(Procid[typeindex].outproc, values[i],

‎src/backend/catalog/aclchk.c

Lines changed: 2 additions & 3 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.20 1999/03/17 22:52:47 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.21 1999/05/10 00:44:53 momjian Exp $
1111
*
1212
* NOTES
1313
* See acl.h.
@@ -549,8 +549,7 @@ pg_ownercheck(char *usename,
549549
owner_id = ((Form_pg_type) GETSTRUCT(tuple))->typowner;
550550
break;
551551
default:
552-
elog(ERROR, "pg_ownercheck: invalid cache id: %d",
553-
cacheid);
552+
elog(ERROR, "pg_ownercheck: invalid cache id: %d", cacheid);
554553
break;
555554
}
556555

‎src/backend/catalog/heap.c

Lines changed: 7 additions & 7 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.77 1999/04/15 04:08:07 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.78 1999/05/10 00:44:54 momjian Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -761,10 +761,10 @@ AddNewRelationType(char *typeName, Oid new_rel_oid)
761761
typeLen(typeidType(OIDOID)), /* external size */
762762
'c', /* type-type (catalog) */
763763
',', /* default array delimiter */
764-
"int4in", /* input procedure */
765-
"int4out", /* output procedure */
766-
"int4in", /* receive procedure */
767-
"int4out", /* send procedure */
764+
"oidin", /* input procedure */
765+
"oidout", /* output procedure */
766+
"oidin", /* receive procedure */
767+
"oidout", /* send procedure */
768768
NULL, /* array element type - irrelevent */
769769
"-", /* default type value */
770770
(bool) 1, /* passed by value */
@@ -973,7 +973,7 @@ RelationRemoveInheritance(Relation relation)
973973
heap_endscan(scan);
974974
heap_close(catalogRelation);
975975

976-
elog(ERROR, "Relation '%d' inherits '%s'",
976+
elog(ERROR, "Relation '%u' inherits '%s'",
977977
((Form_pg_inherits) GETSTRUCT(tuple))->inhrel,
978978
RelationGetRelationName(relation));
979979
}
@@ -1235,7 +1235,7 @@ DeleteTypeTuple(Relation rel)
12351235
heap_endscan(pg_attribute_scan);
12361236
heap_close(pg_attribute_desc);
12371237

1238-
elog(ERROR, "DeleteTypeTuple: att of type %s exists in relation %d",
1238+
elog(ERROR, "DeleteTypeTuple: att of type %s exists in relation %u",
12391239
&rel->rd_rel->relname, relid);
12401240
}
12411241
heap_endscan(pg_attribute_scan);

‎src/backend/catalog/index.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/index.c,v 1.70 1999/02/13 23:14:56 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.71 1999/05/10 00:44:55 momjian Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -1279,7 +1279,7 @@ UpdateStats(Oid relid, long reltuples, bool hasindex)
12791279
whichRel = RelationIdGetRelation(relid);
12801280

12811281
if (!RelationIsValid(whichRel))
1282-
elog(ERROR, "UpdateStats: cannot open relation id %d", relid);
1282+
elog(ERROR, "UpdateStats: cannot open relation id %u", relid);
12831283

12841284
/* ----------------
12851285
* Find the RELATION relation tuple for the given relation.
@@ -1679,7 +1679,7 @@ IndexIsUnique(Oid indexId)
16791679
0, 0, 0);
16801680
if (!HeapTupleIsValid(tuple))
16811681
{
1682-
elog(ERROR, "IndexIsUnique: can't find index id %d",
1682+
elog(ERROR, "IndexIsUnique: can't find index id %u",
16831683
indexId);
16841684
}
16851685
index = (Form_pg_index) GETSTRUCT(tuple);
@@ -1722,7 +1722,7 @@ IndexIsUniqueNoCache(Oid indexId)
17221722
/* NO CACHE */
17231723
tuple = heap_getnext(scandesc, 0);
17241724
if (!HeapTupleIsValid(tuple))
1725-
elog(ERROR, "IndexIsUniqueNoCache: can't find index id %d", indexId);
1725+
elog(ERROR, "IndexIsUniqueNoCache: can't find index id %u", indexId);
17261726

17271727
index = (Form_pg_index) GETSTRUCT(tuple);
17281728
Assert(index->indexrelid == indexId);

‎src/backend/catalog/indexing.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/catalog/indexing.c,v 1.36 1999/02/13 23:14:57 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.37 1999/05/10 00:44:55 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -206,7 +206,7 @@ CatalogHasIndex(char *catName, Oid catId)
206206

207207
if (!HeapTupleIsValid(htup))
208208
{
209-
elog(NOTICE, "CatalogHasIndex: no relation with oid %d", catId);
209+
elog(NOTICE, "CatalogHasIndex: no relation with oid %u", catId);
210210
return false;
211211
}
212212

‎src/backend/catalog/pg_operator.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_operator.c,v 1.35 1999/04/23 00:50:57 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.36 1999/05/10 00:44:56 momjian Exp $
1111
*
1212
* NOTES
1313
* these routines moved here from commands/define.c and somewhat cleaned up.
@@ -787,7 +787,7 @@ OperatorDef(char *operatorName,
787787
setheapoverride(false);
788788
}
789789
else
790-
elog(ERROR, "OperatorDef: no operator %d", operatorObjectId);
790+
elog(ERROR, "OperatorDef: no operator %u", operatorObjectId);
791791

792792
heap_endscan(pg_operator_scan);
793793
}

‎src/backend/commands/command.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/commands/Attic/command.c,v 1.43 1999/04/13 19:04:33 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.44 1999/05/10 00:44:56 momjian Exp $
1111
*
1212
* NOTES
1313
* The PortalExecutorHeapMemory crap needs to be eliminated
@@ -368,7 +368,7 @@ PerformAddAttribute(char *relationName,
368368
rel = heap_open(childrelid);
369369
if (!RelationIsValid(rel))
370370
{
371-
elog(ERROR, "PerformAddAttribute: can't find catalog entry for inheriting class with oid %d",
371+
elog(ERROR, "PerformAddAttribute: can't find catalog entry for inheriting class with oid %u",
372372
childrelid);
373373
}
374374
PerformAddAttribute((rel->rd_rel->relname).data,

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