Skip to content

Commit 870b1d6

Browse files
anarazelanarazel
committed
Remove superfluous newlines in function prototypes.
These were introduced by pgindent due to fixe to broken indentation (c.f. 8255c7a). 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/[email protected] Backpatch: 12-
1 parent 6384e87 commit 870b1d6

File tree

10 files changed

+22
-44
lines changed

10 files changed

+22
-44
lines changed

‎src/backend/commands/event_trigger.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,7 @@ static void AlterEventTriggerOwner_internal(Relation rel,
151151
HeapTuple tup,
152152
Oid newOwnerId);
153153
static event_trigger_command_tag_check_result check_ddl_tag(const char *tag);
154-
static event_trigger_command_tag_check_result check_table_rewrite_ddl_tag(
155-
const char *tag);
154+
static event_trigger_command_tag_check_result check_table_rewrite_ddl_tag(const char *tag);
156155
static void error_duplicate_filter_variable(const char *defname);
157156
static Datum filter_list_to_array(List *filterlist);
158157
static Oid insert_event_trigger_tuple(const char *trigname, const char *eventname,

‎src/backend/executor/nodeBitmapHeapscan.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,13 @@
5454

5555

5656
static TupleTableSlot *BitmapHeapNext(BitmapHeapScanState *node);
57-
static inline void BitmapDoneInitializingSharedState(
58-
ParallelBitmapHeapState *pstate);
57+
static inline void BitmapDoneInitializingSharedState(ParallelBitmapHeapState *pstate);
5958
static inline void BitmapAdjustPrefetchIterator(BitmapHeapScanState *node,
6059
TBMIterateResult *tbmres);
6160
static inline void BitmapAdjustPrefetchTarget(BitmapHeapScanState *node);
6261
static inline void BitmapPrefetch(BitmapHeapScanState *node,
6362
TableScanDesc scan);
64-
static bool BitmapShouldInitializeSharedState(
65-
ParallelBitmapHeapState *pstate);
63+
static bool BitmapShouldInitializeSharedState(ParallelBitmapHeapState *pstate);
6664

6765

6866
/* ----------------------------------------------------------------

‎src/backend/libpq/auth.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ static int CheckBSDAuth(Port *port, char *user);
133133

134134
/* Correct header from the Platform SDK */
135135
typedef
136-
ULONG (*__ldap_start_tls_sA) (
137-
IN PLDAP ExternalHandle,
136+
ULONG (*__ldap_start_tls_sA) (IN PLDAP ExternalHandle,
138137
OUT PULONG ServerReturnValue,
139138
OUT LDAPMessage **result,
140139
IN PLDAPControlA * ServerControls,

‎src/backend/storage/ipc/sinval.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ SendSharedInvalidMessages(const SharedInvalidationMessage *msgs, int n)
6868
* sucked out of sinvaladt.c.
6969
*/
7070
void
71-
ReceiveSharedInvalidMessages(
72-
void (*invalFunction) (SharedInvalidationMessage *msg),
71+
ReceiveSharedInvalidMessages(void (*invalFunction) (SharedInvalidationMessage *msg),
7372
void (*resetFunction) (void))
7473
{
7574
#define MAXINVALMSGS 32

‎src/backend/utils/adt/jsonpath_exec.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,9 @@ static JsonPathExecResult executeItemUnwrapTargetArray(JsonPathExecContext *cxt,
185185
static JsonPathExecResult executeNextItem(JsonPathExecContext *cxt,
186186
JsonPathItem *cur, JsonPathItem *next,
187187
JsonbValue *v, JsonValueList *found, bool copy);
188-
static JsonPathExecResult executeItemOptUnwrapResult(
189-
JsonPathExecContext *cxt, JsonPathItem *jsp, JsonbValue *jb,
188+
static JsonPathExecResult executeItemOptUnwrapResult(JsonPathExecContext *cxt, JsonPathItem *jsp, JsonbValue *jb,
190189
bool unwrap, JsonValueList *found);
191-
static JsonPathExecResult executeItemOptUnwrapResultNoThrow(
192-
JsonPathExecContext *cxt, JsonPathItem *jsp,
190+
static JsonPathExecResult executeItemOptUnwrapResultNoThrow(JsonPathExecContext *cxt, JsonPathItem *jsp,
193191
JsonbValue *jb, bool unwrap, JsonValueList *found);
194192
static JsonPathBool executeBoolItem(JsonPathExecContext *cxt,
195193
JsonPathItem *jsp, JsonbValue *jb, bool canHaveNext);

‎src/include/access/gist_private.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,7 @@ extern bool gistPageRecyclable(Page page);
473473
extern void gistfillbuffer(Page page, IndexTuple *itup, int len,
474474
OffsetNumber off);
475475
extern IndexTuple *gistextractpage(Page page, int *len /* out */ );
476-
extern IndexTuple *gistjoinvector(
477-
IndexTuple *itvec, int *len,
476+
extern IndexTuple *gistjoinvector(IndexTuple *itvec, int *len,
478477
IndexTuple *additvec, int addlen);
479478
extern IndexTupleData *gistfillitupvec(IndexTuple *vec, int veclen, int *memlen);
480479

‎src/include/replication/logical.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,15 @@
1717

1818
struct LogicalDecodingContext;
1919

20-
typedef void (*LogicalOutputPluginWriterWrite) (
21-
struct LogicalDecodingContext *lr,
20+
typedef void (*LogicalOutputPluginWriterWrite) (struct LogicalDecodingContext *lr,
2221
XLogRecPtr Ptr,
2322
TransactionId xid,
2423
bool last_write
2524
);
2625

2726
typedef LogicalOutputPluginWriterWrite LogicalOutputPluginWriterPrepareWrite;
2827

29-
typedef void (*LogicalOutputPluginWriterUpdateProgress) (
30-
struct LogicalDecodingContext *lr,
28+
typedef void (*LogicalOutputPluginWriterUpdateProgress) (struct LogicalDecodingContext *lr,
3129
XLogRecPtr Ptr,
3230
TransactionId xid
3331
);
@@ -102,8 +100,7 @@ extern LogicalDecodingContext *CreateInitDecodingContext(char *plugin,
102100
LogicalOutputPluginWriterPrepareWrite prepare_write,
103101
LogicalOutputPluginWriterWrite do_write,
104102
LogicalOutputPluginWriterUpdateProgress update_progress);
105-
extern LogicalDecodingContext *CreateDecodingContext(
106-
XLogRecPtr start_lsn,
103+
extern LogicalDecodingContext *CreateDecodingContext(XLogRecPtr start_lsn,
107104
List *output_plugin_options,
108105
bool fast_forward,
109106
XLogPageReadCB read_page,

‎src/include/replication/reorderbuffer.h‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -292,34 +292,29 @@ typedef struct ReorderBufferTXN
292292
typedef struct ReorderBuffer ReorderBuffer;
293293

294294
/* change callback signature */
295-
typedef void (*ReorderBufferApplyChangeCB) (
296-
ReorderBuffer *rb,
295+
typedef void (*ReorderBufferApplyChangeCB) (ReorderBuffer *rb,
297296
ReorderBufferTXN *txn,
298297
Relation relation,
299298
ReorderBufferChange *change);
300299

301300
/* truncate callback signature */
302-
typedef void (*ReorderBufferApplyTruncateCB) (
303-
ReorderBuffer *rb,
301+
typedef void (*ReorderBufferApplyTruncateCB) (ReorderBuffer *rb,
304302
ReorderBufferTXN *txn,
305303
int nrelations,
306304
Relation relations[],
307305
ReorderBufferChange *change);
308306

309307
/* begin callback signature */
310-
typedef void (*ReorderBufferBeginCB) (
311-
ReorderBuffer *rb,
308+
typedef void (*ReorderBufferBeginCB) (ReorderBuffer *rb,
312309
ReorderBufferTXN *txn);
313310

314311
/* commit callback signature */
315-
typedef void (*ReorderBufferCommitCB) (
316-
ReorderBuffer *rb,
312+
typedef void (*ReorderBufferCommitCB) (ReorderBuffer *rb,
317313
ReorderBufferTXN *txn,
318314
XLogRecPtr commit_lsn);
319315

320316
/* message callback signature */
321-
typedef void (*ReorderBufferMessageCB) (
322-
ReorderBuffer *rb,
317+
typedef void (*ReorderBufferMessageCB) (ReorderBuffer *rb,
323318
ReorderBufferTXN *txn,
324319
XLogRecPtr message_lsn,
325320
bool transactional,

‎src/include/storage/sinval.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ extern volatile sig_atomic_t catchupInterruptPending;
129129

130130
extern void SendSharedInvalidMessages(const SharedInvalidationMessage *msgs,
131131
int n);
132-
extern void ReceiveSharedInvalidMessages(
133-
void (*invalFunction) (SharedInvalidationMessage *msg),
132+
extern void ReceiveSharedInvalidMessages(void (*invalFunction) (SharedInvalidationMessage *msg),
134133
void (*resetFunction) (void));
135134

136135
/* signal handler for catchup events (PROCSIG_CATCHUP_INTERRUPT) */

‎src/include/utils/guc.h‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,7 @@ extern bool trace_sort;
283283
extern void SetConfigOption(const char *name, const char *value,
284284
GucContext context, GucSource source);
285285

286-
extern void DefineCustomBoolVariable(
287-
const char *name,
286+
extern void DefineCustomBoolVariable(const char *name,
288287
const char *short_desc,
289288
const char *long_desc,
290289
bool *valueAddr,
@@ -295,8 +294,7 @@ extern void DefineCustomBoolVariable(
295294
GucBoolAssignHook assign_hook,
296295
GucShowHook show_hook);
297296

298-
extern void DefineCustomIntVariable(
299-
const char *name,
297+
extern void DefineCustomIntVariable(const char *name,
300298
const char *short_desc,
301299
const char *long_desc,
302300
int *valueAddr,
@@ -309,8 +307,7 @@ extern void DefineCustomIntVariable(
309307
GucIntAssignHook assign_hook,
310308
GucShowHook show_hook);
311309

312-
extern void DefineCustomRealVariable(
313-
const char *name,
310+
extern void DefineCustomRealVariable(const char *name,
314311
const char *short_desc,
315312
const char *long_desc,
316313
double *valueAddr,
@@ -323,8 +320,7 @@ extern void DefineCustomRealVariable(
323320
GucRealAssignHook assign_hook,
324321
GucShowHook show_hook);
325322

326-
extern void DefineCustomStringVariable(
327-
const char *name,
323+
extern void DefineCustomStringVariable(const char *name,
328324
const char *short_desc,
329325
const char *long_desc,
330326
char **valueAddr,
@@ -335,8 +331,7 @@ extern void DefineCustomStringVariable(
335331
GucStringAssignHook assign_hook,
336332
GucShowHook show_hook);
337333

338-
extern void DefineCustomEnumVariable(
339-
const char *name,
334+
extern void DefineCustomEnumVariable(const char *name,
340335
const char *short_desc,
341336
const char *long_desc,
342337
int *valueAddr,

0 commit comments

Comments
 (0)