diff options
| author | Bruce Momjian | 1997-09-12 04:09:08 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1997-09-12 04:09:08 +0000 |
| commit | 1ea01720d53095641205753e766180508ee4d5ad (patch) | |
| tree | c62d9d2be8a531e182d89bb0cef172a80d43c00c /src/include | |
| parent | 6e04b4b20f73b2512fc29353ca706bdb635d7e47 (diff) | |
heapattr functions now return a Datum, not char *.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/heapam.h | 13 | ||||
| -rw-r--r-- | src/include/executor/spi.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index c30e4405bfa..07b27039e0d 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.15 1997/09/08 21:50:45 momjian Exp $ + * $Id: heapam.h,v 1.16 1997/09/12 04:09:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -97,11 +97,11 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics; #define heap_getattr(tup, b, attnum, tupleDesc, isnull) \ (AssertMacro((tup) != NULL) ? \ ((attnum) > (int) (tup)->t_natts) ? \ - (((isnull) ? (*(isnull) = true) : (char)NULL), (char *)NULL) : \ + (((isnull) ? (*(isnull) = true) : (char)NULL), (Datum)NULL) : \ ((attnum) > 0) ? \ fastgetattr((tup), (attnum), (tupleDesc), (isnull)) : \ (((isnull) ? (*(isnull) = false) : (char)NULL), heap_getsysattr((tup), (b), (attnum))) : \ - (char *)NULL) + (Datum)NULL) extern HeapAccessStatistics heap_access_stats; /* in stats.c */ @@ -143,10 +143,9 @@ DataFill(char *data, TupleDesc tupleDesc, extern int heap_attisnull(HeapTuple tup, int attnum); extern int heap_sysattrlen(AttrNumber attno); extern bool heap_sysattrbyval(AttrNumber attno); -extern char *heap_getsysattr(HeapTuple tup, Buffer b, int attnum); -extern char * -fastgetattr(HeapTuple tup, int attnum, - TupleDesc att, bool *isnull); +extern Datum heap_getsysattr(HeapTuple tup, Buffer b, int attnum); +extern Datum fastgetattr(HeapTuple tup, int attnum, + TupleDesc att, bool *isnull); extern HeapTuple heap_copytuple(HeapTuple tuple); extern HeapTuple heap_formtuple(TupleDesc tupleDescriptor, diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index 5ce12b1d16d..6f4fd519f39 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -80,7 +80,7 @@ extern void *SPI_saveplan(void *plan); extern int SPI_fnumber(TupleDesc tupdesc, char *fname); extern char *SPI_fname(TupleDesc tupdesc, int fnumber); extern char *SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber); -extern char *SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull); +extern Datum SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull); extern char *SPI_gettype(TupleDesc tupdesc, int fnumber); extern Oid SPI_gettypeid(TupleDesc tupdesc, int fnumber); extern char *SPI_getrelname(Relation rel); |