From 9d035f425452279041c52e01cf83b2a27e121b5c Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 13 Jul 2008 20:45:47 +0000 Subject: Clean up the use of some page-header-access macros: principally, use SizeOfPageHeaderData instead of sizeof(PageHeaderData) in places where that makes the code clearer, and avoid casting between Page and PageHeader where possible. Zdenek Kotala, with some additional cleanup by Heikki Linnakangas. I did not apply the parts of the proposed patch that would have resulted in slightly changing the on-disk format of hash indexes; it seems to me that's not a win as long as there's any chance of having in-place upgrade for 8.4. --- src/backend/commands/sequence.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/backend/commands/sequence.c') 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); -- cgit v1.2.3