diff options
Diffstat (limited to 'src/backend/utils/adt')
-rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 6 | ||||
-rw-r--r-- | src/backend/utils/adt/oid.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/regproc.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/ruleutils.c | 26 | ||||
-rw-r--r-- | src/backend/utils/adt/selfuncs.c | 12 |
5 files changed, 26 insertions, 26 deletions
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; } |