Skip to content

Commit b0e5728

Browse files
alvherrealvherre
committed
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 c9d2977, c4f113e.
1 parent f3834c1 commit b0e5728

File tree

8 files changed

+30
-53
lines changed

8 files changed

+30
-53
lines changed

‎contrib/bloom/bloom.h

+3-6
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,9 @@ typedef struct BloomOptions
110110
* FreeBlockNumberArray - array of block numbers sized so that metadata fill
111111
* all space in metapage.
112112
*/
113-
typedef BlockNumber FreeBlockNumberArray[
114-
MAXALIGN_DOWN(
115-
BLCKSZ - SizeOfPageHeaderData - MAXALIGN(sizeof(BloomPageOpaqueData))
116-
- MAXALIGN(sizeof(uint16) * 2 + sizeof(uint32) + sizeof(BloomOptions))
117-
) / sizeof(BlockNumber)
118-
];
113+
typedef BlockNumber FreeBlockNumberArray[MAXALIGN_DOWN(BLCKSZ - SizeOfPageHeaderData - MAXALIGN(sizeof(BloomPageOpaqueData))
114+
- MAXALIGN(sizeof(uint16) * 2 + sizeof(uint32) + sizeof(BloomOptions)))
115+
/ sizeof(BlockNumber)];
119116

120117
/* Metadata of bloom index */
121118
typedef struct BloomMetaPageData

‎src/backend/backup/basebackup_incremental.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ AppendIncrementalManifestData(IncrementalBackupInfo *ib, const char *data,
207207
* time for an incremental parse. We'll do all but the last MIN_CHUNK
208208
* so that we have enough left for the final piece.
209209
*/
210-
json_parse_manifest_incremental_chunk(
211-
ib->inc_state, ib->buf.data, ib->buf.len - MIN_CHUNK, false);
210+
json_parse_manifest_incremental_chunk(ib->inc_state, ib->buf.data,
211+
ib->buf.len - MIN_CHUNK, false);
212212
/* now remove what we just parsed */
213213
memmove(ib->buf.data, ib->buf.data + (ib->buf.len - MIN_CHUNK),
214214
MIN_CHUNK + 1);
@@ -234,8 +234,8 @@ FinalizeIncrementalManifest(IncrementalBackupInfo *ib)
234234
oldcontext = MemoryContextSwitchTo(ib->mcxt);
235235

236236
/* Parse the last chunk of the manifest */
237-
json_parse_manifest_incremental_chunk(
238-
ib->inc_state, ib->buf.data, ib->buf.len, true);
237+
json_parse_manifest_incremental_chunk(ib->inc_state, ib->buf.data,
238+
ib->buf.len, true);
239239

240240
/* Done with the buffer, so release memory. */
241241
pfree(ib->buf.data);

‎src/backend/utils/init/postinit.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,7 @@ CheckMyDatabase(const char *name, bool am_superuser, bool override_allow_connect
431431

432432
builtin_validate_locale(dbform->encoding, datlocale);
433433

434-
default_locale.info.builtin.locale = MemoryContextStrdup(
435-
TopMemoryContext, datlocale);
434+
default_locale.info.builtin.locale = MemoryContextStrdup(TopMemoryContext, datlocale);
436435
}
437436
else if (dbform->datlocprovider == COLLPROVIDER_ICU)
438437
{

‎src/bin/pg_combinebackup/load_manifest.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,7 @@ load_backup_manifest(char *backup_directory)
204204
(long long int) statbuf.st_size);
205205
}
206206
bytes_left -= rc;
207-
json_parse_manifest_incremental_chunk(
208-
inc_state, buffer, rc, bytes_left == 0);
207+
json_parse_manifest_incremental_chunk(inc_state, buffer, rc, bytes_left == 0);
209208
}
210209

211210
/* Release the incremental state memory */

