Phase 3 of pgindent updates.

Don't move parenthesized lines to the left, even if that means they
flow past the right margin.

By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis.  However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent.  That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.

This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.

This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.

Discussion: https://postgr.es/m/[email protected]
Discussion: https://postgr.es/m/[email protected]

28 files changed, 45 insertions, 45 deletions

diff --git a/src/include/access/amapi.h b/src/include/access/amapi.h
index 2d714fded09..0db4fc73ac9 100644
--- a/src/include/access/amapi.h
+++ b/src/include/access/amapi.h
@@ -77,13 +77,13 @@ typedef bool (*aminsert_function) (Relation indexRelation,
 
 /* bulk delete */
 typedef IndexBulkDeleteResult *(*ambulkdelete_function) (IndexVacuumInfo *info,
-												IndexBulkDeleteResult *stats,
-											IndexBulkDeleteCallback callback,
-													   void *callback_state);
+														 IndexBulkDeleteResult *stats,
+														 IndexBulkDeleteCallback callback,
+														 void *callback_state);
 
 /* post-VACUUM cleanup */
 typedef IndexBulkDeleteResult *(*amvacuumcleanup_function) (IndexVacuumInfo *info,
-											   IndexBulkDeleteResult *stats);
+															IndexBulkDeleteResult *stats);
 
 /* can indexscan return IndexTuples? */
 typedef bool (*amcanreturn_function) (Relation indexRelation, int attno);
@@ -104,7 +104,7 @@ typedef bytea *(*amoptions_function) (Datum reloptions,
 
 /* report AM, index, or index column property */
 typedef bool (*amproperty_function) (Oid index_oid, int attno,
-								  IndexAMProperty prop, const char *propname,
+									 IndexAMProperty prop, const char *propname,
 									 bool *res, bool *isnull);
 
 /* validate definition of an opclass for this AM */
diff --git a/src/include/access/clog.h b/src/include/access/clog.h
index 19a4a2b9b8f..7bae0902b5c 100644
--- a/src/include/access/clog.h
+++ b/src/include/access/clog.h
@@ -36,7 +36,7 @@ typedef struct xl_clog_truncate
 } xl_clog_truncate;
 
 extern void TransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
