This is the patch replace offnum++ by OffsetNumberNext, to be

consistent.  OffsetNumberNext() has some casting that makes it useful.

Fujii Masao

diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
index 249a7373ce84426717911f8a0e143e14b4cb8cc5..1b95ab67b9f3774b1ab6916bfc30af9eaec9edb1 100644 (file)
--- a/src/backend/access/heap/pruneheap.c
+++ b/src/backend/access/heap/pruneheap.c
@@ -792,7 +792,7 @@ heap_get_root_tuples(Page page, OffsetNumber *root_offsets)
        MemSet(root_offsets, 0, MaxHeapTuplesPerPage * sizeof(OffsetNumber));
 
        maxoff = PageGetMaxOffsetNumber(page);
-       for (offnum = FirstOffsetNumber; offnum <= maxoff; offnum++)
+       for (offnum = FirstOffsetNumber; offnum <= maxoff; offnum = OffsetNumberNext(offnum))
        {
                ItemId          lp = PageGetItemId(page, offnum);
                HeapTupleHeader htup;

diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index 8f8fcc74e382adcd4b35385f91fc430fd14b8694..2c107141cd6d3c2a76c08a433474c56cf921c6ab 100644 (file)
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -302,7 +302,7 @@ bitgetpage(HeapScanDesc scan, TBMIterateResult *tbmres)
                OffsetNumber maxoff = PageGetMaxOffsetNumber(dp);
                OffsetNumber offnum;
 
-               for (offnum = FirstOffsetNumber; offnum <= maxoff; offnum++)
+               for (offnum = FirstOffsetNumber; offnum <= maxoff; offnum = OffsetNumberNext(offnum))
                {
                        ItemId          lp;
                        HeapTupleData loctup;

diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index eea03deaa73d8e6003658d2e537b75b8457fec91..f8c86dfa1c892316e26cefabf48c2e716d6fa087 100644 (file)
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -533,7 +533,7 @@ PageGetHeapFreeSpace(Page page)
                                 * Since this is just a hint, we must confirm that there is
                                 * indeed a free line pointer
                                 */
-                               for (offnum = FirstOffsetNumber; offnum <= nline; offnum++)
+                               for (offnum = FirstOffsetNumber; offnum <= nline; offnum = OffsetNumberNext(offnum))
                                {
                                        ItemId          lp = PageGetItemId(page, offnum);
 
@@ -736,7 +736,7 @@ PageIndexMultiDelete(Page page, OffsetNumber *itemnos, int nitems)
        totallen = 0;
        nused = 0;
        nextitm = 0;
-       for (offnum = 1; offnum <= nline; offnum++)
+       for (offnum = FirstOffsetNumber; offnum <= nline; offnum = OffsetNumberNext(offnum))
        {
                lp = PageGetItemId(page, offnum);
                Assert(ItemIdHasStorage(lp));