‎src/common/parse_manifest.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,8 @@ json_parse_manifest_incremental_shutdown(JsonManifestParseIncrementalState *incs
182182
*/
183183

184184
void
185-
json_parse_manifest_incremental_chunk(
186-
JsonManifestParseIncrementalState *incstate, const char *chunk, size_t size,
187-
bool is_last)
185+
json_parse_manifest_incremental_chunk(JsonManifestParseIncrementalState *incstate,
186+
const char *chunk, size_t size, bool is_last)
188187
{
189188
JsonParseErrorType res,
190189
expected;

‎src/common/unicode/category_test.c

+8-16
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,14 @@ icu_test()
7474
bool prop_hex_digit = pg_u_prop_hex_digit(code);
7575
bool prop_join_control = pg_u_prop_join_control(code);
7676

77-
bool icu_prop_alphabetic = u_hasBinaryProperty(
78-
code, UCHAR_ALPHABETIC);
79-
bool icu_prop_lowercase = u_hasBinaryProperty(
80-
code, UCHAR_LOWERCASE);
81-
bool icu_prop_uppercase = u_hasBinaryProperty(
82-
code, UCHAR_UPPERCASE);
83-
bool icu_prop_cased = u_hasBinaryProperty(
84-
code, UCHAR_CASED);
85-
bool icu_prop_case_ignorable = u_hasBinaryProperty(
86-
code, UCHAR_CASE_IGNORABLE);
87-
bool icu_prop_white_space = u_hasBinaryProperty(
88-
code, UCHAR_WHITE_SPACE);
89-
bool icu_prop_hex_digit = u_hasBinaryProperty(
90-
code, UCHAR_HEX_DIGIT);
91-
bool icu_prop_join_control = u_hasBinaryProperty(
92-
code, UCHAR_JOIN_CONTROL);
77+
bool icu_prop_alphabetic = u_hasBinaryProperty(code, UCHAR_ALPHABETIC);
78+
bool icu_prop_lowercase = u_hasBinaryProperty(code, UCHAR_LOWERCASE);
79+
bool icu_prop_uppercase = u_hasBinaryProperty(code, UCHAR_UPPERCASE);
80+
bool icu_prop_cased = u_hasBinaryProperty(code, UCHAR_CASED);
81+
bool icu_prop_case_ignorable = u_hasBinaryProperty(code, UCHAR_CASE_IGNORABLE);
82+
bool icu_prop_white_space = u_hasBinaryProperty(code, UCHAR_WHITE_SPACE);
83+
bool icu_prop_hex_digit = u_hasBinaryProperty(code, UCHAR_HEX_DIGIT);
84+
bool icu_prop_join_control = u_hasBinaryProperty(code, UCHAR_JOIN_CONTROL);
9385

9486
/*
9587
* Compare with ICU for character classes using:

‎src/include/common/parse_manifest.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ struct JsonManifestParseContext
5050
extern void json_parse_manifest(JsonManifestParseContext *context,
5151
const char *buffer, size_t size);
5252
extern JsonManifestParseIncrementalState *json_parse_manifest_incremental_init(JsonManifestParseContext *context);
53-
extern void json_parse_manifest_incremental_chunk(
54-
JsonManifestParseIncrementalState *incstate, const char *chunk, size_t size,
53+
extern void json_parse_manifest_incremental_chunk(JsonManifestParseIncrementalState *incstate,
54+
const char *chunk, size_t size,
5555
bool is_last);
5656
extern void json_parse_manifest_incremental_shutdown(JsonManifestParseIncrementalState *incstate);
5757

‎src/include/replication/reorderbuffer.h

+9-18
Original file line numberDiff line numberDiff line change
@@ -478,62 +478,53 @@ typedef void (*ReorderBufferRollbackPreparedCB) (ReorderBuffer *rb,
478478
TimestampTz prepare_time);
479479

480480
/* start streaming transaction callback signature */
481-
typedef void (*ReorderBufferStreamStartCB) (
482-
ReorderBuffer *rb,
481+
typedef void (*ReorderBufferStreamStartCB) (ReorderBuffer *rb,
483482
ReorderBufferTXN *txn,
484483
XLogRecPtr first_lsn);
485484

486485
/* stop streaming transaction callback signature */
487-
typedef void (*ReorderBufferStreamStopCB) (
488-
ReorderBuffer *rb,
486+
typedef void (*ReorderBufferStreamStopCB) (ReorderBuffer *rb,
489487
ReorderBufferTXN *txn,
490488
XLogRecPtr last_lsn);
491489

492490
/* discard streamed transaction callback signature */
493-
typedef void (*ReorderBufferStreamAbortCB) (
494-
ReorderBuffer *rb,
491+
typedef void (*ReorderBufferStreamAbortCB) (ReorderBuffer *rb,
495492
ReorderBufferTXN *txn,
496493
XLogRecPtr abort_lsn);
497494

498495
/* prepare streamed transaction callback signature */
499-
typedef void (*ReorderBufferStreamPrepareCB) (
500-
ReorderBuffer *rb,
496+
typedef void (*ReorderBufferStreamPrepareCB) (ReorderBuffer *rb,
501497
ReorderBufferTXN *txn,
502498
XLogRecPtr prepare_lsn);
503499

504500
/* commit streamed transaction callback signature */
505-
typedef void (*ReorderBufferStreamCommitCB) (
506-
ReorderBuffer *rb,
501+
typedef void (*ReorderBufferStreamCommitCB) (ReorderBuffer *rb,
507502
ReorderBufferTXN *txn,
508503
XLogRecPtr commit_lsn);
509504

510505
/* stream change callback signature */
511-
typedef void (*ReorderBufferStreamChangeCB) (
512-
ReorderBuffer *rb,
506+
typedef void (*ReorderBufferStreamChangeCB) (ReorderBuffer *rb,
513507
ReorderBufferTXN *txn,
514508
Relation relation,
515509
ReorderBufferChange *change);
516510

517511
/* stream message callback signature */
518-
typedef void (*ReorderBufferStreamMessageCB) (
519-
ReorderBuffer *rb,
512+
typedef void (*ReorderBufferStreamMessageCB) (ReorderBuffer *rb,
520513
ReorderBufferTXN *txn,
521514
XLogRecPtr message_lsn,
522515
bool transactional,
523516
const char *prefix, Size sz,
524517
const char *message);
525518

526519
/* stream truncate callback signature */
527-
typedef void (*ReorderBufferStreamTruncateCB) (
528-
ReorderBuffer *rb,
520+
typedef void (*ReorderBufferStreamTruncateCB) (ReorderBuffer *rb,
529521
ReorderBufferTXN *txn,
530522
int nrelations,
531523
Relation relations[],
532524
ReorderBufferChange *change);
533525

534526
/* update progress txn callback signature */
535-
typedef void (*ReorderBufferUpdateProgressTxnCB) (
536-
ReorderBuffer *rb,
527+
typedef void (*ReorderBufferUpdateProgressTxnCB) (ReorderBuffer *rb,
537528
ReorderBufferTXN *txn,
538529
XLogRecPtr lsn);
539530

0 commit comments

Comments
 (0)