-				   TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
+						   TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
 extern XidStatus TransactionIdGetStatus(TransactionId xid, XLogRecPtr *lsn);
 
 extern Size CLOGShmemBuffers(void);
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index dadc5d143d2..b56a44f9029 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -152,7 +152,7 @@ extern void index_markpos(IndexScanDesc scan);
 extern void index_restrpos(IndexScanDesc scan);
 extern Size index_parallelscan_estimate(Relation indexrel, Snapshot snapshot);
 extern void index_parallelscan_initialize(Relation heaprel, Relation indexrel,
-							Snapshot snapshot, ParallelIndexScanDesc target);
+							  Snapshot snapshot, ParallelIndexScanDesc target);
 extern void index_parallelrescan(IndexScanDesc scan);
 extern IndexScanDesc index_beginscan_parallel(Relation heaprel,
 						 Relation indexrel, int nkeys, int norderbys,
diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
index 4d66c27f582..adfdb0c6d9c 100644
--- a/src/include/access/gin_private.h
+++ b/src/include/access/gin_private.h
@@ -95,7 +95,7 @@ extern int ginCompareEntries(GinState *ginstate, OffsetNumber attnum,
 				  Datum b, GinNullCategory categoryb);
 extern int ginCompareAttEntries(GinState *ginstate,
 					 OffsetNumber attnuma, Datum a, GinNullCategory categorya,
-				   OffsetNumber attnumb, Datum b, GinNullCategory categoryb);
+					 OffsetNumber attnumb, Datum b, GinNullCategory categoryb);
 extern Datum *ginExtractEntries(GinState *ginstate, OffsetNumber attnum,
 				  Datum value, bool isNull,
 				  int32 *nentries, GinNullCategory **categories);
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index fec6e6e9a65..7fa868b556b 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -338,7 +338,7 @@ extern void _hash_pgaddmultitup(Relation rel, Buffer buf, IndexTuple *itups,
 extern Buffer _hash_addovflpage(Relation rel, Buffer metabuf, Buffer buf, bool retain_pin);
 extern BlockNumber _hash_freeovflpage(Relation rel, Buffer bucketbuf, Buffer ovflbuf,
 				   Buffer wbuf, IndexTuple *itups, OffsetNumber *itup_offsets,
-			 Size *tups_size, uint16 nitups, BufferAccessStrategy bstrategy);
+				   Size *tups_size, uint16 nitups, BufferAccessStrategy bstrategy);
 extern void _hash_initbitmapbuffer(Buffer buf, uint16 bmsize, bool initpage);
 extern void _hash_squeezebucket(Relation rel,
 					Bucket bucket, BlockNumber bucket_blkno,
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 8196587a3a8..b2132e723ed 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -117,13 +117,13 @@ extern HeapScanDesc heap_beginscan_bm(Relation relation, Snapshot snapshot,
 				  int nkeys, ScanKey key);
 extern HeapScanDesc heap_beginscan_sampling(Relation relation,
 						Snapshot snapshot, int nkeys, ScanKey key,
-					 bool allow_strat, bool allow_sync, bool allow_pagemode);
+						bool allow_strat, bool allow_sync, bool allow_pagemode);
 extern void heap_setscanlimits(HeapScanDesc scan, BlockNumber startBlk,
 				   BlockNumber endBlk);
 extern void heapgetpage(HeapScanDesc scan, BlockNumber page);
 extern void heap_rescan(HeapScanDesc scan, ScanKey key);
 extern void heap_rescan_set_params(HeapScanDesc scan, ScanKey key,
-					 bool allow_strat, bool allow_sync, bool allow_pagemode);
+					   bool allow_strat, bool allow_sync, bool allow_pagemode);
 extern void heap_endscan(HeapScanDesc scan);
 extern HeapTuple heap_getnext(HeapScanDesc scan, ScanDirection direction);
 
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
index 49afdfb3748..66bfb77295b 100644
--- a/src/include/access/xlog.h
+++ b/src/include/access/xlog.h
@@ -308,8 +308,8 @@ typedef enum SessionBackupState
 } SessionBackupState;
 
 extern XLogRecPtr do_pg_start_backup(const char *backupidstr, bool fast,
-				TimeLineID *starttli_p, StringInfo labelfile, DIR *tblspcdir,
-			  List **tablespaces, StringInfo tblspcmapfile, bool infotbssize,
+				   TimeLineID *starttli_p, StringInfo labelfile, DIR *tblspcdir,
+				   List **tablespaces, StringInfo tblspcmapfile, bool infotbssize,
 				   bool needtblspcmapfile);
 extern XLogRecPtr do_pg_stop_backup(char *labelfile, bool waitforarchive,
 				  TimeLineID *stoptli_p);
diff --git a/src/include/catalog/pg_constraint_fn.h b/src/include/catalog/pg_constraint_fn.h
index 9ef481d15bb..a4c46897edd 100644
--- a/src/include/catalog/pg_constraint_fn.h
+++ b/src/include/catalog/pg_constraint_fn.h
@@ -67,7 +67,7 @@ extern char *ChooseConstraintName(const char *name1, const char *name2,
 					 List *others);
 
 extern void AlterConstraintNamespaces(Oid ownerId, Oid oldNspId,
-					  Oid newNspId, bool isType, ObjectAddresses *objsMoved);
+						  Oid newNspId, bool isType, ObjectAddresses *objsMoved);
 extern Oid	get_relation_constraint_oid(Oid relid, const char *conname, bool missing_ok);
 extern Oid	get_domain_constraint_oid(Oid typid, const char *conname, bool missing_ok);
 
diff --git a/src/include/commands/createas.h b/src/include/commands/createas.h
index 4e13f7deae7..aaf4fac97bd 100644
--- a/src/include/commands/createas.h
+++ b/src/include/commands/createas.h
@@ -22,7 +22,7 @@
 
 
 extern ObjectAddress ExecCreateTableAs(CreateTableAsStmt *stmt, const char *queryString,
-	  ParamListInfo params, QueryEnvironment *queryEnv, char *completionTag);
+				  ParamListInfo params, QueryEnvironment *queryEnv, char *completionTag);
 
 extern int	GetIntoRelEFlags(IntoClause *intoClause);
 
diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
index 4d356071def..78822b766a9 100644
--- a/src/include/commands/explain.h
+++ b/src/include/commands/explain.h
@@ -62,7 +62,7 @@ extern PGDLLIMPORT explain_get_index_name_hook_type explain_get_index_name_hook;
 
 
 extern void ExplainQuery(ParseState *pstate, ExplainStmt *stmt, const char *queryString,
-	   ParamListInfo params, QueryEnvironment *queryEnv, DestReceiver *dest);
+			 ParamListInfo params, QueryEnvironment *queryEnv, DestReceiver *dest);
 
 extern ExplainState *NewExplainState(void);
 
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 3c4abd1098d..e25cfa3abab 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -170,7 +170,7 @@ extern void standard_ExecutorStart(QueryDesc *queryDesc, int eflags);
 extern void ExecutorRun(QueryDesc *queryDesc,
 			ScanDirection direction, uint64 count, bool execute_once);
 extern void standard_ExecutorRun(QueryDesc *queryDesc,
-				   ScanDirection direction, uint64 count, bool execute_once);
+					 ScanDirection direction, uint64 count, bool execute_once);
 extern void ExecutorFinish(QueryDesc *queryDesc);
 extern void standard_ExecutorFinish(QueryDesc *queryDesc);
 extern void ExecutorEnd(QueryDesc *queryDesc);
diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index a3518e03a4d..0118234eca7 100644
--- a/src/include/executor/nodeIndexscan.h
+++ b/src/include/executor/nodeIndexscan.h
@@ -37,7 +37,7 @@ extern void ExecIndexBuildScanKeys(PlanState *planstate, Relation index,
 					   IndexRuntimeKeyInfo **runtimeKeys, int *numRuntimeKeys,
 					   IndexArrayKeyInfo **arrayKeys, int *numArrayKeys);
 extern void ExecIndexEvalRuntimeKeys(ExprContext *econtext,
-					   IndexRuntimeKeyInfo *runtimeKeys, int numRuntimeKeys);
+						 IndexRuntimeKeyInfo *runtimeKeys, int numRuntimeKeys);
 extern bool ExecIndexEvalArrayKeys(ExprContext *econtext,
 					   IndexArrayKeyInfo *arrayKeys, int numArrayKeys);
 extern bool ExecIndexAdvanceArrayKeys(IndexArrayKeyInfo *arrayKeys, int numArrayKeys);
diff --git a/src/include/foreign/fdwapi.h b/src/include/foreign/fdwapi.h
index bb68f08b8e0..e391f20fb86 100644
--- a/src/include/foreign/fdwapi.h
+++ b/src/include/foreign/fdwapi.h
@@ -82,17 +82,17 @@ typedef void (*BeginForeignModify_function) (ModifyTableState *mtstate,
 typedef TupleTableSlot *(*ExecForeignInsert_function) (EState *estate,
 													   ResultRelInfo *rinfo,
 													   TupleTableSlot *slot,
-												   TupleTableSlot *planSlot);
+													   TupleTableSlot *planSlot);
 
 typedef TupleTableSlot *(*ExecForeignUpdate_function) (EState *estate,
 													   ResultRelInfo *rinfo,
 													   TupleTableSlot *slot,
-												   TupleTableSlot *planSlot);
+													   TupleTableSlot *planSlot);
 
 typedef TupleTableSlot *(*ExecForeignDelete_function) (EState *estate,
 													   ResultRelInfo *rinfo,
 													   TupleTableSlot *slot,
-												   TupleTableSlot *planSlot);
+													   TupleTableSlot *planSlot);
 
 typedef void (*EndForeignModify_function) (EState *estate,
 										   ResultRelInfo *rinfo);
