diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/adt/name.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/cache/relcache.c | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c index 63ea829812a..154a2067ec9 100644 --- a/src/backend/utils/adt/name.c +++ b/src/backend/utils/adt/name.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.41 2002/09/04 20:31:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.42 2003/02/09 06:56:28 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -245,7 +245,7 @@ current_schema(PG_FUNCTION_ARGS) if (search_path == NIL) PG_RETURN_NULL(); - nspname = get_namespace_name((Oid) lfirsti(search_path)); + nspname = get_namespace_name(lfirsto(search_path)); PG_RETURN_DATUM(DirectFunctionCall1(namein, CStringGetDatum(nspname))); } @@ -265,7 +265,7 @@ current_schemas(PG_FUNCTION_ARGS) { char *nspname; - nspname = get_namespace_name((Oid) lfirsti(search_path)); + nspname = get_namespace_name(lfirsto(search_path)); names[i] = DirectFunctionCall1(namein, CStringGetDatum(nspname)); i++; search_path = lnext(search_path); diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 15f61ce59a6..6ab9427dfdb 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.183 2002/12/16 18:39:22 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.184 2003/02/09 06:56:28 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2642,20 +2642,20 @@ insert_ordered_oid(List *list, Oid datum) List *l; /* Does the datum belong at the front? */ - if (list == NIL || datum < (Oid) lfirsti(list)) - return lconsi(datum, list); + if (list == NIL || datum < lfirsto(list)) + return lconso(datum, list); /* No, so find the entry it belongs after */ l = list; for (;;) { List *n = lnext(l); - if (n == NIL || datum < (Oid) lfirsti(n)) + if (n == NIL || datum < lfirsto(n)) break; /* it belongs before n */ l = n; } /* Insert datum into list after item l */ - lnext(l) = lconsi(datum, lnext(l)); + lnext(l) = lconso(datum, lnext(l)); return list; } @@ -2967,7 +2967,7 @@ load_relcache_init_file(void) { RelationCacheInsert(rels[relno]); /* also make a list of their OIDs, for RelationIdIsInInitFile */ - initFileRelationIds = lconsi((int) RelationGetRelid(rels[relno]), + initFileRelationIds = lconso(RelationGetRelid(rels[relno]), initFileRelationIds); } @@ -3133,7 +3133,7 @@ write_relcache_init_file(void) /* also make a list of their OIDs, for RelationIdIsInInitFile */ oldcxt = MemoryContextSwitchTo(CacheMemoryContext); - initFileRelationIds = lconsi((int) RelationGetRelid(rel), + initFileRelationIds = lconso(RelationGetRelid(rel), initFileRelationIds); MemoryContextSwitchTo(oldcxt); } @@ -3202,7 +3202,7 @@ write_relcache_init_file(void) bool RelationIdIsInInitFile(Oid relationId) { - return intMember((int) relationId, initFileRelationIds); + return oidMember(relationId, initFileRelationIds); } /* |