Clean up newlines following left parentheses

Most came in during the 17 cycle, so backpatch there.  Some
(particularly reorderbuffer.h) are very old, but backpatching doesn't
seem useful.

Like commits c9d297751959, c4f113e8fef9.

diff --git a/contrib/bloom/bloom.h b/contrib/bloom/bloom.h
index fba3ba77711a4694df117ce554219fd0c08205b1..83c81e640f9f6922437f86dc2d0ef1129749f53b 100644 (file)
--- a/contrib/bloom/bloom.h
+++ b/contrib/bloom/bloom.h
@@ -110,12 +110,9 @@ typedef struct BloomOptions
  * FreeBlockNumberArray - array of block numbers sized so that metadata fill
  * all space in metapage.
  */
-typedef BlockNumber FreeBlockNumberArray[
-                                        MAXALIGN_DOWN(
-                                                      BLCKSZ - SizeOfPageHeaderData - MAXALIGN(sizeof(BloomPageOpaqueData))
-                                                      - MAXALIGN(sizeof(uint16) * 2 + sizeof(uint32) + sizeof(BloomOptions))
-                                                      ) / sizeof(BlockNumber)
-];
+typedef BlockNumber FreeBlockNumberArray[MAXALIGN_DOWN(BLCKSZ - SizeOfPageHeaderData - MAXALIGN(sizeof(BloomPageOpaqueData))
+                                                      - MAXALIGN(sizeof(uint16) * 2 + sizeof(uint32) + sizeof(BloomOptions)))
+                                        / sizeof(BlockNumber)];
 
 /* Metadata of bloom index */
 typedef struct BloomMetaPageData

