Remove unused vars and mark assert-only vars

Kyotaro HORIGUCHI

diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index e153c90b252b7ad63ab0ad253ef86c8a2f95da4b..c98603bbf8f325e997c3e41e5b4a4ab632fbebd3 100644 (file)
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -85,7 +85,7 @@ void
 _bt_upgrademetapage(Page page)
 {
    BTMetaPageData *metad;
-   BTPageOpaque metaopaque;
+   BTPageOpaque metaopaque PG_USED_FOR_ASSERTS_ONLY;
 
    metad = BTPageGetMeta(page);
    metaopaque = (BTPageOpaque) PageGetSpecialPointer(page);
@@ -118,7 +118,6 @@ _bt_update_meta_cleanup_info(Relation rel, TransactionId oldestBtpoXact,
 {
    Buffer          metabuf;
    Page            metapg;
-   BTPageOpaque    metaopaque;
    BTMetaPageData *metad;
    bool            needsRewrite = false;
    XLogRecPtr      recptr;
@@ -126,7 +125,6 @@ _bt_update_meta_cleanup_info(Relation rel, TransactionId oldestBtpoXact,
    /* read the metapage and check if it needs rewrite */
    metabuf = _bt_getbuf(rel, BTREE_METAPAGE, BT_READ);
    metapg = BufferGetPage(metabuf);
-   metaopaque = (BTPageOpaque) PageGetSpecialPointer(metapg);
    metad = BTPageGetMeta(metapg);
 
    /* outdated version of metapage always needs rewrite */

diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 06badc90ba133363d6ef8963b99715893e4f821e..66a66f2dadb0445aae1b400ffcdbd04cdec46ad0 100644 (file)
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -786,13 +786,11 @@ _bt_vacuum_needs_cleanup(IndexVacuumInfo *info)
 {
    Buffer          metabuf;
    Page            metapg;
-   BTPageOpaque    metaopaque;
    BTMetaPageData *metad;
    bool            result = false;
 
    metabuf = _bt_getbuf(info->index, BTREE_METAPAGE, BT_READ);
    metapg = BufferGetPage(metabuf);
-   metaopaque = (BTPageOpaque) PageGetSpecialPointer(metapg);
    metad = BTPageGetMeta(metapg);
 
    if (metad->btm_version < BTREE_VERSION)