diff options
| author | Bruce Momjian <bruce@momjian.us> | 1997-09-12 04:09:08 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1997-09-12 04:09:08 +0000 |
| commit | 1ea01720d53095641205753e766180508ee4d5ad (patch) | |
| tree | c62d9d2be8a531e182d89bb0cef172a80d43c00c /src/backend/utils/cache | |
| parent | 6e04b4b20f73b2512fc29353ca706bdb635d7e47 (diff) | |
| download | postgresql-1ea01720d53095641205753e766180508ee4d5ad.tar.gz postgresql-1ea01720d53095641205753e766180508ee4d5ad.zip | |
heapattr functions now return a Datum, not char *.
Diffstat (limited to 'src/backend/utils/cache')
| -rw-r--r-- | src/backend/utils/cache/catcache.c | 34 | ||||
| -rw-r--r-- | src/backend/utils/cache/syscache.c | 6 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 960385d88eb..c74565ddfab 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.13 1997/09/08 21:48:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.14 1997/09/12 04:08:28 momjian Exp $ * * Notes: * XXX This needs to use exception.h to handle recovery when @@ -387,40 +387,40 @@ CatalogCacheComputeTupleHashIndex(struct catcache * cacheInOutP, cacheInOutP->cc_skey[3].sk_argument = (cacheInOutP->cc_key[3] == ObjectIdAttributeNumber) ? (Datum) tuple->t_oid - : (Datum) fastgetattr(tuple, - cacheInOutP->cc_key[3], - RelationGetTupleDescriptor(relation), - &isNull); + : fastgetattr(tuple, + cacheInOutP->cc_key[3], + RelationGetTupleDescriptor(relation), + &isNull); Assert(!isNull); /* FALLTHROUGH */ case 3: cacheInOutP->cc_skey[2].sk_argument = (cacheInOutP->cc_key[2] == ObjectIdAttributeNumber) ? (Datum) tuple->t_oid - : (Datum) fastgetattr(tuple, - cacheInOutP->cc_key[2], - RelationGetTupleDescriptor(relation), - &isNull); + : fastgetattr(tuple, + cacheInOutP->cc_key[2], + RelationGetTupleDescriptor(relation), + &isNull); Assert(!isNull); /* FALLTHROUGH */ case 2: cacheInOutP->cc_skey[1].sk_argument = (cacheInOutP->cc_key[1] == ObjectIdAttributeNumber) ? (Datum) tuple->t_oid - : (Datum) fastgetattr(tuple, - cacheInOutP->cc_key[1], - RelationGetTupleDescriptor(relation), - &isNull); + : fastgetattr(tuple, + cacheInOutP->cc_key[1], + RelationGetTupleDescriptor(relation), + &isNull); Assert(!isNull); /* FALLTHROUGH */ case 1: cacheInOutP->cc_skey[0].sk_argument = (cacheInOutP->cc_key[0] == ObjectIdAttributeNumber) ? (Datum) tuple->t_oid - : (Datum) fastgetattr(tuple, - cacheInOutP->cc_key[0], - RelationGetTupleDescriptor(relation), - &isNull); + : fastgetattr(tuple, + cacheInOutP->cc_key[0], + RelationGetTupleDescriptor(relation), + &isNull); Assert(!isNull); break; default: diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index 8a07d88c32f..2a2fc2544ef 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.7 1997/09/08 21:48:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.8 1997/09/12 04:08:35 momjian Exp $ * * NOTES * These routines allow the parser/planner/executor to perform @@ -494,7 +494,7 @@ SearchSysCacheGetAttribute(int cacheId, int32 attributeLength, attributeByValue; bool isNull; - char *attributeValue; + Datum attributeValue; void *returnValue; tp = SearchSysCacheTuple(cacheId, key1, key2, key3, key4); @@ -562,7 +562,7 @@ SearchSysCacheGetAttribute(int cacheId, : attributeLength; /* fixed length */ tmp = (char *) palloc(size); - memmove(tmp, attributeValue, size); + memmove(tmp, (void *)attributeValue, size); returnValue = (void *) tmp; } |