diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-05-30 04:25:00 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-05-30 04:25:00 +0000 |
| commit | 0f1e39643de655f5103b09d5a82cadbf26a965c1 (patch) | |
| tree | 32fa30338e5065afbc28df7dae4c2d2a0bce1569 /src/backend/access/common/indexvalid.c | |
| parent | a12a23f0d03cc8bf22c6c38bc2394753ec34fcdf (diff) | |
| download | postgresql-0f1e39643de655f5103b09d5a82cadbf26a965c1.tar.gz postgresql-0f1e39643de655f5103b09d5a82cadbf26a965c1.zip | |
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 ...
Diffstat (limited to 'src/backend/access/common/indexvalid.c')
| -rw-r--r-- | src/backend/access/common/indexvalid.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/backend/access/common/indexvalid.c b/src/backend/access/common/indexvalid.c index 91d873e446b..d2f4d5ee83f 100644 --- a/src/backend/access/common/indexvalid.c +++ b/src/backend/access/common/indexvalid.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.24 2000/01/26 05:55:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.25 2000/05/30 04:24:27 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,7 @@ index_keytest(IndexTuple tuple, { bool isNull; Datum datum; - int test; + Datum test; IncrIndexProcessed(); @@ -62,18 +62,16 @@ index_keytest(IndexTuple tuple, if (key[0].sk_flags & SK_COMMUTE) { - test = (*(fmgr_faddr(&key[0].sk_func))) - (DatumGetPointer(key[0].sk_argument), - datum) ? 1 : 0; + test = FunctionCall2(&key[0].sk_func, + key[0].sk_argument, datum); } else { - test = (*(fmgr_faddr(&key[0].sk_func))) - (datum, - DatumGetPointer(key[0].sk_argument)) ? 1 : 0; + test = FunctionCall2(&key[0].sk_func, + datum, key[0].sk_argument); } - if (!test == !(key[0].sk_flags & SK_NEGATE)) + if (DatumGetBool(test) == !!(key[0].sk_flags & SK_NEGATE)) return false; scanKeySize -= 1; |