From 0f1e39643de655f5103b09d5a82cadbf26a965c1 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 30 May 2000 04:25:00 +0000
Subject: Third round of fmgr updates: eliminate calls using fmgr() and
 fmgr_faddr() in favor of new-style calls.  Lots of cleanup of sloppy casts to
 use XXXGetDatum and DatumGetXXX ...

---
 src/backend/executor/nodeGroup.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/backend/executor/nodeGroup.c')

diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index eead721dacb..d1ae02616c1 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -15,7 +15,7 @@
  *	  locate group boundaries.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.35 2000/05/30 00:49:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.36 2000/05/30 04:24:45 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -430,7 +430,6 @@ execTuplesMatch(HeapTuple tuple1,
 					attr2;
 		bool		isNull1,
 					isNull2;
-		Datum		equal;
 
 		attr1 = heap_getattr(tuple1,
 							 att,
@@ -450,9 +449,8 @@ execTuplesMatch(HeapTuple tuple1,
 
 		/* Apply the type-specific equality function */
 
-		equal = (Datum) (*fmgr_faddr(&eqfunctions[i])) (attr1, attr2);
-
-		if (DatumGetInt32(equal) == 0)
+		if (! DatumGetBool(FunctionCall2(&eqfunctions[i],
+										 attr1, attr2)))
 			return FALSE;
 	}
 
-- 
cgit v1.2.3