Remove superfluous newlines in function prototypes.

These were introduced by pgindent due to fixe to broken
indentation (c.f. 8255c7a5eeba8). Previously the mis-indentation of
function prototypes was creatively used to reduce indentation in a few
places.

As that formatting only exists in master and REL_12_STABLE, it seems
better to fix it in both, rather than having some odd indentation in
v12 that somebody might copy for future patches or such.

Author: Andres Freund
Discussion: https://postgr.es/m/20190728013754.jwcbe5nfyt3533vx@alap3.anarazel.de
Backpatch: 12-

diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index efef120c038fdb4258ca2030a5d436a8651a775e..f7ee9838f7f6b06b5193577eaefc0c9cc61c7175 100644 (file)
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -151,8 +151,7 @@ static void AlterEventTriggerOwner_internal(Relation rel,
                                            HeapTuple tup,
                                            Oid newOwnerId);
 static event_trigger_command_tag_check_result check_ddl_tag(const char *tag);
-static event_trigger_command_tag_check_result check_table_rewrite_ddl_tag(
-                                                                         const char *tag);
+static event_trigger_command_tag_check_result check_table_rewrite_ddl_tag(const char *tag);
 static void error_duplicate_filter_variable(const char *defname);
 static Datum filter_list_to_array(List *filterlist);
 static Oid insert_event_trigger_tuple(const char *trigname, const char *eventname,

diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index 758b16dd357992fd3387e7ee88b3cc444fa31e62..f62105f5284007ed2af0fb36c9feb0289b098a69 100644 (file)
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -54,15 +54,13 @@
 
 
 static TupleTableSlot *BitmapHeapNext(BitmapHeapScanState *node);
-static inline void BitmapDoneInitializingSharedState(
-                                                    ParallelBitmapHeapState *pstate);
+static inline void BitmapDoneInitializingSharedState(ParallelBitmapHeapState *pstate);
 static inline void BitmapAdjustPrefetchIterator(BitmapHeapScanState *node,
                                                TBMIterateResult *tbmres);
 static inline void BitmapAdjustPrefetchTarget(BitmapHeapScanState *node);
 static inline void BitmapPrefetch(BitmapHeapScanState *node,
                                  TableScanDesc scan);
-static bool BitmapShouldInitializeSharedState(
-                                             ParallelBitmapHeapState *pstate);
+static bool BitmapShouldInitializeSharedState(ParallelBitmapHeapState *pstate);
 
 
 /* ----------------------------------------------------------------

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 931058695ac0ef4696a05eb29c081e3572d87c69..d7249e32da48ce6ce43963961d0997f6573ef686 100644 (file)
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -133,8 +133,7 @@ static int  CheckBSDAuth(Port *port, char *user);
 
 /* Correct header from the Platform SDK */
 typedef
-ULONG      (*__ldap_start_tls_sA) (
-                                   IN PLDAP ExternalHandle,
+ULONG      (*__ldap_start_tls_sA) (IN PLDAP ExternalHandle,
                                    OUT PULONG ServerReturnValue,
                                    OUT LDAPMessage **result,
                                    IN PLDAPControlA * ServerControls,

diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
index e16368d2a84d5d8952e41a07f0e51cf67df69443..a457c876c2beeb2c8d3d8a9da2f1835469c4473c 100644 (file)
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -68,8 +68,7 @@ SendSharedInvalidMessages(const SharedInvalidationMessage *msgs, int n)
  * sucked out of sinvaladt.c.
  */
 void
-ReceiveSharedInvalidMessages(
-                            void (*invalFunction) (SharedInvalidationMessage *msg),
+ReceiveSharedInvalidMessages(void (*invalFunction) (SharedInvalidationMessage *msg),
                             void (*resetFunction) (void))
 {
 #define MAXINVALMSGS 32

diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
index 6bf4dcaec33360c04077302b3d11c71abaa4dd30..e195e4fa52706e793c959c0e523c473aa609626d 100644 (file)
--- a/src/backend/utils/adt/jsonpath_exec.c
+++ b/src/backend/utils/adt/jsonpath_exec.c
@@ -184,11 +184,9 @@ static JsonPathExecResult executeItemUnwrapTargetArray(JsonPathExecContext *cxt,
 static JsonPathExecResult executeNextItem(JsonPathExecContext *cxt,
                                          JsonPathItem *cur, JsonPathItem *next,
                                          JsonbValue *v, JsonValueList *found, bool copy);
-static JsonPathExecResult executeItemOptUnwrapResult(
-                                                    JsonPathExecContext *cxt, JsonPathItem *jsp, JsonbValue *jb,
+static JsonPathExecResult executeItemOptUnwrapResult(JsonPathExecContext *cxt, JsonPathItem *jsp, JsonbValue *jb,
                                                     bool unwrap, JsonValueList *found);
-static JsonPathExecResult executeItemOptUnwrapResultNoThrow(
-                                                           JsonPathExecContext *cxt, JsonPathItem *jsp,
+static JsonPathExecResult executeItemOptUnwrapResultNoThrow(JsonPathExecContext *cxt, JsonPathItem *jsp,
                                                            JsonbValue *jb, bool unwrap, JsonValueList *found);
 static JsonPathBool executeBoolItem(JsonPathExecContext *cxt,
                                    JsonPathItem *jsp, JsonbValue *jb, bool canHaveNext);

diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h
index f84ea71ecba2e502e3010d3403b2cde847ac9807..a85b6faf45fad195a3c715b9e8340ebbea9f2c52 100644 (file)
--- a/src/include/access/gist_private.h
+++ b/src/include/access/gist_private.h
@@ -473,8 +473,7 @@ extern bool gistPageRecyclable(Page page);
 extern void gistfillbuffer(Page page, IndexTuple *itup, int len,
                           OffsetNumber off);
 extern IndexTuple *gistextractpage(Page page, int *len /* out */ );
-extern IndexTuple *gistjoinvector(
-                                 IndexTuple *itvec, int *len,
+extern IndexTuple *gistjoinvector(IndexTuple *itvec, int *len,
                                  IndexTuple *additvec, int addlen);
 extern IndexTupleData *gistfillitupvec(IndexTuple *vec, int veclen, int *memlen);
 

diff --git a/src/include/replication/logical.h b/src/include/replication/logical.h
index f76b9eb4df4ce4cd8cb68d426281dc90e9bb7018..31c796b765160378adf7a28c0338c6b5cb1752c9 100644 (file)
--- a/src/include/replication/logical.h
+++ b/src/include/replication/logical.h
@@ -17,8 +17,7 @@
 
 struct LogicalDecodingContext;
 
-typedef void (*LogicalOutputPluginWriterWrite) (
-                                               struct LogicalDecodingContext *lr,
+typedef void (*LogicalOutputPluginWriterWrite) (struct LogicalDecodingContext *lr,
                                                XLogRecPtr Ptr,
                                                TransactionId xid,
                                                bool last_write
@@ -26,8 +25,7 @@ typedef void (*LogicalOutputPluginWriterWrite) (
 
 typedef LogicalOutputPluginWriterWrite LogicalOutputPluginWriterPrepareWrite;
 
-typedef void (*LogicalOutputPluginWriterUpdateProgress) (
-                                                        struct LogicalDecodingContext *lr,
+typedef void (*LogicalOutputPluginWriterUpdateProgress) (struct LogicalDecodingContext *lr,
                                                         XLogRecPtr Ptr,
                                                         TransactionId xid
 );
@@ -102,8 +100,7 @@ extern LogicalDecodingContext *CreateInitDecodingContext(char *plugin,
                                                         LogicalOutputPluginWriterPrepareWrite prepare_write,
                                                         LogicalOutputPluginWriterWrite do_write,
                                                         LogicalOutputPluginWriterUpdateProgress update_progress);
-extern LogicalDecodingContext *CreateDecodingContext(
-                                                    XLogRecPtr start_lsn,
+extern LogicalDecodingContext *CreateDecodingContext(XLogRecPtr start_lsn,
                                                     List *output_plugin_options,
                                                     bool fast_forward,
                                                     XLogPageReadCB read_page,

diff --git a/src/include/replication/reorderbuffer.h b/src/include/replication/reorderbuffer.h
index 735e6d32b86c711b81efebc7a1f1cf07f4bb1432..4c06a78c11f0fc57c2b11c4c46fd5add64aa42e9 100644 (file)
--- a/src/include/replication/reorderbuffer.h
+++ b/src/include/replication/reorderbuffer.h
@@ -292,34 +292,29 @@ typedef struct ReorderBufferTXN
 typedef struct ReorderBuffer ReorderBuffer;
 
 /* change callback signature */
-typedef void (*ReorderBufferApplyChangeCB) (
-                                           ReorderBuffer *rb,
+typedef void (*ReorderBufferApplyChangeCB) (ReorderBuffer *rb,
                                            ReorderBufferTXN *txn,
                                            Relation relation,
                                            ReorderBufferChange *change);
 
 /* truncate callback signature */
-typedef void (*ReorderBufferApplyTruncateCB) (
-                                             ReorderBuffer *rb,
+typedef void (*ReorderBufferApplyTruncateCB) (ReorderBuffer *rb,
                                              ReorderBufferTXN *txn,
                                              int nrelations,
                                              Relation relations[],
                                              ReorderBufferChange *change);
 
 /* begin callback signature */
-typedef void (*ReorderBufferBeginCB) (
-                                     ReorderBuffer *rb,
+typedef void (*ReorderBufferBeginCB) (ReorderBuffer *rb,
                                      ReorderBufferTXN *txn);
 
 /* commit callback signature */
-typedef void (*ReorderBufferCommitCB) (
-                                      ReorderBuffer *rb,
+typedef void (*ReorderBufferCommitCB) (ReorderBuffer *rb,
                                       ReorderBufferTXN *txn,
                                       XLogRecPtr commit_lsn);
 
 /* message callback signature */
-typedef void (*ReorderBufferMessageCB) (
-                                       ReorderBuffer *rb,
+typedef void (*ReorderBufferMessageCB) (ReorderBuffer *rb,
                                        ReorderBufferTXN *txn,
                                        XLogRecPtr message_lsn,
                                        bool transactional,

diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h
index c2875a9d329a355dc4a2bcbe7a2e5c59b2e6d985..a9cccfc6c44183003a1d01ffed01b5af57aefebb 100644 (file)
--- a/src/include/storage/sinval.h
+++ b/src/include/storage/sinval.h
@@ -129,8 +129,7 @@ extern volatile sig_atomic_t catchupInterruptPending;
 
 extern void SendSharedInvalidMessages(const SharedInvalidationMessage *msgs,
                                      int n);
-extern void ReceiveSharedInvalidMessages(
-                                        void (*invalFunction) (SharedInvalidationMessage *msg),
+extern void ReceiveSharedInvalidMessages(void (*invalFunction) (SharedInvalidationMessage *msg),
                                         void (*resetFunction) (void));
 
 /* signal handler for catchup events (PROCSIG_CATCHUP_INTERRUPT) */

diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index e709177c37698409d212c1dc1029abe409cddc7f..e800230ed94f1200f90cd2ea096aa5c7efaac0c3 100644 (file)
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -283,8 +283,7 @@ extern bool trace_sort;
 extern void SetConfigOption(const char *name, const char *value,
                            GucContext context, GucSource source);
 
-extern void DefineCustomBoolVariable(
-                                    const char *name,
+extern void DefineCustomBoolVariable(const char *name,
                                     const char *short_desc,
                                     const char *long_desc,
                                     bool *valueAddr,
@@ -295,8 +294,7 @@ extern void DefineCustomBoolVariable(
                                     GucBoolAssignHook assign_hook,
                                     GucShowHook show_hook);
 
-extern void DefineCustomIntVariable(
-                                   const char *name,
+extern void DefineCustomIntVariable(const char *name,
                                    const char *short_desc,
                                    const char *long_desc,
                                    int *valueAddr,
@@ -309,8 +307,7 @@ extern void DefineCustomIntVariable(
                                    GucIntAssignHook assign_hook,
                                    GucShowHook show_hook);
 
-extern void DefineCustomRealVariable(
-                                    const char *name,
+extern void DefineCustomRealVariable(const char *name,
                                     const char *short_desc,
                                     const char *long_desc,
                                     double *valueAddr,
@@ -323,8 +320,7 @@ extern void DefineCustomRealVariable(
                                     GucRealAssignHook assign_hook,
                                     GucShowHook show_hook);
 
-extern void DefineCustomStringVariable(
-                                      const char *name,
+extern void DefineCustomStringVariable(const char *name,
                                       const char *short_desc,
                                       const char *long_desc,
                                       char **valueAddr,
@@ -335,8 +331,7 @@ extern void DefineCustomStringVariable(
                                       GucStringAssignHook assign_hook,
                                       GucShowHook show_hook);
 
-extern void DefineCustomEnumVariable(
-                                    const char *name,
+extern void DefineCustomEnumVariable(const char *name,
                                     const char *short_desc,
                                     const char *long_desc,
                                     int *valueAddr,