pgindent run prior to branching v13.

pgperltidy and reformat-dat-files too, though those didn't
find anything to change.

diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c
index 4d8836cfb3fdb5b462f038eeffb2babff623d33e..cca5c117a0eeffe676fede4daafc28f9ca81c83e 100644 (file)
--- a/src/backend/jit/llvm/llvmjit_expr.c
+++ b/src/backend/jit/llvm/llvmjit_expr.c
@@ -2448,8 +2448,8 @@ BuildV1Call(LLVMJitContext *context, LLVMBuilderRef b,
        *v_fcinfo_isnull = LLVMBuildLoad(b, v_fcinfo_isnullp, "");
 
    /*
-    * Add lifetime-end annotation, signaling that writes to memory don't
-    * have to be retained (important for inlining potential).
+    * Add lifetime-end annotation, signaling that writes to memory don't have
+    * to be retained (important for inlining potential).
     */
    {
        LLVMValueRef v_lifetime = create_LifetimeEnd(mod);

diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 744eed187d410e9cc0a6c5220a045a6888c973b5..eb9543f6add073c572675562b2dbf24d17c244b8 100644 (file)
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -2118,9 +2118,9 @@ create_agg_plan(PlannerInfo *root, AggPath *best_path)
    /*
     * Agg can project, so no need to be terribly picky about child tlist, but
     * we do need grouping columns to be available. We are a bit more careful
-    * with hash aggregate, where we explicitly request small tlist to minimize
-    * I/O needed for spilling (we can't be sure spilling won't be necessary,
-    * so we just do it every time).
+    * with hash aggregate, where we explicitly request small tlist to
+    * minimize I/O needed for spilling (we can't be sure spilling won't be
+    * necessary, so we just do it every time).
     */
    flags = CP_LABEL_TLIST;
 
@@ -2219,9 +2219,9 @@ create_groupingsets_plan(PlannerInfo *root, GroupingSetsPath *best_path)
    /*
     * Agg can project, so no need to be terribly picky about child tlist, but
     * we do need grouping columns to be available. We are a bit more careful
-    * with hash aggregate, where we explicitly request small tlist to minimize
-    * I/O needed for spilling (we can't be sure spilling won't be necessary,
-    * so we just do it every time).
+    * with hash aggregate, where we explicitly request small tlist to
+    * minimize I/O needed for spilling (we can't be sure spilling won't be
+    * necessary, so we just do it every time).
     */
    flags = CP_LABEL_TLIST;
 

diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 38dc97de11f9be933a280b855b59988857112f56..9c7d4b0c60e4bdb2df6dc21ef1882bd6a9106ba2 100644 (file)
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -653,8 +653,7 @@ AutoVacLauncherMain(int argc, char *argv[])
        HandleAutoVacLauncherInterrupts();
 
        /*
-        * a worker finished, or postmaster signaled failure to start a
-        * worker
+        * a worker finished, or postmaster signaled failure to start a worker
         */
        if (got_SIGUSR2)
        {

diff --git a/src/backend/utils/sort/logtape.c b/src/backend/utils/sort/logtape.c
index 4984f8ce50a4527a68a46bb263ca405155adf444..138da0c1b42ca23388759ffd1bc43bddac5177d0 100644 (file)
--- a/src/backend/utils/sort/logtape.c
+++ b/src/backend/utils/sort/logtape.c
@@ -170,7 +170,7 @@ typedef struct LogicalTape
     * numbers first).
     */
    long       *prealloc;
-   int         nprealloc;      /* number of elements in list */
+   int         nprealloc;      /* number of elements in list */
    int         prealloc_size;  /* number of elements list can hold */
 } LogicalTape;
 

diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h
index 30a21c9bc51518b68bad61884eb87e0e6dd0d52c..eb18739c36505aac1636a35cbc43e8df6be94b41 100644 (file)
--- a/src/include/access/tableam.h
+++ b/src/include/access/tableam.h
@@ -290,7 +290,7 @@ typedef struct TableAmRoutine
     *
     * *call_again is false on the first call to index_fetch_tuple for a tid.
     * If there potentially is another tuple matching the tid, *call_again
-    * needs be set to true by index_fetch_tuple, signaling to the caller
+    * needs to be set to true by index_fetch_tuple, signaling to the caller
     * that index_fetch_tuple should be called again for the same tid.
     *
     * *all_dead, if all_dead is not NULL, should be set to true by

diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index 05c5e9c752ddfa3b8bba952f9ec35e89295f0ccc..c65a55257dddd50a2bbd19aacc69c4232b64ef56 100644 (file)
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -1459,7 +1459,6 @@ OffsetVarNodes_context
 Oid
 OidOptions
 OkeysState
-OldSerXidControl
 OldSnapshotControlData
 OldToNewMapping
 OldToNewMappingData
@@ -1659,7 +1658,7 @@ PQconninfoOption
 PQnoticeProcessor
 PQnoticeReceiver
 PQprintOpt
-PQsslKeyPassHook_type
+PQsslKeyPassHook_OpenSSL_type
 PREDICATELOCK
 PREDICATELOCKTAG
 PREDICATELOCKTARGET