diff options
| author | Bruce Momjian | 1997-09-12 05:58:18 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1997-09-12 05:58:18 +0000 |
| commit | b6bd3da520466885a4c9f427994e456a2d2a0091 (patch) | |
| tree | d4a56c9a949c5f9739c1058baf63e087e64e79a9 | |
| parent | fd3ad7d765ad5ade1ab381affa12c7e16df1707a (diff) | |
Macro cleanup of heap_getattr.
| -rw-r--r-- | src/include/access/heapam.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index 07b27039e0d..b0089161ec3 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.16 1997/09/12 04:09:03 momjian Exp $ + * $Id: heapam.h,v 1.17 1997/09/12 05:58:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -95,13 +95,12 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics; * pointer to the structure describing the row and all its fields. * ---------------- */ #define heap_getattr(tup, b, attnum, tupleDesc, isnull) \ - (AssertMacro((tup) != NULL) ? \ - ((attnum) > (int) (tup)->t_natts) ? \ - (((isnull) ? (*(isnull) = true) : (char)NULL), (Datum)NULL) : \ - ((attnum) > 0) ? \ - fastgetattr((tup), (attnum), (tupleDesc), (isnull)) : \ - (((isnull) ? (*(isnull) = false) : (char)NULL), heap_getsysattr((tup), (b), (attnum))) : \ - (Datum)NULL) + (AssertMacro((tup) != NULL) && \ + ((attnum) > (int) (tup)->t_natts) ? \ + ((isnull && (*(isnull) = true)), (Datum)NULL) : \ + ((attnum) > 0) ? \ + fastgetattr((tup), (attnum), (tupleDesc), (isnull)) : \ + ((isnull && (*(isnull) = false)), heap_getsysattr((tup), (b), (attnum)))) extern HeapAccessStatistics heap_access_stats; /* in stats.c */ |