@@ -112,7 +112,7 @@ typedef TupleTableSlot *(*IterateDirectModify_function) (ForeignScanState *node)
 typedef void (*EndDirectModify_function) (ForeignScanState *node);
 
 typedef RowMarkType (*GetForeignRowMarkType_function) (RangeTblEntry *rte,
-												LockClauseStrength strength);
+													   LockClauseStrength strength);
 
 typedef HeapTuple (*RefetchForeignRow_function) (EState *estate,
 												 ExecRowMark *erm,
diff --git a/src/include/lib/pairingheap.h b/src/include/lib/pairingheap.h
index c8dd60255f1..e3a75f51f75 100644
--- a/src/include/lib/pairingheap.h
+++ b/src/include/lib/pairingheap.h
@@ -85,7 +85,7 @@ extern void pairingheap_remove(pairingheap *heap, pairingheap_node *node);
 
 #ifdef PAIRINGHEAP_DEBUG
 extern char *pairingheap_dump(pairingheap *heap,
-	 void (*dumpfunc) (pairingheap_node *node, StringInfo buf, void *opaque),
+				 void (*dumpfunc) (pairingheap_node *node, StringInfo buf, void *opaque),
 				 void *opaque);
 #endif
 
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h
index 160dd931ee4..d57ef017cb4 100644
--- a/src/include/mb/pg_wchar.h
+++ b/src/include/mb/pg_wchar.h
@@ -599,7 +599,7 @@ extern void check_encoding_conversion_args(int src_encoding,
 
 extern void report_invalid_encoding(int encoding, const char *mbstr, int len) pg_attribute_noreturn();
 extern void report_untranslatable_char(int src_encoding, int dest_encoding,
-						 const char *mbstr, int len) pg_attribute_noreturn();
+						   const char *mbstr, int len) pg_attribute_noreturn();
 
 extern void local2local(const unsigned char *l, unsigned char *p, int len,
 			int src_encoding, int dest_encoding, const unsigned char *tab);
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index 8c0cccb054b..63feba06e7e 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -189,7 +189,7 @@ extern void set_namedtuplestore_size_estimates(PlannerInfo *root, RelOptInfo *re
 extern void set_foreign_size_estimates(PlannerInfo *root, RelOptInfo *rel);
 extern PathTarget *set_pathtarget_cost_width(PlannerInfo *root, PathTarget *target);
 extern double compute_bitmap_pages(PlannerInfo *root, RelOptInfo *baserel,
-				Path *bitmapqual, int loop_count, Cost *cost, double *tuple);
+					 Path *bitmapqual, int loop_count, Cost *cost, double *tuple);
 
 /*
  * prototypes for clausesel.c
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h
index 6aa4ee69e60..91542d4f15a 100644
--- a/src/include/parser/parse_relation.h
+++ b/src/include/parser/parse_relation.h
@@ -117,7 +117,7 @@ extern void addRTEtoQuery(ParseState *pstate, RangeTblEntry *rte,
 			  bool addToRelNameSpace, bool addToVarNameSpace);
 extern void errorMissingRTE(ParseState *pstate, RangeVar *relation) pg_attribute_noreturn();
 extern void errorMissingColumn(ParseState *pstate,
-		 char *relname, char *colname, int location) pg_attribute_noreturn();
+				   char *relname, char *colname, int location) pg_attribute_noreturn();
 extern void expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,
 		  int location, bool include_dropped,
 		  List **colnames, List **colvars);
diff --git a/src/include/pgtar.h b/src/include/pgtar.h
index d0188efaa60..9a1be4c9f65 100644
--- a/src/include/pgtar.h
+++ b/src/include/pgtar.h
@@ -20,7 +20,7 @@ enum tarError
 };
 
 extern enum tarError tarCreateHeader(char *h, const char *filename, const char *linktarget,
-			  pgoff_t size, mode_t mode, uid_t uid, gid_t gid, time_t mtime);
+				pgoff_t size, mode_t mode, uid_t uid, gid_t gid, time_t mtime);
 extern uint64 read_tar_number(const char *s, int len);
 extern void print_tar_number(char *s, int len, uint64 val);
 extern int	tarChecksum(char *header);
diff --git a/src/include/postgres.h b/src/include/postgres.h
index ae01ef86adf..1ca9b60ea19 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -801,6 +801,6 @@ extern Datum Float8GetDatum(float8 X);
  */
 extern void ExceptionalCondition(const char *conditionName,
 					 const char *errorType,
-			   const char *fileName, int lineNumber) pg_attribute_noreturn();
+					 const char *fileName, int lineNumber) pg_attribute_noreturn();
 
 #endif							/* POSTGRES_H */
