summaryrefslogtreecommitdiff
path: root/src/backend/executor/execJunk.c
diff options
context:
space:
mode:
authorBruce Momjian1997-09-12 04:09:08 +0000
committerBruce Momjian1997-09-12 04:09:08 +0000
commit1ea01720d53095641205753e766180508ee4d5ad (patch)
treec62d9d2be8a531e182d89bb0cef172a80d43c00c /src/backend/executor/execJunk.c
parent6e04b4b20f73b2512fc29353ca706bdb635d7e47 (diff)
heapattr functions now return a Datum, not char *.
Diffstat (limited to 'src/backend/executor/execJunk.c')
-rw-r--r--src/backend/executor/execJunk.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index cd07b2fa1dc..e3e0623b957 100644
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.8 1997/09/08 21:42:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.9 1997/09/12 04:07:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -315,8 +315,7 @@ ExecGetJunkAttribute(JunkFilter *junkfilter,
tuple = slot->val;
tupType = (TupleDesc) junkfilter->jf_tupType;
- *value = (Datum)
- heap_getattr(tuple, InvalidBuffer, resno, tupType, isNull);
+ *value = heap_getattr(tuple, InvalidBuffer, resno, tupType, isNull);
return true;
}
@@ -391,10 +390,8 @@ ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot)
*/
for (i = 0; i < cleanLength; i++)
{
- Datum d = (Datum)
- heap_getattr(tuple, InvalidBuffer, cleanMap[i], tupType, &isNull);
-
- values[i] = d;
+ values[i] =
+ heap_getattr(tuple, InvalidBuffer, cleanMap[i], tupType, &isNull);
if (isNull)
nulls[i] = 'n';