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/nbtree/nbtinsert.c | |
| parent | a12a23f0d03cc8bf22c6c38bc2394753ec34fcdf (diff) | |
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/nbtree/nbtinsert.c')
| -rw-r--r-- | src/backend/access/nbtree/nbtinsert.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index 975b53d658a..0ec7af2cf96 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.57 2000/04/12 17:14:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.58 2000/05/30 04:24:33 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1398,8 +1398,8 @@ _bt_tuplecompare(Relation rel, } else { - compare = (int32) FMGR_PTR2(&entry->sk_func, - attrDatum1, attrDatum2); + compare = DatumGetInt32(FunctionCall2(&entry->sk_func, + attrDatum1, attrDatum2)); } if (compare != 0) @@ -1520,7 +1520,7 @@ _bt_isequal(TupleDesc itupdesc, Page page, OffsetNumber offnum, IndexTuple itup; ScanKey entry; AttrNumber attno; - long result; + int32 result; int i; bool null; @@ -1538,7 +1538,8 @@ _bt_isequal(TupleDesc itupdesc, Page page, OffsetNumber offnum, if (entry->sk_flags & SK_ISNULL || null) return false; - result = (long) FMGR_PTR2(&entry->sk_func, entry->sk_argument, datum); + result = DatumGetInt32(FunctionCall2(&entry->sk_func, + entry->sk_argument, datum)); if (result != 0) return false; } |