diff --git a/src/include/replication/logical.h b/src/include/replication/logical.h
index 9e640be9849..7f0e0fa881a 100644
--- a/src/include/replication/logical.h
+++ b/src/include/replication/logical.h
@@ -18,7 +18,7 @@
 struct LogicalDecodingContext;
 
 typedef void (*LogicalOutputPluginWriterWrite) (
-										   struct LogicalDecodingContext *lr,
+												struct LogicalDecodingContext *lr,
 												XLogRecPtr Ptr,
 												TransactionId xid,
 												bool last_write
@@ -27,7 +27,7 @@ typedef void (*LogicalOutputPluginWriterWrite) (
 typedef LogicalOutputPluginWriterWrite LogicalOutputPluginWriterPrepareWrite;
 
 typedef void (*LogicalOutputPluginWriterUpdateProgress) (
-										   struct LogicalDecodingContext *lr,
+														 struct LogicalDecodingContext *lr,
 														 XLogRecPtr Ptr,
 														 TransactionId xid
 );
@@ -93,14 +93,14 @@ extern LogicalDecodingContext *CreateInitDecodingContext(char *plugin,
 						  XLogPageReadCB read_page,
 						  LogicalOutputPluginWriterPrepareWrite prepare_write,
 						  LogicalOutputPluginWriterWrite do_write,
-					LogicalOutputPluginWriterUpdateProgress update_progress);
+						  LogicalOutputPluginWriterUpdateProgress update_progress);
 extern LogicalDecodingContext *CreateDecodingContext(
 					  XLogRecPtr start_lsn,
 					  List *output_plugin_options,
 					  XLogPageReadCB read_page,
 					  LogicalOutputPluginWriterPrepareWrite prepare_write,
 					  LogicalOutputPluginWriterWrite do_write,
-					LogicalOutputPluginWriterUpdateProgress update_progress);
+					  LogicalOutputPluginWriterUpdateProgress update_progress);
 extern void DecodingContextFindStartpoint(LogicalDecodingContext *ctx);
 extern bool DecodingContextReady(LogicalDecodingContext *ctx);
 extern void FreeDecodingContext(LogicalDecodingContext *ctx);
diff --git a/src/include/replication/reorderbuffer.h b/src/include/replication/reorderbuffer.h
index e722f4dcf5e..86effe106bd 100644
--- a/src/include/replication/reorderbuffer.h
+++ b/src/include/replication/reorderbuffer.h
@@ -381,7 +381,7 @@ void ReorderBufferQueueMessage(ReorderBuffer *, TransactionId, Snapshot snapshot
 						  Size message_size, const char *message);
 void ReorderBufferCommit(ReorderBuffer *, TransactionId,
 					XLogRecPtr commit_lsn, XLogRecPtr end_lsn,
-	  TimestampTz commit_time, RepOriginId origin_id, XLogRecPtr origin_lsn);
+					TimestampTz commit_time, RepOriginId origin_id, XLogRecPtr origin_lsn);
 void		ReorderBufferAssignChild(ReorderBuffer *, TransactionId, TransactionId, XLogRecPtr commit_lsn);
 void ReorderBufferCommitChild(ReorderBuffer *, TransactionId, TransactionId,
 						 XLogRecPtr commit_lsn, XLogRecPtr end_lsn);
@@ -395,7 +395,7 @@ void ReorderBufferAddNewCommandId(ReorderBuffer *, TransactionId, XLogRecPtr lsn
 							 CommandId cid);
 void ReorderBufferAddNewTupleCids(ReorderBuffer *, TransactionId, XLogRecPtr lsn,
 							 RelFileNode node, ItemPointerData pt,
-						 CommandId cmin, CommandId cmax, CommandId combocid);
+							 CommandId cmin, CommandId cmax, CommandId combocid);
 void ReorderBufferAddInvalidations(ReorderBuffer *, TransactionId, XLogRecPtr lsn,
 							  Size nmsgs, SharedInvalidationMessage *msgs);
 void ReorderBufferImmediateInvalidation(ReorderBuffer *, uint32 ninvalidations,
diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h
index c76538c1338..282ff9967ff 100644
--- a/src/include/rewrite/rewriteManip.h
+++ b/src/include/rewrite/rewriteManip.h
@@ -20,7 +20,7 @@
 typedef struct replace_rte_variables_context replace_rte_variables_context;
 
 typedef Node *(*replace_rte_variables_callback) (Var *var,
-									 replace_rte_variables_context *context);
+												 replace_rte_variables_context *context);
 
 struct replace_rte_variables_context
 {
diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h
index 8fa76eefb36..174c537be46 100644
--- a/src/include/storage/procarray.h
+++ b/src/include/storage/procarray.h
@@ -119,7 +119,7 @@ extern void XidCacheRemoveRunningXids(TransactionId xid,
 						  TransactionId latestXid);
 
 extern void ProcArraySetReplicationSlotXmin(TransactionId xmin,
-							TransactionId catalog_xmin, bool already_locked);
+								TransactionId catalog_xmin, bool already_locked);
 
 extern void ProcArrayGetReplicationSlotXmin(TransactionId *xmin,
 								TransactionId *catalog_xmin);
diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h
index 4e72c52d216..84c0b02da06 100644
--- a/src/include/storage/sinval.h
+++ b/src/include/storage/sinval.h
@@ -130,7 +130,7 @@ extern volatile sig_atomic_t catchupInterruptPending;
 extern void SendSharedInvalidMessages(const SharedInvalidationMessage *msgs,
 						  int n);
 extern void ReceiveSharedInvalidMessages(
-					  void (*invalFunction) (SharedInvalidationMessage *msg),
+							 void (*invalFunction) (SharedInvalidationMessage *msg),
 							 void (*resetFunction) (void));
 
 /* signal handler for catchup events (PROCSIG_CATCHUP_INTERRUPT) */
diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h
index 56d04dd1c6c..5bd386ddaae 100644
--- a/src/include/tcop/utility.h
+++ b/src/include/tcop/utility.h
@@ -25,10 +25,10 @@ typedef enum
 
 /* Hook for plugins to get control in ProcessUtility() */
 typedef void (*ProcessUtility_hook_type) (PlannedStmt *pstmt,
-					  const char *queryString, ProcessUtilityContext context,
+										  const char *queryString, ProcessUtilityContext context,
 										  ParamListInfo params,
 										  QueryEnvironment *queryEnv,
-									DestReceiver *dest, char *completionTag);
+										  DestReceiver *dest, char *completionTag);
 extern PGDLLIMPORT ProcessUtility_hook_type ProcessUtility_hook;
 
 extern void ProcessUtility(PlannedStmt *pstmt, const char *queryString,
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index ab630a80a48..43273eaab51 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -265,7 +265,7 @@ extern AclMode pg_proc_aclmask(Oid proc_oid, Oid roleid,
 extern AclMode pg_language_aclmask(Oid lang_oid, Oid roleid,
 					AclMode mask, AclMaskHow how);
 extern AclMode pg_largeobject_aclmask_snapshot(Oid lobj_oid, Oid roleid,
-							AclMode mask, AclMaskHow how, Snapshot snapshot);
+								AclMode mask, AclMaskHow how, Snapshot snapshot);
 extern AclMode pg_namespace_aclmask(Oid nsp_oid, Oid roleid,
 					 AclMode mask, AclMaskHow how);
 extern AclMode pg_tablespace_aclmask(Oid spc_oid, Oid roleid,
diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index 3492bafa5ef..7bfd25a9e91 100644
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -137,7 +137,7 @@ extern int	errmsg(const char *fmt,...) pg_attribute_printf(1, 2);
 extern int	errmsg_internal(const char *fmt,...) pg_attribute_printf(1, 2);
 
 extern int errmsg_plural(const char *fmt_singular, const char *fmt_plural,
-	unsigned long n,...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4);
+			  unsigned long n,...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4);
 
 extern int	errdetail(const char *fmt,...) pg_attribute_printf(1, 2);
 extern int	errdetail_internal(const char *fmt,...) pg_attribute_printf(1, 2);
@@ -146,10 +146,10 @@ extern int	errdetail_log(const char *fmt,...) pg_attribute_printf(1, 2);
 
 extern int errdetail_log_plural(const char *fmt_singular,
 					 const char *fmt_plural,
-	unsigned long n,...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4);
+					 unsigned long n,...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4);
 
 extern int errdetail_plural(const char *fmt_singular, const char *fmt_plural,
-	unsigned long n,...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4);
+				 unsigned long n,...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4);
 
 extern int	errhint(const char *fmt,...) pg_attribute_printf(1, 2);
 
diff --git a/src/include/utils/jsonapi.h b/src/include/utils/jsonapi.h
index 2508b16b556..4336823de2b 100644
--- a/src/include/utils/jsonapi.h
+++ b/src/include/utils/jsonapi.h
@@ -143,8 +143,8 @@ extern void iterate_jsonb_string_values(Jsonb *jb, void *state,
 extern void iterate_json_string_values(text *json, void *action_state,
 						   JsonIterateStringValuesAction action);
 extern Jsonb *transform_jsonb_string_values(Jsonb *jsonb, void *action_state,
-						   JsonTransformStringValuesAction transform_action);
+							  JsonTransformStringValuesAction transform_action);
 extern text *transform_json_string_values(text *json, void *action_state,
-						   JsonTransformStringValuesAction transform_action);
+							 JsonTransformStringValuesAction transform_action);
 
 #endif							/* JSONAPI_H */