Final pgindent + perltidy run for 9.6.

diff --git a/src/backend/access/brin/brin_validate.c b/src/backend/access/brin/brin_validate.c
index 2b3a2cb0abc803bdd28e3e2513cc01e116edbec5..1f1011e0acfc609bd3d52db0b828f16353243424 100644 (file)
--- a/src/backend/access/brin/brin_validate.c
+++ b/src/backend/access/brin/brin_validate.c
@@ -264,8 +264,8 @@ brinvalidate(Oid opclassoid)
                        continue;                       /* got it */
                ereport(INFO,
                                (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-                                errmsg("brin operator class \"%s\" is missing support function %d",
-                                               opclassname, i)));
+                 errmsg("brin operator class \"%s\" is missing support function %d",
+                                opclassname, i)));
                result = false;
        }
 

diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c
index 7518ededd95e1a006ad6b6292c6e2167ba0d46a8..032508387d1ac3083f89a49f9ee7ae8917eb169a 100644 (file)
--- a/src/backend/access/gin/ginvalidate.c
+++ b/src/backend/access/gin/ginvalidate.c
@@ -243,8 +243,8 @@ ginvalidate(Oid opclassoid)
                        continue;                       /* don't need both, see check below loop */
                ereport(INFO,
                                (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-                                errmsg("gin operator class \"%s\" is missing support function %d",
-                                               opclassname, i)));
+                  errmsg("gin operator class \"%s\" is missing support function %d",
+                                 opclassname, i)));
                result = false;
        }
        if (!opclassgroup ||

diff --git a/src/backend/access/gist/gistvalidate.c b/src/backend/access/gist/gistvalidate.c
index 190a3d2f0cf56ba46e56177aa7c13aecd589eef0..ffd7fd631b8d40195d309ba82ae6d37a1613206a 100644 (file)
--- a/src/backend/access/gist/gistvalidate.c
+++ b/src/backend/access/gist/gistvalidate.c
@@ -261,8 +261,8 @@ gistvalidate(Oid opclassoid)
                        continue;                       /* optional methods */
                ereport(INFO,
                                (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-                                errmsg("gist operator class \"%s\" is missing support function %d",
-                                               opclassname, i)));
+                 errmsg("gist operator class \"%s\" is missing support function %d",
+                                opclassname, i)));
                result = false;
        }
 

diff --git a/src/backend/access/hash/hashvalidate.c b/src/backend/access/hash/hashvalidate.c
index b9b7bb0395a3a5413c051d813886143d0d03b694..d8c5ed4d98e3b3d06f751ba585d9865c2f282483 100644 (file)
--- a/src/backend/access/hash/hashvalidate.c
+++ b/src/backend/access/hash/hashvalidate.c
@@ -186,9 +186,9 @@ hashvalidate(Oid opclassoid)
                {
                        ereport(INFO,
                                        (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-                       errmsg("hash operator family \"%s\" lacks support function for operator %s",
-                                  opfamilyname,
-                                  format_operator(oprform->amopopr))));
+                                        errmsg("hash operator family \"%s\" lacks support function for operator %s",
+                                                       opfamilyname,
+                                                       format_operator(oprform->amopopr))));
                        result = false;
                }
        }

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 4acc62a550ea5e22de4dbbfe0f04d10546653c13..24bd9be5e17cefebf33c52823ceca3a17e0c8b5a 100644 (file)
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -4571,7 +4571,7 @@ heap_lock_tuple(Relation relation, HeapTuple tuple,
        ItemId          lp;
        Page            page;
        Buffer          vmbuffer = InvalidBuffer;
-       BlockNumber     block;
+       BlockNumber block;
        TransactionId xid,
                                xmax;
        uint16          old_infomask,
@@ -5643,7 +5643,7 @@ static HTSU_Result
 heap_lock_updated_tuple_rec(Relation rel, ItemPointer tid, TransactionId xid,
                                                        LockTupleMode mode)
 {
-       HTSU_Result     result;
+       HTSU_Result result;
        ItemPointerData tupid;
        HeapTupleData mytup;
        Buffer          buf;
@@ -6698,6 +6698,7 @@ heap_prepare_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
        if (tuple->t_infomask & HEAP_MOVED)
        {
                xid = HeapTupleHeaderGetXvac(tuple);
+
                /*
                 * For Xvac, we ignore the cutoff_xid and just always perform the
                 * freeze operation.  The oldest release in which such a value can
@@ -8841,9 +8842,9 @@ heap_xlog_lock(XLogReaderState *record)
         */
        if (xlrec->flags & XLH_LOCK_ALL_FROZEN_CLEARED)
        {
-               RelFileNode     rnode;
+               RelFileNode rnode;
                Buffer          vmbuffer = InvalidBuffer;
-               BlockNumber     block;
+               BlockNumber block;
                Relation        reln;
 
                XLogRecGetBlockTag(record, 0, &rnode, NULL, &block);
@@ -8914,9 +8915,9 @@ heap_xlog_lock_updated(XLogReaderState *record)
         */
        if (xlrec->flags & XLH_LOCK_ALL_FROZEN_CLEARED)
        {
-               RelFileNode     rnode;
+               RelFileNode rnode;
                Buffer          vmbuffer = InvalidBuffer;
-               BlockNumber     block;
+               BlockNumber block;
                Relation        reln;
 
                XLogRecGetBlockTag(record, 0, &rnode, NULL, &block);

diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c
index 31b0132b4223cca4c7050dce43ea842d14f515ba..bbb26493717a5b50b3aeb084a587295ad8f49ca4 100644 (file)
--- a/src/backend/access/heap/tuptoaster.c
+++ b/src/backend/access/heap/tuptoaster.c
@@ -1667,7 +1667,7 @@ toast_delete_datum(Relation rel, Datum value)
        HeapTuple       toasttup;
        int                     num_indexes;
        int                     validIndex;
-       SnapshotData    SnapshotToast;
+       SnapshotData SnapshotToast;
 
        if (!VARATT_IS_EXTERNAL_ONDISK(attr))
                return;
@@