diff options
Diffstat (limited to 'src/backend/commands')
-rw-r--r-- | src/backend/commands/sequence.c | 14 | ||||
-rw-r--r-- | src/backend/commands/trigger.c | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index cdc60db1e5c..87b857826c1 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.153 2008/06/12 09:12:30 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.154 2008/07/13 20:45:47 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -109,7 +109,7 @@ DefineSequence(CreateSeqStmt *seq) Oid seqoid; Relation rel; Buffer buf; - PageHeader page; + Page page; sequence_magic *sm; HeapTuple tuple; TupleDesc tupDesc; @@ -212,9 +212,9 @@ DefineSequence(CreateSeqStmt *seq) buf = ReadBuffer(rel, P_NEW); Assert(BufferGetBlockNumber(buf) == 0); - page = (PageHeader) BufferGetPage(buf); + page = BufferGetPage(buf); - PageInit((Page) page, BufferGetPageSize(buf), sizeof(sequence_magic)); + PageInit(page, BufferGetPageSize(buf), sizeof(sequence_magic)); sm = (sequence_magic *) PageGetSpecialPointer(page); sm->magic = SEQ_MAGIC; @@ -954,7 +954,7 @@ init_sequence(Oid relid, SeqTable *p_elm, Relation *p_rel) static Form_pg_sequence read_info(SeqTable elm, Relation rel, Buffer *buf) { - PageHeader page; + Page page; ItemId lp; HeapTupleData tuple; sequence_magic *sm; @@ -963,7 +963,7 @@ read_info(SeqTable elm, Relation rel, Buffer *buf) *buf = ReadBuffer(rel, 0); LockBuffer(*buf, BUFFER_LOCK_EXCLUSIVE); - page = (PageHeader) BufferGetPage(*buf); + page = BufferGetPage(*buf); sm = (sequence_magic *) PageGetSpecialPointer(page); if (sm->magic != SEQ_MAGIC) @@ -972,7 +972,7 @@ read_info(SeqTable elm, Relation rel, Buffer *buf) lp = PageGetItemId(page, FirstOffsetNumber); Assert(ItemIdIsNormal(lp)); - tuple.t_data = (HeapTupleHeader) PageGetItem((Page) page, lp); + tuple.t_data = (HeapTupleHeader) PageGetItem(page, lp); seq = (Form_pg_sequence) GETSTRUCT(&tuple); diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 76a373343de..cc9fd5d08da 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.234 2008/05/15 00:17:39 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.235 2008/07/13 20:45:47 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2203,17 +2203,17 @@ ltrmark:; } else { - PageHeader dp; + Page page; ItemId lp; buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(tid)); - dp = (PageHeader) BufferGetPage(buffer); - lp = PageGetItemId(dp, ItemPointerGetOffsetNumber(tid)); + page = BufferGetPage(buffer); + lp = PageGetItemId(page, ItemPointerGetOffsetNumber(tid)); Assert(ItemIdIsNormal(lp)); - tuple.t_data = (HeapTupleHeader) PageGetItem((Page) dp, lp); + tuple.t_data = (HeapTupleHeader) PageGetItem(page, lp); tuple.t_len = ItemIdGetLength(lp); tuple.t_self = *tid; tuple.t_tableOid = RelationGetRelid(relation); |