summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1998-09-04 18:21:11 +0000
committerBruce Momjian1998-09-04 18:21:11 +0000
commit4b814b1886ee0dd14c1fbf56975793755ecb983e (patch)
tree500c8361b233a937139c4f82d340043677323bf9
parentf93281a1a19b57fc8fbd560af7f36a85efe9fe76 (diff)
offsetof cleanup.
-rw-r--r--src/backend/access/common/heaptuple.c6
-rw-r--r--src/backend/storage/large_object/inv_api.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index a0c98a995fd..97626420206 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.42 1998/09/04 18:05:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.43 1998/09/04 18:21:10 momjian Exp $
*
* NOTES
* The old interface functions have been converted to macros
@@ -809,7 +809,7 @@ heap_formtuple(TupleDesc tupleDescriptor,
int i;
int numberOfAttributes = tupleDescriptor->natts;
- len = offsetof(HeapTuple->t_bits);
+ len = offsetof(HeapTupleData, t_bits);
for (i = 0; i < numberOfAttributes && !hasnull; i++)
{
@@ -957,7 +957,7 @@ heap_addheader(uint32 natts, /* max domain index */
AssertArg(natts > 0);
- len = offsetof(HeapTuple->t_bits);
+ len = offsetof(HeapTupleData, t_bits);
hoff = len = DOUBLEALIGN(len); /* be conservative */
len += structlen;
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 87ded0f5190..f1559dd09d5 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.39 1998/09/04 18:05:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.40 1998/09/04 18:21:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -917,7 +917,7 @@ inv_wrold(LargeObjectDesc *obj_desc,
/*
ntup = inv_newtuple(obj_desc, newbuf, newpage, (char *) NULL, tupbytes);
dptr = ((char *) ntup) + ntup->t_hoff -
- (sizeof(HeapTupleData) - offsetof(HeapTupleData.t_bits)) +
+ (sizeof(HeapTupleData) - offsetof(HeapTupleData, t_bits)) +
sizeof(int4)
+ sizeof(fsblock->vl_len);
@@ -998,7 +998,7 @@ inv_newtuple(LargeObjectDesc *obj_desc,
char *attptr;
/* compute tuple size -- no nulls */
- hoff = offsetof(HeapTuple->t_bits);
+ hoff = offsetof(HeapTupleData, t_bits);
/* add in olastbyte, varlena.vl_len, varlena.vl_dat */
tupsize = hoff + (2 * sizeof(int32)) + nwrite;