From 4853495e033245bbfc1d212ba8f2286008873f64 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 10 May 1999 00:46:32 +0000
Subject: [PATCH] Change error messages to oids come out as %u and not %d.
Change has no real affect now.
---
src/backend/access/common/printtup.c | 4 +--
src/backend/access/gist/gist.c | 4 +--
src/backend/bootstrap/bootparse.y | 4 +--
src/backend/bootstrap/bootstrap.c | 10 ++++----
src/backend/catalog/aclchk.c | 5 ++--
src/backend/catalog/heap.c | 14 +++++------
src/backend/catalog/index.c | 8 +++---
src/backend/catalog/indexing.c | 4 +--
src/backend/catalog/pg_operator.c | 4 +--
src/backend/commands/command.c | 4 +--
src/backend/commands/copy.c | 8 +++---
src/backend/commands/dbcommands.c | 4 +--
src/backend/commands/indexcmds.c | 7 +++---
src/backend/commands/rename.c | 4 +--
src/backend/commands/vacuum.c | 4 +--
src/backend/executor/execAmi.c | 4 +--
src/backend/executor/execMain.c | 8 +++---
src/backend/executor/nodeIndexscan.c | 5 ++--
src/backend/executor/nodeMergejoin.c | 6 ++---
src/backend/libpq/be-dumpdata.c | 4 +--
src/backend/libpq/be-fsstubs.c | 9 +++----
src/backend/nodes/outfuncs.c | 16 ++++++------
src/backend/nodes/print.c | 4 +--
src/backend/optimizer/path/_deadcode/xfunc.c | 12 ++++-----
src/backend/optimizer/plan/createplan.c | 5 ++--
src/backend/optimizer/plan/planner.c | 8 +++---
src/backend/optimizer/plan/subselect.c | 6 ++---
src/backend/optimizer/util/clauses.c | 4 +--
src/backend/optimizer/util/plancat.c | 14 +++++------
src/backend/parser/parse_coerce.c | 18 +++++++-------
src/backend/parser/parse_func.c | 6 ++---
src/backend/parser/parse_node.c | 10 ++++----
src/backend/parser/parse_oper.c | 6 ++---
src/backend/parser/parse_type.c | 4 +--
src/backend/rewrite/rewriteDefine.c | 4 +--
src/backend/rewrite/rewriteRemove.c | 6 ++---
src/backend/storage/buffer/bufmgr.c | 6 ++---
src/backend/storage/buffer/localbuf.c | 6 ++---
src/backend/storage/ipc/sinvaladt.c | 14 +++--------
src/backend/storage/large_object/inv_api.c | 6 ++---
src/backend/storage/lmgr/lock.c | 4 +--
src/backend/tcop/fastpath.c | 8 +++---
src/backend/tioga/tgRecipe.c | 4 +--
src/backend/utils/adt/arrayfuncs.c | 6 ++---
src/backend/utils/adt/oid.c | 4 +--
src/backend/utils/adt/regproc.c | 4 +--
src/backend/utils/adt/ruleutils.c | 26 ++++++++++----------
src/backend/utils/adt/selfuncs.c | 12 ++++-----
src/backend/utils/cache/catcache.c | 6 ++---
src/backend/utils/cache/fcache.c | 6 ++---
src/backend/utils/cache/inval.c | 8 +++---
src/backend/utils/cache/lsyscache.c | 6 ++---
src/backend/utils/cache/relcache.c | 6 ++---
src/backend/utils/error/elog.c | 5 ++--
src/backend/utils/fmgr/dfmgr.c | 6 ++---
src/backend/utils/fmgr/fmgr.c | 20 +++++++--------
src/bin/pg_dump/pg_dump.c | 12 ++++-----
src/include/catalog/pg_type.h | 4 +--
src/interfaces/libpgtcl/pgtclCmds.c | 6 ++---
src/interfaces/libpq/fe-auth.c | 22 ++++++-----------
src/interfaces/libpq/fe-lobj.c | 6 ++---
src/pl/plpgsql/src/pl_comp.c | 12 ++++-----
src/pl/plpgsql/src/pl_exec.c | 8 +++---
src/pl/plpgsql/src/pl_funcs.c | 4 +--
src/test/examples/testlo.c | 13 ++++------
src/test/examples/testlo2.c | 13 ++++------
66 files changed, 241 insertions(+), 269 deletions(-)
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 0d2aeeecd1c..7615c79a748 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.44 1999/04/25 19:27:43 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.45 1999/05/10 00:44:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -59,7 +59,7 @@ getTypeOutAndElem(Oid type, Oid* typOutput, Oid* typElem)
return OidIsValid(*typOutput);
}
- elog(ERROR, "getTypeOutAndElem: Cache lookup of type %d failed", type);
+ elog(ERROR, "getTypeOutAndElem: Cache lookup of type %u failed", type);
*typOutput = InvalidOid;
*typElem = InvalidOid;
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 54c0c4a4f6c..1342bc6aec8 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -1162,7 +1162,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
0, 0, 0);
itupform = (Form_pg_index) GETSTRUCT(htup);
if (!HeapTupleIsValid(htup))
- elog(ERROR, "initGISTstate: index %d not found",
+ elog(ERROR, "initGISTstate: index %u not found",
RelationGetRelid(index));
giststate->haskeytype = itupform->indhaskeytype;
if (giststate->haskeytype)
@@ -1174,7 +1174,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
0, 0);
if (!HeapTupleIsValid(htup))
{
- elog(ERROR, "initGISTstate: no attribute tuple %d %d",
+ elog(ERROR, "initGISTstate: no attribute tuple %u %d",
itupform->indexrelid, FirstOffsetNumber);
return;
}
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index 5a4b0b50b52..d1808bdbb2a 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.24 1999/02/13 23:14:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.25 1999/05/10 00:44:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -178,7 +178,7 @@ Boot_CreateStmt:
id = heap_create_with_catalog(LexIDStr($3),
tupdesc, RELKIND_RELATION, false);
if (!Quiet)
- printf("CREATED relation %s with OID %d\n",
+ printf("CREATED relation %s with OID %u\n",
LexIDStr($3), id);
}
DO_END;
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 0c377d267c8..80f1142949f 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -7,7 +7,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.58 1999/04/20 02:19:53 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.59 1999/05/10 00:44:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -630,7 +630,7 @@ InsertOneTuple(Oid objectid)
if (DebugMode)
{
- printf("InsertOneTuple oid %d, %d attrs\n", objectid, numattr);
+ printf("InsertOneTuple oid %u, %d attrs\n", objectid, numattr);
fflush(stdout);
}
@@ -644,7 +644,7 @@ InsertOneTuple(Oid objectid)
pfree(tuple);
if (DebugMode)
{
- printf("End InsertOneTuple, objectid=%d\n", objectid);
+ printf("End InsertOneTuple, objectid=%u\n", objectid);
fflush(stdout);
}
@@ -686,7 +686,7 @@ InsertOneValue(Oid objectid, char *value, int i)
ap = *app;
if (ap == NULL)
{
- printf("Unable to find atttypid in Typ list! %d\n",
+ printf("Unable to find atttypid in Typ list! %u\n",
reldesc->rd_att->attrs[i]->atttypid
);
Assert(0);
@@ -707,7 +707,7 @@ InsertOneValue(Oid objectid, char *value, int i)
{
typeindex = attrtypes[i]->atttypid - FIRST_TYPE_OID;
if (DebugMode)
- printf("Typ == NULL, typeindex = %d idx = %d\n", typeindex, i);
+ printf("Typ == NULL, typeindex = %u idx = %d\n", typeindex, i);
values[i] = fmgr(Procid[typeindex].inproc, value,
Procid[typeindex].elem, -1);
prt = fmgr(Procid[typeindex].outproc, values[i],
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 92dfc98ff2d..db1d85abc1f 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.20 1999/03/17 22:52:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.21 1999/05/10 00:44:53 momjian Exp $
*
* NOTES
* See acl.h.
@@ -549,8 +549,7 @@ pg_ownercheck(char *usename,
owner_id = ((Form_pg_type) GETSTRUCT(tuple))->typowner;
break;
default:
- elog(ERROR, "pg_ownercheck: invalid cache id: %d",
- cacheid);
+ elog(ERROR, "pg_ownercheck: invalid cache id: %d", cacheid);
break;
}
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 6db517b0769..d87f5959b04 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.77 1999/04/15 04:08:07 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.78 1999/05/10 00:44:54 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -761,10 +761,10 @@ AddNewRelationType(char *typeName, Oid new_rel_oid)
typeLen(typeidType(OIDOID)), /* external size */
'c', /* type-type (catalog) */
',', /* default array delimiter */
- "int4in", /* input procedure */
- "int4out", /* output procedure */
- "int4in", /* receive procedure */
- "int4out", /* send procedure */
+ "oidin", /* input procedure */
+ "oidout", /* output procedure */
+ "oidin", /* receive procedure */
+ "oidout", /* send procedure */
NULL, /* array element type - irrelevent */
"-", /* default type value */
(bool) 1, /* passed by value */
@@ -973,7 +973,7 @@ RelationRemoveInheritance(Relation relation)
heap_endscan(scan);
heap_close(catalogRelation);
- elog(ERROR, "Relation '%d' inherits '%s'",
+ elog(ERROR, "Relation '%u' inherits '%s'",
((Form_pg_inherits) GETSTRUCT(tuple))->inhrel,
RelationGetRelationName(relation));
}
@@ -1235,7 +1235,7 @@ DeleteTypeTuple(Relation rel)
heap_endscan(pg_attribute_scan);
heap_close(pg_attribute_desc);
- elog(ERROR, "DeleteTypeTuple: att of type %s exists in relation %d",
+ elog(ERROR, "DeleteTypeTuple: att of type %s exists in relation %u",
&rel->rd_rel->relname, relid);
}
heap_endscan(pg_attribute_scan);
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index ad6cae56b79..4acc7c3631a 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.70 1999/02/13 23:14:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.71 1999/05/10 00:44:55 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -1279,7 +1279,7 @@ UpdateStats(Oid relid, long reltuples, bool hasindex)
whichRel = RelationIdGetRelation(relid);
if (!RelationIsValid(whichRel))
- elog(ERROR, "UpdateStats: cannot open relation id %d", relid);
+ elog(ERROR, "UpdateStats: cannot open relation id %u", relid);
/* ----------------
* Find the RELATION relation tuple for the given relation.
@@ -1679,7 +1679,7 @@ IndexIsUnique(Oid indexId)
0, 0, 0);
if (!HeapTupleIsValid(tuple))
{
- elog(ERROR, "IndexIsUnique: can't find index id %d",
+ elog(ERROR, "IndexIsUnique: can't find index id %u",
indexId);
}
index = (Form_pg_index) GETSTRUCT(tuple);
@@ -1722,7 +1722,7 @@ IndexIsUniqueNoCache(Oid indexId)
/* NO CACHE */
tuple = heap_getnext(scandesc, 0);
if (!HeapTupleIsValid(tuple))
- elog(ERROR, "IndexIsUniqueNoCache: can't find index id %d", indexId);
+ elog(ERROR, "IndexIsUniqueNoCache: can't find index id %u", indexId);
index = (Form_pg_index) GETSTRUCT(tuple);
Assert(index->indexrelid == indexId);
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index 7ec9095a5dc..89230f16c0b 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.36 1999/02/13 23:14:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.37 1999/05/10 00:44:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -206,7 +206,7 @@ CatalogHasIndex(char *catName, Oid catId)
if (!HeapTupleIsValid(htup))
{
- elog(NOTICE, "CatalogHasIndex: no relation with oid %d", catId);
+ elog(NOTICE, "CatalogHasIndex: no relation with oid %u", catId);
return false;
}
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 5f3739c3216..b3b11f845ad 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.35 1999/04/23 00:50:57 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.36 1999/05/10 00:44:56 momjian Exp $
*
* NOTES
* these routines moved here from commands/define.c and somewhat cleaned up.
@@ -787,7 +787,7 @@ OperatorDef(char *operatorName,
setheapoverride(false);
}
else
- elog(ERROR, "OperatorDef: no operator %d", operatorObjectId);
+ elog(ERROR, "OperatorDef: no operator %u", operatorObjectId);
heap_endscan(pg_operator_scan);
}
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index e68155c9a9c..7d8f72d51f9 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.43 1999/04/13 19:04:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.44 1999/05/10 00:44:56 momjian Exp $
*
* NOTES
* The PortalExecutorHeapMemory crap needs to be eliminated
@@ -368,7 +368,7 @@ PerformAddAttribute(char *relationName,
rel = heap_open(childrelid);
if (!RelationIsValid(rel))
{
- elog(ERROR, "PerformAddAttribute: can't find catalog entry for inheriting class with oid %d",
+ elog(ERROR, "PerformAddAttribute: can't find catalog entry for inheriting class with oid %u",
childrelid);
}
PerformAddAttribute((rel->rd_rel->relname).data,
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index dd280918165..9347c6d67dd 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.75 1999/05/03 19:09:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.76 1999/05/10 00:44:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -926,7 +926,7 @@ GetOutputFunction(Oid type)
if (HeapTupleIsValid(typeTuple))
return (int) ((Form_pg_type) GETSTRUCT(typeTuple))->typoutput;
- elog(ERROR, "GetOutputFunction: Cache lookup of type %d failed", type);
+ elog(ERROR, "GetOutputFunction: Cache lookup of type %u failed", type);
return InvalidOid;
}
@@ -958,7 +958,7 @@ GetInputFunction(Oid type)
if (HeapTupleIsValid(typeTuple))
return (int) ((Form_pg_type) GETSTRUCT(typeTuple))->typinput;
- elog(ERROR, "GetInputFunction: Cache lookup of type %d failed", type);
+ elog(ERROR, "GetInputFunction: Cache lookup of type %u failed", type);
return InvalidOid;
}
@@ -974,7 +974,7 @@ IsTypeByVal(Oid type)
if (HeapTupleIsValid(typeTuple))
return (int) ((Form_pg_type) GETSTRUCT(typeTuple))->typbyval;
- elog(ERROR, "GetInputFunction: Cache lookup of type %d failed", type);
+ elog(ERROR, "GetInputFunction: Cache lookup of type %u failed", type);
return InvalidOid;
}
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index b63857acfc5..943d7acb432 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.33 1999/03/16 04:25:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.34 1999/05/10 00:44:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -123,7 +123,7 @@ destroydb(char *dbname, CommandDest dest)
* permissions problems
*/
snprintf(buf, 512,
- "delete from pg_database where pg_database.oid = \'%d\'::oid", db_id);
+ "delete from pg_database where pg_database.oid = \'%u\'::oid", db_id);
pg_exec_query_dest(buf ,dest, false);
/* drop pages for this database that are in the shared buffer cache */
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 6fe28daf07f..5907205bd87 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.2 1999/03/14 05:23:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.3 1999/05/10 00:44:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -164,8 +164,7 @@ DefineIndex(char *heapRelationName,
if (nargs > INDEX_MAX_KEYS)
{
elog(ERROR,
- "Too many args to function, limit of %d",
- INDEX_MAX_KEYS);
+ "Too many args to function, limit of %d", INDEX_MAX_KEYS);
}
FIsetnArgs(&fInfo, nargs);
@@ -514,7 +513,7 @@ NormIndexAttrs(List *attList, /* list of IndexElem's */
if (attribute->class == NULL)
{
elog(ERROR,
- "Can't find a default operator class for type %d.",
+ "Can't find a default operator class for type %u.",
attform->atttypid);
}
}
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index 116d515bd4c..2b77b250a12 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.22 1999/03/17 22:52:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.23 1999/05/10 00:44:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -130,7 +130,7 @@ renameatt(char *relname,
0, 0, 0);
if (!HeapTupleIsValid(reltup))
{
- elog(ERROR, "renameatt: can't find catalog entry for inheriting class with oid %d",
+ elog(ERROR, "renameatt: can't find catalog entry for inheriting class with oid %u",
childrelid);
}
/* make copy of cache value, could disappear in call */
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 5d76e7c8513..d362ed2b10f 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.101 1999/05/09 14:00:29 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.102 1999/05/10 00:44:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -2140,7 +2140,7 @@ vc_updstats(Oid relid, int num_pages, int num_tuples, bool hasindex, VRelStats *
ObjectIdGetDatum(relid),
0, 0, 0);
if (!HeapTupleIsValid(ctup))
- elog(ERROR, "pg_class entry for relid %d vanished during vacuuming",
+ elog(ERROR, "pg_class entry for relid %u vanished during vacuuming",
relid);
rd = heap_openr(RelationRelationName);
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 83d0c3b6cad..7b8bde8e1ba 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: execAmi.c,v 1.33 1999/03/23 16:50:47 momjian Exp $
+ * $Id: execAmi.c,v 1.34 1999/05/10 00:45:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -496,7 +496,7 @@ ExecCreatR(TupleDesc tupType,
{
Relation relDesc;
- EU3_printf("ExecCreatR: %s type=%d oid=%d\n",
+ EU3_printf("ExecCreatR: %s type=%d oid=%u\n",
"entering: ", tupType, relationOid);
CXT1_printf("ExecCreatR: context is %d\n", CurrentMemoryContext);
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index a4be9a3967c..3565613bba9 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.82 1999/03/23 16:50:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.83 1999/05/10 00:45:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -459,8 +459,7 @@ ExecCheckPerms(CmdType operation,
ObjectIdGetDatum(relid),
0, 0, 0);
if (!HeapTupleIsValid(htup))
- elog(ERROR, "ExecCheckPerms: bogus RT relid: %d",
- relid);
+ elog(ERROR, "ExecCheckPerms: bogus RT relid: %u", relid);
StrNCpy(rname.data,
((Form_pg_class) GETSTRUCT(htup))->relname.data,
NAMEDATALEN);
@@ -520,8 +519,7 @@ ExecCheckPerms(CmdType operation,
ObjectIdGetDatum(relid),
0, 0, 0);
if (!HeapTupleIsValid(htup))
- elog(ERROR, "ExecCheckPerms: bogus RT relid: %d",
- relid);
+ elog(ERROR, "ExecCheckPerms: bogus RT relid: %u", relid);
StrNCpy(rname.data,
((Form_pg_class) GETSTRUCT(htup))->relname.data,
NAMEDATALEN);
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 16bb4f23b41..a55d9cc6e1c 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.34 1999/04/13 17:18:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.35 1999/05/10 00:45:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -703,8 +703,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent)
run_keys = (n_keys <= 0) ? NULL :
(int *) palloc(n_keys * sizeof(int));
- CXT1_printf("ExecInitIndexScan: context is %d\n",
- CurrentMemoryContext);
+ CXT1_printf("ExecInitIndexScan: context is %d\n",CurrentMemoryContext);
/* ----------------
* for each opclause in the given qual,
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 4ecde52ab33..9b0df288259 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.25 1999/02/28 00:36:05 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.26 1999/05/10 00:45:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -149,7 +149,7 @@ MJFormSkipQual(List *qualList, char * replaceopname)
*/
optup = get_operator_tuple(op->opno);
if (!HeapTupleIsValid(optup)) /* shouldn't happen */
- elog(ERROR, "MJFormSkipQual: operator %d not found", op->opno);
+ elog(ERROR, "MJFormSkipQual: operator %u not found", op->opno);
opform = (Form_pg_operator) GETSTRUCT(optup);
oprleft = opform->oprleft;
oprright = opform->oprright;
@@ -166,7 +166,7 @@ MJFormSkipQual(List *qualList, char * replaceopname)
CharGetDatum('b'));
if (!HeapTupleIsValid(optup))
elog(ERROR,
- "MJFormSkipQual: mergejoin operator %d has no matching %s op",
+ "MJFormSkipQual: mergejoin operator %u has no matching %s op",
op->opno, replaceopname);
opform = (Form_pg_operator) GETSTRUCT(optup);
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index 3dcfc765b37..8c9dcae52d2 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: be-dumpdata.c,v 1.22 1999/02/13 23:15:39 momjian Exp $
+ * $Id: be-dumpdata.c,v 1.23 1999/05/10 00:45:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -140,7 +140,7 @@ be_newportal(void)
if (be_portalcnt == 0)
be_portaloid = newoid();
be_portalcnt++;
- snprintf(buf, PortalNameLength, "be_%d_%d", be_portaloid, be_portalcnt);
+ snprintf(buf, PortalNameLength, "be_%u_%d", be_portaloid, be_portalcnt);
/* ----------------
* initialize the new portal entry and keep track
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index dec9c7ad6a6..8a063cf1eaf 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.31 1999/05/09 15:00:18 ishii Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.32 1999/05/10 00:45:09 momjian Exp $
*
* NOTES
* This should be moved to a more appropriate place. It is here
@@ -68,7 +68,7 @@ lo_open(Oid lobjId, int mode)
MemoryContext currentContext;
#if FSDB
- elog(NOTICE, "LOopen(%d,%d)", lobjId, mode);
+ elog(NOTICE, "LOopen(%u,%d)", lobjId, mode);
#endif
if (fscxt == NULL)
@@ -81,7 +81,7 @@ lo_open(Oid lobjId, int mode)
{ /* lookup failed */
MemoryContextSwitchTo(currentContext);
#if FSDB
- elog(NOTICE, "cannot open large object %d", lobjId);
+ elog(NOTICE, "cannot open large object %u", lobjId);
#endif
return -1;
}
@@ -375,8 +375,7 @@ lo_export(Oid lobjId, text *filename)
lobj = inv_open(lobjId, INV_READ);
if (lobj == NULL)
{
- elog(ERROR, "lo_export: can't open inv object %d",
- lobjId);
+ elog(ERROR, "lo_export: can't open inv object %u", lobjId);
}
/*
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 3de9b7bda1a..07ea3d868a8 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: outfuncs.c,v 1.79 1999/04/25 03:19:15 tgl Exp $
+ * $Id: outfuncs.c,v 1.80 1999/05/10 00:45:10 momjian Exp $
*
* NOTES
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -197,7 +197,7 @@ _outQuery(StringInfo str, Query *node)
}
appendStringInfo(str,
- " :resultRelation %d :into %s :isPortal %s :isBinary %s :isTemp %s :unionall %s ",
+ " :resultRelation %u :into %s :isPortal %s :isBinary %s :isTemp %s :unionall %s ",
node->resultRelation,
stringStringInfo(node->into),
node->isPortal ? "true" : "false",
@@ -333,7 +333,7 @@ _outAppend(StringInfo str, Append *node)
_outNode(str, node->unionrtables);
appendStringInfo(str,
- " :inheritrelid %d :inheritrtable ",
+ " :inheritrelid %u :inheritrtable ",
node->inheritrelid);
_outNode(str, node->inheritrtable);
@@ -425,7 +425,7 @@ _outScan(StringInfo str, Scan *node)
appendStringInfo(str, " SCAN ");
_outPlanInfo(str, (Plan *) node);
- appendStringInfo(str, " :scanrelid %d ", node->scanrelid);
+ appendStringInfo(str, " :scanrelid %u ", node->scanrelid);
}
/*
@@ -437,7 +437,7 @@ _outSeqScan(StringInfo str, SeqScan *node)
appendStringInfo(str, " SEQSCAN ");
_outPlanInfo(str, (Plan *) node);
- appendStringInfo(str, " :scanrelid %d ", node->scanrelid);
+ appendStringInfo(str, " :scanrelid %u ", node->scanrelid);
}
/*
@@ -449,7 +449,7 @@ _outIndexScan(StringInfo str, IndexScan *node)
appendStringInfo(str, " INDEXSCAN ");
_outPlanInfo(str, (Plan *) node);
- appendStringInfo(str, " :scanrelid %d :indxid ", node->scan.scanrelid);
+ appendStringInfo(str, " :scanrelid %u :indxid ", node->scan.scanrelid);
_outIntList(str, node->indxid);
appendStringInfo(str, " :indxqual ");
@@ -1108,13 +1108,13 @@ static void
_outMergeOrder(StringInfo str, MergeOrder *node)
{
appendStringInfo(str,
- " MERGEORDER :join_operator %d :left_operator %d :right_operator %d ",
+ " MERGEORDER :join_operator %u :left_operator %u :right_operator %u ",
node->join_operator,
node->left_operator,
node->right_operator);
appendStringInfo(str,
- " :left_type %d :right_type %d ",
+ " :left_type %u :right_type %u ",
node->left_type,
node->right_type);
}
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index 7d8e6e64b45..97d3c46a8e6 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.26 1999/03/23 16:50:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.27 1999/05/10 00:45:13 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -140,7 +140,7 @@ print_rt(List *rtable)
{
RangeTblEntry *rte = lfirst(l);
- printf("%d\t%s(%s)\t%d\t%d\t%s\n",
+ printf("%d\t%s(%s)\t%u\t%d\t%s\n",
i, rte->relname, rte->refname, rte->relid,
rte->inFromCl,
(rte->inh ? "inh" : ""));
diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c
index 8aa75468982..f365cdcd1b5 100644
--- a/src/backend/optimizer/path/_deadcode/xfunc.c
+++ b/src/backend/optimizer/path/_deadcode/xfunc.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.1 1999/02/18 00:49:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.2 1999/05/10 00:45:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -497,7 +497,7 @@ xfunc_func_expense(LispValue node, LispValue args)
ObjectIdGetDatum(funcid),
0, 0, 0);
if (!HeapTupleIsValid(tupl))
- elog(ERROR, "Cache lookup failed for procedure %d", funcid);
+ elog(ERROR, "Cache lookup failed for procedure %u", funcid);
proc = (Form_pg_proc) GETSTRUCT(tupl);
/*
@@ -612,7 +612,7 @@ xfunc_width(LispValue clause)
ObjectIdGetDatum(get_vartype((Var) clause)),
0, 0, 0);
if (!HeapTupleIsValid(tupl))
- elog(ERROR, "Cache lookup failed for type %d",
+ elog(ERROR, "Cache lookup failed for type %u",
get_vartype((Var) clause));
type = (Form_pg_type) GETSTRUCT(tupl);
if (get_varattno((Var) clause) == 0)
@@ -675,7 +675,7 @@ xfunc_width(LispValue clause)
ObjectIdGetDatum(get_opno((Oper) get_op(clause))),
0, 0, 0);
if (!HeapTupleIsValid(tupl))
- elog(ERROR, "Cache lookup failed for procedure %d",
+ elog(ERROR, "Cache lookup failed for procedure %u",
get_opno((Oper) get_op(clause)));
return (xfunc_func_width
((RegProcedure) (((Form_pg_operator) (GETSTRUCT(tupl)))->oprcode),
@@ -1306,7 +1306,7 @@ xfunc_func_width(RegProcedure funcid, LispValue args)
ObjectIdGetDatum(funcid),
0, 0, 0);
if (!HeapTupleIsValid(tupl))
- elog(ERROR, "Cache lookup failed for procedure %d", funcid);
+ elog(ERROR, "Cache lookup failed for procedure %u", funcid);
proc = (Form_pg_proc) GETSTRUCT(tupl);
/* if function returns a tuple, get the width of that */
@@ -1324,7 +1324,7 @@ xfunc_func_width(RegProcedure funcid, LispValue args)
ObjectIdGetDatum(proc->prorettype),
0, 0, 0);
if (!HeapTupleIsValid(tupl))
- elog(ERROR, "Cache lookup failed for type %d", proc->prorettype);
+ elog(ERROR, "Cache lookup failed for type %u", proc->prorettype);
type = (Form_pg_type) GETSTRUCT(tupl);
/* if the type length is known, return that */
if (type->typlen != -1)
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index abf77b9db6a..93d0b82071a 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.53 1999/05/06 01:30:58 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.54 1999/05/10 00:45:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -367,8 +367,7 @@ create_indexscan_node(IndexPath *best_path,
ObjectIdGetDatum(lfirsti(ixid)),
0, 0, 0);
if (!HeapTupleIsValid(indexTuple))
- elog(ERROR, "create_plan: index %d not found",
- lfirsti(ixid));
+ elog(ERROR, "create_plan: index %u not found", lfirsti(ixid));
index = (Form_pg_index) GETSTRUCT(indexTuple);
if (index->indislossy)
lossy = TRUE;
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 323d2c61b12..50d93942ec8 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.49 1999/05/04 00:00:20 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.50 1999/05/10 00:45:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -720,7 +720,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
/* by here, the function is declared to return some type */
if ((typ = typeidType(rettype)) == NULL)
- elog(ERROR, "can't find return type %d for function\n", rettype);
+ elog(ERROR, "can't find return type %u for function\n", rettype);
/*
* test 3: if the function is declared to return a value, then the
@@ -770,7 +770,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
reln = heap_open(typeTypeRelid(typ));
if (!RelationIsValid(reln))
- elog(ERROR, "cannot open relation relid %d", typeTypeRelid(typ));
+ elog(ERROR, "cannot open relation relid %u", typeTypeRelid(typ));
relid = reln->rd_id;
relnatts = reln->rd_rel->relnatts;
@@ -918,7 +918,7 @@ need_sortplan(List *sortcls, Plan *plan)
htup = SearchSysCacheTuple(INDEXRELID,
ObjectIdGetDatum(indexId), 0, 0, 0);
if (!HeapTupleIsValid(htup)) {
- elog(ERROR, "cache lookup for index %d failed", indexId);
+ elog(ERROR, "cache lookup for index %u failed", indexId);
}
index_tup = (Form_pg_index) GETSTRUCT(htup);
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index 5e1606bd2e5..a4b67ba6e0e 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -311,8 +311,7 @@ _finalize_primnode(void *expr, List **subplan)
}
}
else
- elog(ERROR, "_finalize_primnode: can't handle node %d",
- nodeTag(expr));
+ elog(ERROR, "_finalize_primnode: can't handle node %d", nodeTag(expr));
return result;
}
@@ -543,8 +542,7 @@ SS_pull_subplan(Node *expr)
else if (is_subplan(expr))
return lcons(((Expr *) expr)->oper, NULL);
else
- elog(ERROR, "SS_pull_subplan: can't handle node %d",
- nodeTag(expr));
+ elog(ERROR, "SS_pull_subplan: can't handle node %d", nodeTag(expr));
return result;
}
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 113f78103b6..0dbd65cd5d4 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.32 1999/03/01 00:10:35 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.33 1999/05/10 00:45:24 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -786,7 +786,7 @@ CommuteClause(Node *clause)
get_operator_tuple(get_commutator(((Oper *) ((Expr *) clause)->oper)->opno));
if (heapTup == (HeapTuple) NULL)
- elog(ERROR, "CommuteClause: no commutator for operator %d",
+ elog(ERROR, "CommuteClause: no commutator for operator %u",
((Oper *) ((Expr *) clause)->oper)->opno);
commuTup = (Form_pg_operator) GETSTRUCT(heapTup);
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 710b627bbe2..a1f6026b0ed 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.28 1999/03/18 19:59:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.29 1999/05/10 00:45:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -76,7 +76,7 @@ relation_info(Query *root, Index relid,
}
else
{
- elog(ERROR, "RelationCatalogInformation: Relation %d not found",
+ elog(ERROR, "RelationCatalogInformation: Relation %u not found",
relationObjectId);
}
@@ -217,7 +217,7 @@ index_info(Query *root, bool first, int relid, IdxInfoRetval *info)
UInt16GetDatum(amstrategy),
0);
if (!HeapTupleIsValid(amopTuple))
- elog(ERROR, "index_info: no amop %d %d %d",
+ elog(ERROR, "index_info: no amop %u %u %d",
relam, index->indclass[i], amstrategy);
info->orderOprs[i] = ((Form_pg_amop) GETSTRUCT(amopTuple))->amopopr;
}
@@ -521,7 +521,7 @@ IndexSelectivity(Oid indexrelid,
ObjectIdGetDatum(indexrelid),
0, 0, 0);
if (!HeapTupleIsValid(indRel))
- elog(ERROR, "IndexSelectivity: index %d not found",
+ elog(ERROR, "IndexSelectivity: index %u not found",
indexrelid);
relam = ((Form_pg_class) GETSTRUCT(indRel))->relam;
@@ -529,7 +529,7 @@ IndexSelectivity(Oid indexrelid,
ObjectIdGetDatum(indexrelid),
0, 0, 0);
if (!HeapTupleIsValid(indexTuple))
- elog(ERROR, "IndexSelectivity: index %d not found",
+ elog(ERROR, "IndexSelectivity: index %u not found",
indexrelid);
index = (Form_pg_index) GETSTRUCT(indexTuple);
@@ -572,7 +572,7 @@ IndexSelectivity(Oid indexrelid,
* clause and so had no variable to match to the index key ...
* if not we are in trouble.
*/
- elog(NOTICE, "IndexSelectivity: no key %d in index %d",
+ elog(NOTICE, "IndexSelectivity: no key %d in index %u",
varAttributeNumbers[n], indexrelid);
continue;
}
@@ -583,7 +583,7 @@ IndexSelectivity(Oid indexrelid,
ObjectIdGetDatum(relam),
0);
if (!HeapTupleIsValid(amopTuple))
- elog(ERROR, "IndexSelectivity: no amop %d %d",
+ elog(ERROR, "IndexSelectivity: no amop %u %u",
indclass, operatorObjectIds[n]);
amop = (Form_pg_amop) GETSTRUCT(amopTuple);
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index df9077616cd..6f672222ad1 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.11 1999/02/21 03:49:03 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.12 1999/05/10 00:45:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -42,8 +42,8 @@ coerce_type(ParseState *pstate, Node *node, Oid inputTypeId, Oid targetTypeId)
Datum val;
#ifdef PARSEDEBUG
- printf("coerce_type: argument types are %d -> %d\n",
- inputTypeId, targetTypeId);
+ printf("coerce_type: argument types are %d -> %u\n",
+ inputTypeId, targetTypeId);
#endif
if (targetTypeId == InvalidOid)
@@ -129,7 +129,7 @@ coerce_type(ParseState *pstate, Node *node, Oid inputTypeId, Oid targetTypeId)
else
{
#ifdef PARSEDEBUG
- printf("coerce_type: argument type IDs %d match\n", inputTypeId);
+ printf("coerce_type: argument type IDs %u match\n", inputTypeId);
#endif
result = node;
@@ -165,7 +165,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
for (i = 0; i < nargs; i++)
{
#ifdef PARSEDEBUG
- printf("can_coerce_type: argument #%d types are %d -> %d\n",
+ printf("can_coerce_type: argument #%d types are %u -> %u\n",
i, input_typeids[i], func_typeids[i]);
#endif
if (input_typeids[i] != func_typeids[i])
@@ -187,7 +187,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
else if (func_typeids[i] == InvalidOid)
{
#ifdef PARSEDEBUG
- printf("can_coerce_type: output OID func_typeids[%d] is zero\n", i);
+ printf("can_coerce_type: output OID func_typeids[%u] is zero\n", i);
#endif
return false;
}
@@ -196,7 +196,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
else if (input_typeids[i] == InvalidOid)
{
#ifdef PARSEDEBUG
- printf("can_coerce_type: input OID input_typeids[%d] is zero\n", i);
+ printf("can_coerce_type: input OID input_typeids[%u] is zero\n", i);
#endif
return false;
}
@@ -243,7 +243,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
else
{
#ifdef PARSEDEBUG
- printf("can_coerce_type: argument #%d type is %d (UNKNOWN)\n",
+ printf("can_coerce_type: argument #%d type is %u (UNKNOWN)\n",
i, input_typeids[i]);
#endif
}
@@ -266,7 +266,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids)
else
{
#ifdef PARSEDEBUG
- printf("can_coerce_type: argument #%d type IDs %d match\n",
+ printf("can_coerce_type: argument #%d type IDs %u match\n",
i, input_typeids[i]);
#endif
}
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index e683c15a9d9..dcbd02a7029 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.42 1999/03/16 20:15:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.43 1999/05/10 00:45:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -651,7 +651,7 @@ funcid_get_rettype(Oid funcid)
0, 0, 0);
if (!HeapTupleIsValid(func_tuple))
- elog(ERROR, "Function OID %d does not exist", funcid);
+ elog(ERROR, "Function OID %u does not exist", funcid);
funcrettype = (Oid)
((Form_pg_proc) GETSTRUCT(func_tuple))->prorettype;
@@ -1183,7 +1183,7 @@ find_inheritors(Oid relid, Oid **supervec)
/* save the type id, rather than the relation id */
if ((rd = heap_open(qentry->sqe_relid)) == (Relation) NULL)
- elog(ERROR, "Relid %d does not exist", qentry->sqe_relid);
+ elog(ERROR, "Relid %u does not exist", qentry->sqe_relid);
qentry->sqe_relid = typeTypeId(typenameType(RelationGetRelationName(rd)->data));
heap_close(rd);
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 9665fa379e4..c16f6a73559 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.24 1999/02/13 23:17:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.25 1999/05/10 00:45:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -256,7 +256,7 @@ make_array_ref(Node *expr,
0, 0, 0);
if (!HeapTupleIsValid(type_tuple))
- elog(ERROR, "make_array_ref: Cache lookup failed for type %d\n",
+ elog(ERROR, "make_array_ref: Cache lookup failed for type %u\n",
typearray);
/* get the array type struct from the type tuple */
@@ -271,7 +271,7 @@ make_array_ref(Node *expr,
ObjectIdGetDatum(type_struct_array->typelem),
0, 0, 0);
if (!HeapTupleIsValid(type_tuple))
- elog(ERROR, "make_array_ref: Cache lookup failed for type %d\n",
+ elog(ERROR, "make_array_ref: Cache lookup failed for type %u\n",
typearray);
type_struct_element = (Form_pg_type) GETSTRUCT(type_tuple);
@@ -338,7 +338,7 @@ make_array_set(Expr *target_expr,
0, 0, 0);
if (!HeapTupleIsValid(type_tuple))
- elog(ERROR, "make_array_ref: Cache lookup failed for type %d\n",
+ elog(ERROR, "make_array_ref: Cache lookup failed for type %u\n",
typearray);
/* get the array type struct from the type tuple */
@@ -353,7 +353,7 @@ make_array_set(Expr *target_expr,
0, 0, 0);
if (!HeapTupleIsValid(type_tuple))
- elog(ERROR, "make_array_ref: Cache lookup failed for type %d\n",
+ elog(ERROR, "make_array_ref: Cache lookup failed for type %u\n",
typearray);
type_struct_element = (Form_pg_type) GETSTRUCT(type_tuple);
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index d91e72be5a3..6e039517603 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.23 1998/12/13 23:54:40 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.24 1999/05/10 00:45:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -631,7 +631,7 @@ right_oper(char *op, Oid arg)
ncandidates = unary_oper_get_candidates(op, arg, &candidates, 'r');
if (ncandidates == 0)
{
- elog(ERROR, "Can't find right op '%s' for type %d", op, arg);
+ elog(ERROR, "Can't find right op '%s' for type %u", op, arg);
return NULL;
}
else if (ncandidates == 1)
@@ -693,7 +693,7 @@ left_oper(char *op, Oid arg)
ncandidates = unary_oper_get_candidates(op, arg, &candidates, 'l');
if (ncandidates == 0)
{
- elog(ERROR, "Can't find left op '%s' for type %d", op, arg);
+ elog(ERROR, "Can't find left op '%s' for type %u", op, arg);
return NULL;
}
else if (ncandidates == 1)
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index f2dddee9765..6f77c0e8763 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.19 1999/02/23 07:53:01 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.20 1999/05/10 00:45:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -231,7 +231,7 @@ GetArrayElementType(Oid typearray)
0, 0, 0);
if (!HeapTupleIsValid(type_tuple))
- elog(ERROR, "GetArrayElementType: Cache lookup failed for type %d",
+ elog(ERROR, "GetArrayElementType: Cache lookup failed for type %u",
typearray);
/* get the array type struct from the type tuple */
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index e9c4d7af2ff..1053df421ee 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.26 1999/02/21 03:49:17 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.27 1999/05/10 00:45:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -122,7 +122,7 @@ InsertRule(char *rulname,
template = "INSERT INTO pg_rewrite \
(rulename, ev_type, ev_class, ev_attr, ev_action, ev_qual, is_instead) VALUES \
-('%s', %d::char, %d::oid, %d::int2, '%s'::text, '%s'::text, \
+('%s', %d::char, %u::oid, %d::int2, '%s'::text, '%s'::text, \
'%s'::bool);";
if (strlen(template) + strlen(rulname) + strlen(actionbuf) +
strlen(qualbuf) + 20 /* fudge fac */ > RULE_PLAN_SIZE)
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index 3765339b1d8..ceb43cba6ae 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.22 1999/02/13 23:17:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.23 1999/05/10 00:45:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,8 +48,8 @@ RewriteGetRuleEventRel(char *rulename)
PointerGetDatum(eventrel),
0, 0, 0);
if (!HeapTupleIsValid(htup))
- elog(ERROR, "Class '%d' not found",
- eventrel);
+ elog(ERROR, "Class '%u' not found", eventrel);
+
return ((Form_pg_class) GETSTRUCT(htup))->relname.data;
}
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 04c1f4813d2..c1040cfc16f 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.50 1999/03/28 20:32:17 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.51 1999/05/10 00:45:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1828,7 +1828,7 @@ _bm_die(Oid dbId, Oid relId, int blkNo, int bufNo,
tb = &TraceBuf[i];
if (tb->bmt_op != BMT_NOTUSED)
{
- fprintf(fp, " [%3d]%spid %d buf %2d for <%d,%d,%d> ",
+ fprintf(fp, " [%3d]%spid %d buf %2d for <%d,%u,%d> ",
i, (i == cur ? " ---> " : "\t"),
tb->bmt_pid, tb->bmt_buf,
tb->bmt_dbid, tb->bmt_relid, tb->bmt_blkno);
@@ -1859,7 +1859,7 @@ _bm_die(Oid dbId, Oid relId, int blkNo, int bufNo,
}
fprintf(fp, "\noperation causing error:\n");
- fprintf(fp, "\tpid %d buf %d for <%d,%d,%d> ",
+ fprintf(fp, "\tpid %d buf %d for <%d,%u,%d> ",
getpid(), bufNo, dbId, relId, blkNo);
switch (allocType)
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index 81c16d36e98..c9fcf506bc5 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -15,7 +15,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.21 1999/02/13 23:18:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.22 1999/05/10 00:45:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -81,7 +81,7 @@ LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool *foundPtr)
{
#ifdef LBDEBUG
- fprintf(stderr, "LB ALLOC (%d,%d) %d\n",
+ fprintf(stderr, "LB ALLOC (%u,%d) %d\n",
RelationGetRelid(reln), blockNum, -i - 1);
#endif
LocalRefCount[i]++;
@@ -91,7 +91,7 @@ LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool *foundPtr)
}
#ifdef LBDEBUG
- fprintf(stderr, "LB ALLOC (%d,%d) %d\n",
+ fprintf(stderr, "LB ALLOC (%u,%d) %d\n",
RelationGetRelid(reln), blockNum, -nextFreeLocalBuf - 1);
#endif
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index c5dcea61aef..4e5ab146bb5 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.17 1999/02/19 06:06:03 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.18 1999/05/10 00:45:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -145,8 +145,7 @@ SIAssignBackendId(SISeg *segInOutP, BackendTag backendTag)
{
if (segInOutP->procState[index].tag == backendTag)
{
- elog(FATAL, "SIAssignBackendId: tag %d found twice",
- backendTag);
+ elog(FATAL, "SIAssignBackendId: tag %d found twice", backendTag);
}
}
@@ -155,15 +154,10 @@ SIAssignBackendId(SISeg *segInOutP, BackendTag backendTag)
if (stateP->tag != InvalidBackendTag)
{
if (stateP->tag == backendTag)
- {
- elog(NOTICE, "SIAssignBackendId: reusing tag %d",
- backendTag);
- }
+ elog(NOTICE, "SIAssignBackendId: reusing tag %d", backendTag);
else
{
- elog(NOTICE,
- "SIAssignBackendId: discarding tag %d",
- stateP->tag);
+ elog(NOTICE, "SIAssignBackendId: discarding tag %d", stateP->tag);
return InvalidBackendTag;
}
}
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index a56214356ac..79df2912b9b 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.51 1999/03/14 16:08:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.52 1999/05/10 00:45:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -119,8 +119,8 @@ inv_create(int flags)
file_oid = newoid() + 1;
/* come up with some table names */
- sprintf(objname, "xinv%d", file_oid);
- sprintf(indname, "xinx%d", file_oid);
+ sprintf(objname, "xinv%u", file_oid);
+ sprintf(indname, "xinx%u", file_oid);
if (RelnameFindRelid(objname) != InvalidOid)
{
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index c1996fe0713..6c3437837df 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.50 1999/05/07 01:23:03 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.51 1999/05/10 00:45:43 momjian Exp $
*
* NOTES
* Outside modules can create a lock table and acquire/release
@@ -83,7 +83,7 @@ static int WaitOnLock(LOCKMETHOD lockmethod, LOCK *lock, LOCKMODE lockmode);
#define LOCK_PRINT_AUX(where,lock,type) \
TPRINTF(TRACE_ALL, \
- "%s: lock(%x) tbl(%d) rel(%d) db(%d) obj(%u) mask(%x) " \
+ "%s: lock(%x) tbl(%d) rel(%u) db(%d) obj(%u) mask(%x) " \
"hold(%d,%d,%d,%d,%d)=%d " \
"act(%d,%d,%d,%d,%d)=%d wait(%d) type(%s)", \
where, \
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 5dd71b2b9e2..23f2bd7a272 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.23 1999/04/25 03:19:10 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.24 1999/05/10 00:45:46 momjian Exp $
*
* NOTES
* This cruft is the server side of PQfn.
@@ -214,7 +214,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
0, 0, 0);
if (!HeapTupleIsValid(func_htp))
{
- elog(ERROR, "update_fp_info: cache lookup for function %d failed",
+ elog(ERROR, "update_fp_info: cache lookup for function %u failed",
func_id);
}
pp = (Form_pg_proc) GETSTRUCT(func_htp);
@@ -231,7 +231,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
0, 0, 0);
if (!HeapTupleIsValid(type_htp))
{
- elog(ERROR, "update_fp_info: bad argument type %d for %d",
+ elog(ERROR, "update_fp_info: bad argument type %u for %u",
argtypes[i], func_id);
}
tp = (Form_pg_type) GETSTRUCT(type_htp);
@@ -247,7 +247,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
0, 0, 0);
if (!HeapTupleIsValid(type_htp))
{
- elog(ERROR, "update_fp_info: bad return type %d for %d",
+ elog(ERROR, "update_fp_info: bad return type %u for %u",
rettype, func_id);
}
tp = (Form_pg_type) GETSTRUCT(type_htp);
diff --git a/src/backend/tioga/tgRecipe.c b/src/backend/tioga/tgRecipe.c
index 855665159b6..ac95c178499 100644
--- a/src/backend/tioga/tgRecipe.c
+++ b/src/backend/tioga/tgRecipe.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.11 1999/02/13 23:18:53 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.12 1999/05/10 00:45:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -486,7 +486,7 @@ connectTee(TgRecipe * r, TgNodePtr fromNode, TgNodePtr toNode,
tn = malloc(sizeof(TgNode));
/* generate a name for the tee node table */
tn->nodeName = malloc(50);
- sprintf(tn->nodeName, "tee_%d", newoid());
+ sprintf(tn->nodeName, "tee_%u", newoid());
/* tn->nodeName = NULL; */
tn->nodeType = TG_TEE_NODE;
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 948b7092753..41f02797a7f 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.41 1999/05/05 21:38:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.42 1999/05/10 00:45:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1475,7 +1475,7 @@ system_cache_lookup(Oid element_type,
if (!HeapTupleIsValid(typeTuple))
{
- elog(ERROR, "array_out: Cache lookup failed for type %d\n",
+ elog(ERROR, "array_out: Cache lookup failed for type %u\n",
element_type);
return;
}
@@ -1882,7 +1882,7 @@ _array_newLO(int *fd, int flag)
char saveName[NAME_LEN];
p = (char *) palloc(NAME_LEN);
- sprintf(p, "/Arry.%d", newoid());
+ sprintf(p, "/Arry.%u", newoid());
strcpy(saveName, p);
#ifdef LOARRAY
if ((*fd = LOcreat(saveName, 0600, flag)) < 0)
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index 74ae4eb63b5..8cee64521a2 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.22 1999/02/13 23:19:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.23 1999/05/10 00:45:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -38,7 +38,7 @@ oid8in(char *oidString)
return NULL;
result = (Oid *) palloc(sizeof(Oid[8]));
- if ((nums = sscanf(oidString, "%d%d%d%d%d%d%d%d",
+ if ((nums = sscanf(oidString, "%u%u%u%u%u%u%u%u",
&result[0],
&result[1],
&result[2],
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 42f8ffdacaa..2e6276f4e2f 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.35 1999/02/15 16:29:32 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.36 1999/05/10 00:45:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -229,7 +229,7 @@ regprocout(RegProcedure proid)
if (!isnull)
StrNCpy(result, s, NAMEDATALEN);
else
- elog(FATAL, "regprocout: null procedure %d", proid);
+ elog(FATAL, "regprocout: null procedure %u", proid);
}
else
{
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 4d88413a8e4..016d835ade5 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -3,7 +3,7 @@
* out of it's tuple
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.10 1999/05/03 19:10:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.11 1999/05/10 00:45:59 momjian Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -373,7 +373,7 @@ pg_get_indexdef(Oid indexrelid)
ht_idx = SearchSysCacheTuple(INDEXRELID,
ObjectIdGetDatum(indexrelid), 0, 0, 0);
if (!HeapTupleIsValid(ht_idx))
- elog(ERROR, "syscache lookup for index %d failed", indexrelid);
+ elog(ERROR, "syscache lookup for index %u failed", indexrelid);
idxrec = (Form_pg_index)GETSTRUCT(ht_idx);
/* ----------
@@ -383,7 +383,7 @@ pg_get_indexdef(Oid indexrelid)
ht_idxrel = SearchSysCacheTuple(RELOID,
ObjectIdGetDatum(idxrec->indexrelid), 0, 0, 0);
if (!HeapTupleIsValid(ht_idxrel))
- elog(ERROR, "syscache lookup for relid %d failed", idxrec->indexrelid);
+ elog(ERROR, "syscache lookup for relid %u failed", idxrec->indexrelid);
idxrelrec = (Form_pg_class)GETSTRUCT(ht_idxrel);
/* ----------
@@ -393,7 +393,7 @@ pg_get_indexdef(Oid indexrelid)
ht_indrel = SearchSysCacheTuple(RELOID,
ObjectIdGetDatum(idxrec->indrelid), 0, 0, 0);
if (!HeapTupleIsValid(ht_indrel))
- elog(ERROR, "syscache lookup for relid %d failed", idxrec->indrelid);
+ elog(ERROR, "syscache lookup for relid %u failed", idxrec->indrelid);
indrelrec = (Form_pg_class)GETSTRUCT(ht_indrel);
/* ----------
@@ -459,9 +459,9 @@ pg_get_indexdef(Oid indexrelid)
spi_nulls[1] = '\0';
spirc = SPI_execp(plan_getopclass, spi_args, spi_nulls, 1);
if (spirc != SPI_OK_SELECT)
- elog(ERROR, "failed to get pg_opclass tuple %d", idxrec->indclass[keyno]);
+ elog(ERROR, "failed to get pg_opclass tuple %u", idxrec->indclass[keyno]);
if (SPI_processed != 1)
- elog(ERROR, "failed to get pg_opclass tuple %d", idxrec->indclass[keyno]);
+ elog(ERROR, "failed to get pg_opclass tuple %u", idxrec->indclass[keyno]);
spi_tup = SPI_tuptable->vals[0];
spi_ttc = SPI_tuptable->tupdesc;
spi_fno = SPI_fnumber(spi_ttc, "opcname");
@@ -483,7 +483,7 @@ pg_get_indexdef(Oid indexrelid)
proctup = SearchSysCacheTuple(PROOID,
ObjectIdGetDatum(idxrec->indproc), 0, 0, 0);
if (!HeapTupleIsValid(proctup))
- elog(ERROR, "cache lookup for proc %d failed", idxrec->indproc);
+ elog(ERROR, "cache lookup for proc %u failed", idxrec->indproc);
procStruct = (Form_pg_proc) GETSTRUCT(proctup);
strcat(buf, "\"");
@@ -497,9 +497,9 @@ pg_get_indexdef(Oid indexrelid)
spi_nulls[1] = '\0';
spirc = SPI_execp(plan_getopclass, spi_args, spi_nulls, 1);
if (spirc != SPI_OK_SELECT)
- elog(ERROR, "failed to get pg_opclass tuple %d", idxrec->indclass[0]);
+ elog(ERROR, "failed to get pg_opclass tuple %u", idxrec->indclass[0]);
if (SPI_processed != 1)
- elog(ERROR, "failed to get pg_opclass tuple %d", idxrec->indclass[0]);
+ elog(ERROR, "failed to get pg_opclass tuple %u", idxrec->indclass[0]);
spi_tup = SPI_tuptable->vals[0];
spi_ttc = SPI_tuptable->tupdesc;
spi_fno = SPI_fnumber(spi_ttc, "opcname");
@@ -1424,7 +1424,7 @@ get_func_expr(QryHier *qh, int rt_index, Expr *expr, bool varprefix)
proctup = SearchSysCacheTuple(PROOID,
ObjectIdGetDatum(func->funcid), 0, 0, 0);
if (!HeapTupleIsValid(proctup))
- elog(ERROR, "cache lookup for proc %d failed", func->funcid);
+ elog(ERROR, "cache lookup for proc %u failed", func->funcid);
procStruct = (Form_pg_proc) GETSTRUCT(proctup);
proname = nameout(&(procStruct->proname));
@@ -1516,7 +1516,7 @@ get_tle_expr(QryHier *qh, int rt_index, TargetEntry *tle, bool varprefix)
proctup = SearchSysCacheTuple(PROOID,
ObjectIdGetDatum(func->funcid), 0, 0, 0);
if (!HeapTupleIsValid(proctup))
- elog(ERROR, "cache lookup for proc %d failed", func->funcid);
+ elog(ERROR, "cache lookup for proc %u failed", func->funcid);
procStruct = (Form_pg_proc) GETSTRUCT(proctup);
@@ -1676,7 +1676,7 @@ get_relation_name(Oid relid)
classtup = SearchSysCacheTuple(RELOID,
ObjectIdGetDatum(relid), 0, 0, 0);
if (!HeapTupleIsValid(classtup))
- elog(ERROR, "cache lookup of relation %d failed", relid);
+ elog(ERROR, "cache lookup of relation %u failed", relid);
classStruct = (Form_pg_class) GETSTRUCT(classtup);
return nameout(&(classStruct->relname));
@@ -1697,7 +1697,7 @@ get_attribute_name(Oid relid, int2 attnum)
atttup = SearchSysCacheTuple(ATTNUM,
ObjectIdGetDatum(relid), (Datum) attnum, 0, 0);
if (!HeapTupleIsValid(atttup))
- elog(ERROR, "cache lookup of attribute %d in relation %d failed",
+ elog(ERROR, "cache lookup of attribute %d in relation %u failed",
attnum, relid);
attStruct = (Form_pg_attribute) GETSTRUCT(atttup);
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index f7026ba158f..53310bf1b3e 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.26 1999/03/18 19:59:55 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.27 1999/05/10 00:46:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -286,7 +286,7 @@ getattdisbursion(Oid relid, AttrNumber attnum)
0, 0);
if (!HeapTupleIsValid(atp))
{
- elog(ERROR, "getattdisbursion: no attribute tuple %d %d",
+ elog(ERROR, "getattdisbursion: no attribute tuple %u %d",
relid, attnum);
return 0;
}
@@ -304,7 +304,7 @@ getattdisbursion(Oid relid, AttrNumber attnum)
*/
if (!HeapTupleIsValid(atp))
{
- elog(ERROR, "getattdisbursion: no relation tuple %d", relid);
+ elog(ERROR, "getattdisbursion: no relation tuple %u", relid);
return 0;
}
ntuples = ((Form_pg_class) GETSTRUCT(atp))->reltuples;
@@ -460,7 +460,7 @@ btreenpage(Oid operatorObjectId,
0, 0, 0);
if (!HeapTupleIsValid(atp))
{
- elog(ERROR, "btreenpage: no index tuple %d", indexrelid);
+ elog(ERROR, "btreenpage: no index tuple %u", indexrelid);
return 0;
}
@@ -499,7 +499,7 @@ hashsel(Oid operatorObjectId,
0, 0, 0);
if (!HeapTupleIsValid(atp))
{
- elog(ERROR, "hashsel: no index tuple %d", indexrelid);
+ elog(ERROR, "hashsel: no index tuple %u", indexrelid);
return 0;
}
ntuples = ((Form_pg_class) GETSTRUCT(atp))->reltuples;
@@ -552,7 +552,7 @@ hashnpage(Oid operatorObjectId,
0, 0, 0);
if (!HeapTupleIsValid(atp))
{
- elog(ERROR, "hashsel: no index tuple %d", indexrelid);
+ elog(ERROR, "hashsel: no index tuple %u", indexrelid);
return 0;
}
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 1edc7300993..869df05df7c 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.39 1999/02/13 23:19:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.40 1999/05/10 00:46:03 momjian Exp $
*
* Notes:
* XXX This needs to use exception.h to handle recovery when
@@ -183,7 +183,7 @@ CatalogCacheInitializeCache(struct catcache * cache,
cache->relationId = RelationGetRelid(relation);
tupdesc = cache->cc_tupdesc = RelationGetDescr(relation);
- CACHE3_elog(DEBUG, "CatalogCacheInitializeCache: relid %d, %d keys",
+ CACHE3_elog(DEBUG, "CatalogCacheInitializeCache: relid %u, %d keys",
cache->relationId, cache->cc_nkeys);
/* ----------------
@@ -650,7 +650,7 @@ SystemCacheRelationFlushed(Oid relId)
#ifdef CACHEDEBUG
#define InitSysCache_DEBUG1 \
do { \
- elog(DEBUG, "InitSysCache: rid=%d id=%d nkeys=%d size=%d\n", \
+ elog(DEBUG, "InitSysCache: rid=%u id=%d nkeys=%d size=%d\n", \
cp->relationId, cp->id, cp->cc_nkeys, cp->cc_size); \
for (i = 0; i < nkeys; i += 1) \
{ \
diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c
index 12ab4d883fc..c298de0a9e9 100644
--- a/src/backend/utils/cache/fcache.c
+++ b/src/backend/utils/cache/fcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.21 1999/02/13 23:19:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.22 1999/05/10 00:46:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -109,7 +109,7 @@ init_fcache(Oid foid,
if (!HeapTupleIsValid(procedureTuple))
elog(ERROR,
- "init_fcache: %s %d",
+ "init_fcache: %s %u",
"Cache lookup failed for procedure", foid);
/* ----------------
@@ -130,7 +130,7 @@ init_fcache(Oid foid,
if (!HeapTupleIsValid(typeTuple))
elog(ERROR,
- "init_fcache: %s %d",
+ "init_fcache: %s %u",
"Cache lookup failed for type",
(procedureStruct)->prorettype);
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index d1b46fd5e10..40155b36aa1 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.21 1999/02/13 23:19:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.22 1999/05/10 00:46:07 momjian Exp $
*
* Note - this code is real crufty...
*
@@ -215,7 +215,7 @@ RelationIdRegisterLocalInvalid(Oid relationId, Oid objectId)
* ----------------
*/
#ifdef INVALIDDEBUG
- elog(DEBUG, "RelationRegisterLocalInvalid(%d, %d)", relationId,
+ elog(DEBUG, "RelationRegisterLocalInvalid(%u, %u)", relationId,
objectId);
#endif /* defined(INVALIDDEBUG) */
@@ -359,7 +359,7 @@ elog(DEBUG,\
ItemPointerGetOffsetNumber(&message->any.catalog.pointerData))
#define InvalidationMessageRegisterSharedInvalid_DEBUG2 \
elog(DEBUG, \
- "InvalidationMessageRegisterSharedInvalid(r, %d, %d)", \
+ "InvalidationMessageRegisterSharedInvalid(r, %u, %u)", \
message->any.relation.relationId, \
message->any.relation.objectId)
#else
@@ -409,7 +409,7 @@ elog(DEBUG, "InvalidationMessageCacheInvalidate(c, %d, %d, [%d, %d])",\
ItemPointerGetBlockNumber(&message->any.catalog.pointerData),\
ItemPointerGetOffsetNumber(&message->any.catalog.pointerData))
#define InvalidationMessageCacheInvalidate_DEBUG2 \
- elog(DEBUG, "InvalidationMessageCacheInvalidate(r, %d, %d)", \
+ elog(DEBUG, "InvalidationMessageCacheInvalidate(r, %u, %u)", \
message->any.relation.relationId, \
message->any.relation.objectId)
#else
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 54c930173ce..05ca92094cc 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.25 1999/02/21 03:49:33 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.26 1999/05/10 00:46:07 momjian Exp $
*
* NOTES
* Eventually, the index information should go through here, too.
@@ -140,7 +140,7 @@ get_attisset(Oid relid, char *attname)
PointerGetDatum(attname),
0, 0);
if (!HeapTupleIsValid(tuple))
- elog(ERROR, "get_attisset: no attribute %s in relation %d",
+ elog(ERROR, "get_attisset: no attribute %s in relation %u",
attname, relid);
if (heap_attisnull(tuple, attno))
return false;
@@ -218,7 +218,7 @@ get_opname(Oid opno)
{
/* don't throw an error anymore; we want to continue... */
#ifdef NOT_USED
- elog(ERROR, "can't look up operator %d\n", opno);
+ elog(ERROR, "can't look up operator %u\n", opno);
#endif
return NULL;
}
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 38edc3a790a..4affb0f6aec 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.60 1999/05/01 19:09:44 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.61 1999/05/10 00:46:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -280,7 +280,7 @@ BuildDescInfoError(RelationBuildDescInfo buildinfo)
switch (buildinfo.infotype)
{
case INFO_RELID:
- sprintf(errBuf, "(relation id %d)", buildinfo.i.info_id);
+ sprintf(errBuf, "(relation id %u)", buildinfo.i.info_id);
break;
case INFO_RELNAME:
sprintf(errBuf, "(relation name %s)", buildinfo.i.info_name);
@@ -545,7 +545,7 @@ build_tupdesc_seq(RelationBuildDescInfo buildinfo,
}
if (need > 0)
- elog(ERROR, "catalog is missing %d attribute%s for relid %d",
+ elog(ERROR, "catalog is missing %d attribute%s for relid %u",
need, (need == 1 ? "" : "s"), RelationGetRelid(relation));
/* ----------------
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index eea197d3469..588f378b5de 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.43 1999/04/25 21:50:57 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.44 1999/05/10 00:46:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -302,8 +302,7 @@ DebugFileOpen(void)
fd = fileno(stderr);
if (fcntl(fd, F_GETFD, 0) < 0)
{
- sprintf(OutputFileName, "%s/pg.errors.%d",
- DataDir, (int) MyProcPid);
+ sprintf(OutputFileName, "%s/pg.errors.%d", DataDir, (int) MyProcPid);
fd = open(OutputFileName, O_CREAT | O_APPEND | O_WRONLY, 0666);
}
if (fd < 0)
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index fd49fbe5af8..29949caad2a 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.23 1999/02/13 23:19:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.24 1999/05/10 00:46:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -74,7 +74,7 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
0, 0, 0);
if (!HeapTupleIsValid(procedureTuple))
{
- elog(ERROR, "fmgr: Cache lookup failed for procedure %d\n",
+ elog(ERROR, "fmgr: Cache lookup failed for procedure %u\n",
procedureId);
return (func_ptr) NULL;
}
@@ -104,7 +104,7 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
if (!PointerIsValid(probinattr) /* || isnull */ )
{
heap_close(rel);
- elog(ERROR, "fmgr: Could not extract probin for %d from %s",
+ elog(ERROR, "fmgr: Could not extract probin for %u from %s",
procedureId, ProcedureRelationName);
return (func_ptr) NULL;
}
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index c88d4994b28..5b0de72c685 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.25 1999/04/09 22:35:42 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.26 1999/05/10 00:46:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -57,7 +57,7 @@ fmgr_pl(char *arg0,...)
if (n_arguments > 1)
{
if (n_arguments > MAXFMGRARGS)
- elog(ERROR, "fmgr_pl: function %d: too many arguments (%d > %d)",
+ elog(ERROR, "fmgr_pl: function %u: too many arguments (%d > %d)",
fmgr_pl_finfo->fn_oid, n_arguments, MAXFMGRARGS);
va_start(pvar, arg0);
for (i = 1; i < n_arguments; i++)
@@ -187,7 +187,7 @@ fmgr_c(FmgrInfo *finfo,
values->data[8]);
break;
default:
- elog(ERROR, "fmgr_c: function %d: too many arguments (%d > %d)",
+ elog(ERROR, "fmgr_c: function %u: too many arguments (%d > %d)",
finfo->fn_oid, n_arguments, MAXFMGRARGS);
break;
}
@@ -226,7 +226,7 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
0, 0, 0);
if (!HeapTupleIsValid(procedureTuple))
{
- elog(ERROR, "fmgr_info: function %d: cache lookup failed",
+ elog(ERROR, "fmgr_info: function %u: cache lookup failed",
procedureId);
}
procedureStruct = (FormData_pg_proc *) GETSTRUCT(procedureTuple);
@@ -277,9 +277,9 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
0, 0, 0);
if (!HeapTupleIsValid(languageTuple))
{
- elog(ERROR, "fmgr_info: %s %ld",
- "Cache lookup for language %d failed",
- ObjectIdGetDatum(procedureStruct->prolang));
+ elog(ERROR, "fmgr_info: %u",
+ "Cache lookup for language failed",
+ DatumGetObjectId(procedureStruct->prolang));
}
languageStruct = (Form_pg_language) GETSTRUCT(languageTuple);
if (languageStruct->lanispl)
@@ -293,7 +293,7 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
}
else
{
- elog(ERROR, "fmgr_info: function %d: unknown language %d",
+ elog(ERROR, "fmgr_info: function %u: unknown language %d",
procedureId, language);
}
break;
@@ -326,7 +326,7 @@ fmgr(Oid procedureId,...)
pronargs = finfo.fn_nargs;
if (pronargs > MAXFMGRARGS)
- elog(ERROR, "fmgr: function %d: too many arguments (%d > %d)",
+ elog(ERROR, "fmgr: function %u: too many arguments (%d > %d)",
procedureId, pronargs, MAXFMGRARGS);
va_start(pvar, procedureId);
@@ -368,7 +368,7 @@ fmgr_ptr(FmgrInfo *finfo,...)
local_finfo->fn_nargs = n_arguments;
if (n_arguments > MAXFMGRARGS)
{
- elog(ERROR, "fmgr_ptr: function %d: too many arguments (%d > %d)",
+ elog(ERROR, "fmgr_ptr: function %u: too many arguments (%d > %d)",
func_id, n_arguments, MAXFMGRARGS);
}
for (i = 0; i < n_arguments; ++i)
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index d4fbd33594f..4ec2171dad2 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.104 1999/05/04 15:47:35 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.105 1999/05/10 00:46:18 momjian Exp $
*
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
*
@@ -709,7 +709,7 @@ main(int argc, char **argv)
if (!dataOnly)
{
if (g_verbose)
- fprintf(stderr, "%s last builtin oid is %d %s\n",
+ fprintf(stderr, "%s last builtin oid is %u %s\n",
g_comment_start, g_last_builtin_oid, g_comment_end);
tblinfo = dumpSchema(g_fout, &numTables, tablename, aclsOption);
}
@@ -1343,7 +1343,7 @@ getFuncs(int *numFuncs)
"SELECT pg_proc.oid, proname, prolang, pronargs, prorettype, "
"proretset, proargtypes, prosrc, probin, usename "
"from pg_proc, pg_user "
- "where pg_proc.oid > '%d'::oid and proowner = usesysid",
+ "where pg_proc.oid > '%u'::oid and proowner = usesysid",
g_last_builtin_oid);
res = PQexec(g_conn, query);
@@ -1969,7 +1969,7 @@ getIndices(int *numIndices)
"a.amname as indamname, i.indisunique "
"from pg_index i, pg_class t1, pg_class t2, pg_am a "
"where t1.oid = i.indexrelid and t2.oid = i.indrelid "
- "and t1.relam = a.oid and i.indexrelid > '%d'::oid "
+ "and t1.relam = a.oid and i.indexrelid > '%u'::oid "
"and t2.relname !~ '^pg_' and t1.relkind != 'l'",
g_last_builtin_oid);
@@ -2249,7 +2249,7 @@ dumpOneFunc(FILE *fout, FuncInfo *finfo, int i,
PQclear(res);
sprintf(query, "SELECT lanname FROM pg_language "
- "WHERE oid = %d",
+ "WHERE oid = %u",
finfo[i].lang);
res = PQexec(g_conn, query);
if (!res ||
@@ -3070,7 +3070,7 @@ setMaxOid(FILE *fout)
}
PQclear(res);
if (g_verbose)
- fprintf(stderr, "%s maximum system oid is %d %s\n",
+ fprintf(stderr, "%s maximum system oid is %u %s\n",
g_comment_start, max_oid, g_comment_end);
fprintf(fout, "CREATE TABLE pgdump_oid (dummy int4);\n");
fprintf(fout, "COPY pgdump_oid WITH OIDS FROM stdin;\n");
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index aa8d703ad2c..bb5dc345512 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_type.h,v 1.59 1999/05/03 19:10:20 momjian Exp $
+ * $Id: pg_type.h,v 1.60 1999/05/10 00:46:20 momjian Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -198,7 +198,7 @@ DATA(insert OID = 25 ( text PGUID -1 -1 f b t \054 0 18 textin textout text
DESCR("native variable-length string");
#define TEXTOID 25
-DATA(insert OID = 26 ( oid PGUID 4 10 t b t \054 0 0 int4in int4out int4in int4out i _null_ ));
+DATA(insert OID = 26 ( oid PGUID 4 10 t b t \054 0 0 oidin oidout oidin oidout i _null_ ));
DESCR("object identifier type");
#define OIDOID 26
diff --git a/src/interfaces/libpgtcl/pgtclCmds.c b/src/interfaces/libpgtcl/pgtclCmds.c
index 59e00b074d7..99b6f925e6c 100644
--- a/src/interfaces/libpgtcl/pgtclCmds.c
+++ b/src/interfaces/libpgtcl/pgtclCmds.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.41 1999/02/13 23:22:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.42 1999/05/10 00:46:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1190,7 +1190,7 @@ Pg_lo_import(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
sprintf(interp->result, "Pg_lo_import of '%s' failed", filename);
return TCL_ERROR;
}
- sprintf(interp->result, "%d", lobjId);
+ sprintf(interp->result, "%u", lobjId);
return TCL_OK;
}
@@ -1228,7 +1228,7 @@ Pg_lo_export(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
retval = lo_export(conn, lobjId, filename);
if (retval == -1)
{
- sprintf(interp->result, "Pg_lo_export %d %s failed", lobjId, filename);
+ sprintf(interp->result, "Pg_lo_export %u %s failed", lobjId, filename);
return TCL_ERROR;
}
return TCL_OK;
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 99f273d2d23..5ecb4f517a4 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.27 1999/03/14 16:06:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.28 1999/05/10 00:46:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -299,8 +299,7 @@ pg_krb5_init(void)
if (code = krb5_cc_resolve(tktbuf, &ccache))
{
(void) sprintf(PQerrormsg,
- "pg_krb5_init: Kerberos error %d in krb5_cc_resolve\n",
- code);
+ "pg_krb5_init: Kerberos error %d in krb5_cc_resolve\n", code);
com_err("pg_krb5_init", code, "in krb5_cc_resolve");
return (krb5_ccache) NULL;
}
@@ -329,16 +328,14 @@ pg_krb5_authname(const char *PQerrormsg)
if (code = krb5_cc_get_principal(ccache, &principal))
{
(void) sprintf(PQerrormsg,
- "pg_krb5_authname: Kerberos error %d in krb5_cc_get_principal\n",
- code);
+ "pg_krb5_authname: Kerberos error %d in krb5_cc_get_principal\n", code);
com_err("pg_krb5_authname", code, "in krb5_cc_get_principal");
return (char *) NULL;
}
if (code = krb5_unparse_name(principal, &authname))
{
(void) sprintf(PQerrormsg,
- "pg_krb5_authname: Kerberos error %d in krb5_unparse_name\n",
- code);
+ "pg_krb5_authname: Kerberos error %d in krb5_unparse_name\n", code);
com_err("pg_krb5_authname", code, "in krb5_unparse_name");
krb5_free_principal(principal);
return (char *) NULL;
@@ -387,8 +384,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock,
if (code = krb5_cc_get_principal(ccache, &client))
{
(void) sprintf(PQerrormsg,
- "pg_krb5_sendauth: Kerberos error %d in krb5_cc_get_principal\n",
- code);
+ "pg_krb5_sendauth: Kerberos error %d in krb5_cc_get_principal\n", code);
com_err("pg_krb5_sendauth", code, "in krb5_cc_get_principal");
return STATUS_ERROR;
}
@@ -415,8 +411,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock,
if (code = krb5_parse_name(servbuf, &server))
{
(void) sprintf(PQerrormsg,
- "pg_krb5_sendauth: Kerberos error %d in krb5_parse_name\n",
- code);
+ "pg_krb5_sendauth: Kerberos error %d in krb5_parse_name\n", code);
com_err("pg_krb5_sendauth", code, "in krb5_parse_name");
krb5_free_principal(client);
return STATUS_ERROR;
@@ -448,8 +443,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock,
else
{
(void) sprintf(PQerrormsg,
- "pg_krb5_sendauth: Kerberos error %d in krb5_sendauth\n",
- code);
+ "pg_krb5_sendauth: Kerberos error %d in krb5_sendauth\n", code);
com_err("pg_krb5_sendauth", code, "in krb5_sendauth");
}
}
@@ -624,7 +618,7 @@ fe_getauthname(char *PQerrormsg)
default:
(void) sprintf(PQerrormsg,
"fe_getauthname: invalid authentication system: %d\n",
- authsvc);
+ authsvc);
break;
}
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index aa770ffe5ac..e618615d140 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.19 1999/02/13 23:22:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.20 1999/05/10 00:46:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -419,7 +419,7 @@ lo_import(PGconn *conn, char *filename)
if (lobj == -1)
{
sprintf(conn->errorMessage,
- "lo_import: could not open inv object oid %d", lobjOid);
+ "lo_import: could not open inv object oid %u", lobjOid);
return InvalidOid;
}
@@ -464,7 +464,7 @@ lo_export(PGconn *conn, Oid lobjId, char *filename)
if (lobj == -1)
{
sprintf(conn->errorMessage,
- "lo_export: can't open inv object %d", lobjId);
+ "lo_export: can't open inv object %u", lobjId);
return -1;
}
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 08176cb280a..d494b5fe4c0 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -3,7 +3,7 @@
* procedural language
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.5 1999/01/28 11:48:31 wieck Exp $
+ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.6 1999/05/10 00:46:29 momjian Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -182,7 +182,7 @@ plpgsql_compile(Oid fn_oid, int functype)
if (!HeapTupleIsValid(typeTup))
{
plpgsql_comperrinfo();
- elog(ERROR, "cache lookup for return type %d failed",
+ elog(ERROR, "cache lookup for return type %u failed",
procStruct->prorettype);
}
typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
@@ -213,7 +213,7 @@ plpgsql_compile(Oid fn_oid, int functype)
if (!HeapTupleIsValid(typeTup))
{
plpgsql_comperrinfo();
- elog(ERROR, "cache lookup for argument type %d failed",
+ elog(ERROR, "cache lookup for argument type %u failed",
procStruct->proargtypes[i]);
}
typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
@@ -451,7 +451,7 @@ plpgsql_compile(Oid fn_oid, int functype)
break;
default:
- elog(ERROR, "unknown function type %d in plpgsql_compile()",
+ elog(ERROR, "unknown function type %u in plpgsql_compile()",
functype);
break;
}
@@ -1074,7 +1074,7 @@ plpgsql_parse_dblwordtype(char *string)
if (!HeapTupleIsValid(typetup))
{
plpgsql_comperrinfo();
- elog(ERROR, "cache lookup for type %d of %s.%s failed",
+ elog(ERROR, "cache lookup for type %u of %s.%s failed",
attrStruct->atttypid, word1, word2);
}
@@ -1189,7 +1189,7 @@ plpgsql_parse_wordrowtype(char *string)
if (!HeapTupleIsValid(typetup))
{
plpgsql_comperrinfo();
- elog(ERROR, "cache lookup for type %d of %s.%s failed",
+ elog(ERROR, "cache lookup for type %u of %s.%s failed",
attrStruct->atttypid, word1,
nameout(&(attrStruct->attname)));
}
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index edb7e381a67..250171b873f 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -3,7 +3,7 @@
* procedural language
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.9 1999/04/20 02:19:57 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.10 1999/05/10 00:46:30 momjian Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -1557,7 +1557,7 @@ exec_stmt_raise(PLpgSQL_execstate * estate, PLpgSQL_stmt_raise * stmt)
typetup = SearchSysCacheTuple(TYPOID,
ObjectIdGetDatum(var->datatype->typoid), 0, 0, 0);
if (!HeapTupleIsValid(typetup))
- elog(ERROR, "cache lookup for type %d failed (1)", var->datatype->typoid);
+ elog(ERROR, "cache lookup for type %u failed (1)", var->datatype->typoid);
typeStruct = (Form_pg_type) GETSTRUCT(typetup);
fmgr_info(typeStruct->typoutput, &finfo_output);
@@ -1962,7 +1962,7 @@ exec_assign_value(PLpgSQL_execstate * estate,
typetup = SearchSysCacheTuple(TYPOID,
ObjectIdGetDatum(atttype), 0, 0, 0);
if (!HeapTupleIsValid(typetup))
- elog(ERROR, "cache lookup for type %d failed", atttype);
+ elog(ERROR, "cache lookup for type %u failed", atttype);
typeStruct = (Form_pg_type) GETSTRUCT(typetup);
fmgr_info(typeStruct->typinput, &finfo_input);
@@ -2393,7 +2393,7 @@ exec_cast_value(Datum value, Oid valtype,
typetup = SearchSysCacheTuple(TYPOID,
ObjectIdGetDatum(valtype), 0, 0, 0);
if (!HeapTupleIsValid(typetup))
- elog(ERROR, "cache lookup for type %d failed", valtype);
+ elog(ERROR, "cache lookup for type %u failed", valtype);
typeStruct = (Form_pg_type) GETSTRUCT(typetup);
fmgr_info(typeStruct->typoutput, &finfo_output);
diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c
index d8dd645a26d..5416d0d6895 100644
--- a/src/pl/plpgsql/src/pl_funcs.c
+++ b/src/pl/plpgsql/src/pl_funcs.c
@@ -3,7 +3,7 @@
* procedural language
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.3 1999/01/28 11:48:31 wieck Exp $
+ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.4 1999/05/10 00:46:31 momjian Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -703,7 +703,7 @@ plpgsql_dumptree(PLpgSQL_function * func)
{
PLpgSQL_var *var = (PLpgSQL_var *) d;
- printf("VAR %-16s type %s (typoid %d) atttypmod %d\n",
+ printf("VAR %-16s type %s (typoid %u) atttypmod %d\n",
var->refname, var->datatype->typname,
var->datatype->typoid,
var->datatype->atttypmod);
diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c
index c8cf9b469f8..5f53aa7bfa2 100644
--- a/src/test/examples/testlo.c
+++ b/src/test/examples/testlo.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/test/examples/testlo.c,v 1.10 1999/02/13 23:22:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/examples/testlo.c,v 1.11 1999/05/10 00:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -84,8 +84,7 @@ pickout(PGconn *conn, Oid lobjId, int start, int len)
lobj_fd = lo_open(conn, lobjId, INV_READ);
if (lobj_fd < 0)
{
- fprintf(stderr, "can't open large object %d",
- lobjId);
+ fprintf(stderr, "can't open large object %u", lobjId);
}
lo_lseek(conn, lobj_fd, start, SEEK_SET);
@@ -115,8 +114,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
lobj_fd = lo_open(conn, lobjId, INV_READ);
if (lobj_fd < 0)
{
- fprintf(stderr, "can't open large object %d",
- lobjId);
+ fprintf(stderr, "can't open large object %u", lobjId);
}
lo_lseek(conn, lobj_fd, start, SEEK_SET);
@@ -157,8 +155,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
lobj_fd = lo_open(conn, lobjId, INV_READ);
if (lobj_fd < 0)
{
- fprintf(stderr, "can't open large object %d",
- lobjId);
+ fprintf(stderr, "can't open large object %u", lobjId);
}
/*
@@ -239,7 +236,7 @@ main(int argc, char **argv)
if (lobjOid == 0)
fprintf(stderr, "%s\n", PQerrorMessage(conn));
/*
- printf("\tas large object %d.\n", lobjOid);
+ printf("\tas large object %u.\n", lobjOid);
printf("picking out bytes 1000-2000 of the large object\n");
pickout(conn, lobjOid, 1000, 1000);
diff --git a/src/test/examples/testlo2.c b/src/test/examples/testlo2.c
index eaa19229e71..f2cc3ed0b3d 100644
--- a/src/test/examples/testlo2.c
+++ b/src/test/examples/testlo2.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/test/examples/Attic/testlo2.c,v 1.9 1999/02/13 23:22:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/examples/Attic/testlo2.c,v 1.10 1999/05/10 00:46:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -80,8 +80,7 @@ pickout(PGconn *conn, Oid lobjId, int start, int len)
lobj_fd = lo_open(conn, lobjId, INV_READ);
if (lobj_fd < 0)
{
- fprintf(stderr, "can't open large object %d",
- lobjId);
+ fprintf(stderr, "can't open large object %u", lobjId);
}
lo_lseek(conn, lobj_fd, start, SEEK_SET);
@@ -111,8 +110,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
lobj_fd = lo_open(conn, lobjId, INV_READ);
if (lobj_fd < 0)
{
- fprintf(stderr, "can't open large object %d",
- lobjId);
+ fprintf(stderr, "can't open large object %u", lobjId);
}
lo_lseek(conn, lobj_fd, start, SEEK_SET);
@@ -153,8 +151,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
lobj_fd = lo_open(conn, lobjId, INV_READ);
if (lobj_fd < 0)
{
- fprintf(stderr, "can't open large object %d",
- lobjId);
+ fprintf(stderr, "can't open large object %u", lobjId);
}
/*
@@ -234,7 +231,7 @@ main(int argc, char **argv)
/* lobjOid = importFile(conn, in_filename); */
lobjOid = lo_import(conn, in_filename);
/*
- printf("\tas large object %d.\n", lobjOid);
+ printf("\tas large object %u.\n", lobjOid);
printf("picking out bytes 1000-2000 of the large object\n");
pickout(conn, lobjOid, 1000, 1000);
--
GitLab