diff --git a/src/backend/backup/basebackup_incremental.c b/src/backend/backup/basebackup_incremental.c
index 275615877eb25604b4e172b7ece4656ab59c2a27..87cc1b96cbced284fd9eadf5f737e66fa1769fb1 100644 (file)
--- a/src/backend/backup/basebackup_incremental.c
+++ b/src/backend/backup/basebackup_incremental.c
@@ -205,8 +205,8 @@ AppendIncrementalManifestData(IncrementalBackupInfo *ib, const char *data,
         * time for an incremental parse. We'll do all but the last MIN_CHUNK
         * so that we have enough left for the final piece.
         */
-       json_parse_manifest_incremental_chunk(
-                                             ib->inc_state, ib->buf.data, ib->buf.len - MIN_CHUNK, false);
+       json_parse_manifest_incremental_chunk(ib->inc_state, ib->buf.data,
+                                             ib->buf.len - MIN_CHUNK, false);
        /* now remove what we just parsed  */
        memmove(ib->buf.data, ib->buf.data + (ib->buf.len - MIN_CHUNK),
                MIN_CHUNK + 1);
@@ -232,8 +232,8 @@ FinalizeIncrementalManifest(IncrementalBackupInfo *ib)
    oldcontext = MemoryContextSwitchTo(ib->mcxt);
 
    /* Parse the last chunk of the manifest */
-   json_parse_manifest_incremental_chunk(
-                                         ib->inc_state, ib->buf.data, ib->buf.len, true);
+   json_parse_manifest_incremental_chunk(ib->inc_state, ib->buf.data,
+                                         ib->buf.len, true);
 
    /* Done with the buffer, so release memory. */
    pfree(ib->buf.data);

diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index d4e89663ec130a5414f3fc113093dadce0cbe334..06cc42c1f0427bd5447f439c589bc92b8d30bf52 100644 (file)
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -1374,8 +1374,8 @@ init_database_collation(void)
        default_locale.collate_is_c = true;
        default_locale.ctype_is_c = (strcmp(datlocale, "C") == 0);
 
-       default_locale.info.builtin.locale = MemoryContextStrdup(
-                                                                TopMemoryContext, datlocale);
+       default_locale.info.builtin.locale = MemoryContextStrdup(TopMemoryContext,
+                                                                datlocale);
    }
    else if (dbform->datlocprovider == COLLPROVIDER_ICU)
    {

diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 342467fd1863630d4433663bba99bd27e6e3727b..72cd808df70738764aae07de2b2f4925b91b124d 100644 (file)
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -5643,8 +5643,7 @@ RelationGetExclusionInfo(Relation indexRelation,
 
        /* We want the exclusion constraint owning the index */
        if ((conform->contype != CONSTRAINT_EXCLUSION &&
-            !(conform->conperiod && (
-                                     conform->contype == CONSTRAINT_PRIMARY
+            !(conform->conperiod && (conform->contype == CONSTRAINT_PRIMARY
                                      || conform->contype == CONSTRAINT_UNIQUE))) ||
            conform->conindid != RelationGetRelid(indexRelation))
            continue;

diff --git a/src/bin/pg_combinebackup/load_manifest.c b/src/bin/pg_combinebackup/load_manifest.c
index 3a3ad6c2474c0f07ba84409e0eb64ca4f22abcf1..54adb5a41d27416e9b0250c6bb501d761edb9c34 100644 (file)
--- a/src/bin/pg_combinebackup/load_manifest.c
+++ b/src/bin/pg_combinebackup/load_manifest.c
@@ -204,8 +204,7 @@ load_backup_manifest(char *backup_directory)
                             (long long int) statbuf.st_size);
            }
            bytes_left -= rc;
-           json_parse_manifest_incremental_chunk(
-                                                 inc_state, buffer, rc, bytes_left == 0);
+           json_parse_manifest_incremental_chunk(inc_state, buffer, rc, bytes_left == 0);
        }
 
        /* Release the incremental state memory */

diff --git a/src/common/parse_manifest.c b/src/common/parse_manifest.c
index ad2d0fd808f26bb08552789df2122f8c280c3ce6..a3896eaebe2d556582d9f60cc14e816b3f0d5d94 100644 (file)
--- a/src/common/parse_manifest.c
+++ b/src/common/parse_manifest.c
@@ -182,9 +182,8 @@ json_parse_manifest_incremental_shutdown(JsonManifestParseIncrementalState *incs
  */
 
 void
-json_parse_manifest_incremental_chunk(
-                                     JsonManifestParseIncrementalState *incstate, const char *chunk, size_t size,
-                                     bool is_last)
+json_parse_manifest_incremental_chunk(JsonManifestParseIncrementalState *incstate,
+                                     const char *chunk, size_t size, bool is_last)
 {
    JsonParseErrorType res,
                expected;

diff --git a/src/common/unicode/category_test.c b/src/common/unicode/category_test.c
index e823044d63a2f5664e6bb7fcb21ba511ef65a7ab..ba6aa7be574a95b044008eae944e5839abe187ce 100644 (file)
--- a/src/common/unicode/category_test.c
+++ b/src/common/unicode/category_test.c
@@ -74,22 +74,14 @@ icu_test()
        bool        prop_hex_digit = pg_u_prop_hex_digit(code);
        bool        prop_join_control = pg_u_prop_join_control(code);
 
-       bool        icu_prop_alphabetic = u_hasBinaryProperty(
-                                                             code, UCHAR_ALPHABETIC);
-       bool        icu_prop_lowercase = u_hasBinaryProperty(
-                                                            code, UCHAR_LOWERCASE);
-       bool        icu_prop_uppercase = u_hasBinaryProperty(
-                                                            code, UCHAR_UPPERCASE);
-       bool        icu_prop_cased = u_hasBinaryProperty(
-                                                        code, UCHAR_CASED);
-       bool        icu_prop_case_ignorable = u_hasBinaryProperty(
-                                                                 code, UCHAR_CASE_IGNORABLE);
-       bool        icu_prop_white_space = u_hasBinaryProperty(
-                                                              code, UCHAR_WHITE_SPACE);
-       bool        icu_prop_hex_digit = u_hasBinaryProperty(
-                                                            code, UCHAR_HEX_DIGIT);
-       bool        icu_prop_join_control = u_hasBinaryProperty(
-                                                               code, UCHAR_JOIN_CONTROL);
+       bool        icu_prop_alphabetic = u_hasBinaryProperty(code, UCHAR_ALPHABETIC);
+       bool        icu_prop_lowercase = u_hasBinaryProperty(code, UCHAR_LOWERCASE);
+       bool        icu_prop_uppercase = u_hasBinaryProperty(code, UCHAR_UPPERCASE);
+       bool        icu_prop_cased = u_hasBinaryProperty(code, UCHAR_CASED);
+       bool        icu_prop_case_ignorable = u_hasBinaryProperty(code, UCHAR_CASE_IGNORABLE);
+       bool        icu_prop_white_space = u_hasBinaryProperty(code, UCHAR_WHITE_SPACE);
+       bool        icu_prop_hex_digit = u_hasBinaryProperty(code, UCHAR_HEX_DIGIT);
+       bool        icu_prop_join_control = u_hasBinaryProperty(code, UCHAR_JOIN_CONTROL);
 
        /*
         * Compare with ICU for character classes using:

diff --git a/src/include/common/parse_manifest.h b/src/include/common/parse_manifest.h
index 1b8bc447e445f541d8817f5e5b71f0212c566b62..607db25a3a64113cd8c79c3e397b4cd9ae05acb5 100644 (file)
--- a/src/include/common/parse_manifest.h
+++ b/src/include/common/parse_manifest.h
@@ -50,8 +50,8 @@ struct JsonManifestParseContext
 extern void json_parse_manifest(JsonManifestParseContext *context,
                                const char *buffer, size_t size);
 extern JsonManifestParseIncrementalState *json_parse_manifest_incremental_init(JsonManifestParseContext *context);
-extern void json_parse_manifest_incremental_chunk(
-                                                 JsonManifestParseIncrementalState *incstate, const char *chunk, size_t size,
+extern void json_parse_manifest_incremental_chunk(JsonManifestParseIncrementalState *incstate,
+                                                 const char *chunk, size_t size,
                                                  bool is_last);
 extern void json_parse_manifest_incremental_shutdown(JsonManifestParseIncrementalState *incstate);
 

diff --git a/src/include/replication/reorderbuffer.h b/src/include/replication/reorderbuffer.h
index 6ad5a8cb9c547597288a3ab7c71ea13bb8bfa59d..ecc2bd3297828a30104c2e784f1973b74653733d 100644 (file)
--- a/src/include/replication/reorderbuffer.h
+++ b/src/include/replication/reorderbuffer.h
@@ -482,45 +482,38 @@ typedef void (*ReorderBufferRollbackPreparedCB) (ReorderBuffer *rb,
                                                 TimestampTz prepare_time);
 
 /* start streaming transaction callback signature */
-typedef void (*ReorderBufferStreamStartCB) (
-                                           ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamStartCB) (ReorderBuffer *rb,
                                            ReorderBufferTXN *txn,
                                            XLogRecPtr first_lsn);
 
 /* stop streaming transaction callback signature */
-typedef void (*ReorderBufferStreamStopCB) (
-                                          ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamStopCB) (ReorderBuffer *rb,
                                           ReorderBufferTXN *txn,
                                           XLogRecPtr last_lsn);
 
 /* discard streamed transaction callback signature */
-typedef void (*ReorderBufferStreamAbortCB) (
-                                           ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamAbortCB) (ReorderBuffer *rb,
                                            ReorderBufferTXN *txn,
                                            XLogRecPtr abort_lsn);
 
 /* prepare streamed transaction callback signature */
-typedef void (*ReorderBufferStreamPrepareCB) (
-                                             ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamPrepareCB) (ReorderBuffer *rb,
                                              ReorderBufferTXN *txn,
                                              XLogRecPtr prepare_lsn);
 
 /* commit streamed transaction callback signature */
-typedef void (*ReorderBufferStreamCommitCB) (
-                                            ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamCommitCB) (ReorderBuffer *rb,
                                             ReorderBufferTXN *txn,
                                             XLogRecPtr commit_lsn);
 
 /* stream change callback signature */
-typedef void (*ReorderBufferStreamChangeCB) (
-                                            ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamChangeCB) (ReorderBuffer *rb,
                                             ReorderBufferTXN *txn,
                                             Relation relation,
                                             ReorderBufferChange *change);
 
 /* stream message callback signature */
-typedef void (*ReorderBufferStreamMessageCB) (
-                                             ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamMessageCB) (ReorderBuffer *rb,
                                              ReorderBufferTXN *txn,
                                              XLogRecPtr message_lsn,
                                              bool transactional,
@@ -528,16 +521,14 @@ typedef void (*ReorderBufferStreamMessageCB) (
                                              const char *message);
 
 /* stream truncate callback signature */
-typedef void (*ReorderBufferStreamTruncateCB) (
-                                              ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamTruncateCB) (ReorderBuffer *rb,
                                               ReorderBufferTXN *txn,
                                               int nrelations,
                                               Relation relations[],
                                               ReorderBufferChange *change);
 
 /* update progress txn callback signature */
-typedef void (*ReorderBufferUpdateProgressTxnCB) (
-                                                 ReorderBuffer *rb,
+typedef void (*ReorderBufferUpdateProgressTxnCB) (ReorderBuffer *rb,
                                                  ReorderBufferTXN *txn,
                                                  XLogRecPtr lsn);