diff options
Diffstat (limited to 'src/backend/access/common/heaptuple.c')
| -rw-r--r-- | src/backend/access/common/heaptuple.c | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 71d76a6fc2f..30961f4f549 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.19 1997/08/19 21:28:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.20 1997/08/24 23:07:26 momjian Exp $ * * NOTES * The old interface functions have been converted to macros @@ -695,26 +695,20 @@ heap_getattr(HeapTuple tup, if (attnum > (int) tup->t_natts) { *isnull = true; return ((char *) NULL); + } else if (attnum > 0) { + /* ---------------- + * take care of user defined attributes + * ---------------- + */ + return fastgetattr(tup, attnum, tupleDesc, isnull); + } else { + /* ---------------- + * take care of system attributes + * ---------------- + */ + *isnull = false; + return heap_getsysattr(tup, b, attnum); } - - /* ---------------- - * take care of user defined attributes - * ---------------- - */ - if (attnum > 0) { - char *datum; - datum = fastgetattr(tup, attnum, tupleDesc, isnull); - - return (datum); - } - - /* ---------------- - * take care of system attributes - * ---------------- - */ - *isnull = false; - return - heap_getsysattr(tup, b, attnum); } /* ---------------- |