Phase 2 pgindent run for v12.

Switch to 2.1 version of pg_bsd_indent.  This formats
multiline function declarations "correctly", that is with
additional lines of parameter declarations indented to match
where the first line's left parenthesis is.

Discussion: https://postgr.es/m/CAEepm=0P3FeTXRcU5B2W3jv3PgRVZ-kGUXLGfd42FFhUROO3ug@mail.gmail.com

17 files changed, 240 insertions, 240 deletions

diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h
index 12c91ef79e5..cb1d96bc35d 100644
--- a/src/include/parser/analyze.h
+++ b/src/include/parser/analyze.h
@@ -23,14 +23,14 @@ extern PGDLLIMPORT post_parse_analyze_hook_type post_parse_analyze_hook;
 
 
 extern Query *parse_analyze(RawStmt *parseTree, const char *sourceText,
-			  Oid *paramTypes, int numParams, QueryEnvironment *queryEnv);
+							Oid *paramTypes, int numParams, QueryEnvironment *queryEnv);
 extern Query *parse_analyze_varparams(RawStmt *parseTree, const char *sourceText,
-						Oid **paramTypes, int *numParams);
+									  Oid **paramTypes, int *numParams);
 
 extern Query *parse_sub_analyze(Node *parseTree, ParseState *parentParseState,
-				  CommonTableExpr *parentCTE,
-				  bool locked_from_parent,
-				  bool resolve_unknowns);
+								CommonTableExpr *parentCTE,
+								bool locked_from_parent,
+								bool resolve_unknowns);
 
 extern Query *transformTopLevelStmt(ParseState *pstate, RawStmt *parseTree);
 extern Query *transformStmt(ParseState *pstate, Node *parseTree);
@@ -40,10 +40,10 @@ extern bool analyze_requires_snapshot(RawStmt *parseTree);
 extern const char *LCS_asString(LockClauseStrength strength);
 extern void CheckSelectLocking(Query *qry, LockClauseStrength strength);
 extern void applyLockingClause(Query *qry, Index rtindex,
-				   LockClauseStrength strength,
-				   LockWaitPolicy waitPolicy, bool pushedDown);
+							   LockClauseStrength strength,
+							   LockWaitPolicy waitPolicy, bool pushedDown);
 
 extern List *BuildOnConflictExcludedTargetlist(Relation targetrel,
-								  Index exclRelIndex);
+											   Index exclRelIndex);
 
 #endif							/* ANALYZE_H */
diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h
index 9e6fe888dc5..add64bc170f 100644
--- a/src/include/parser/gramparse.h
+++ b/src/include/parser/gramparse.h
@@ -65,8 +65,8 @@ typedef struct base_yy_extra_type
 
 
 /* from parser.c */
-extern int base_yylex(YYSTYPE *lvalp, YYLTYPE *llocp,
-		   core_yyscan_t yyscanner);
+extern int	base_yylex(YYSTYPE *lvalp, YYLTYPE *llocp,
+					   core_yyscan_t yyscanner);
 
 /* from gram.y */
 extern void parser_init(base_yy_extra_type *yyext);
diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h
index 48fe9d71407..102f266d6c9 100644
--- a/src/include/parser/parse_agg.h
+++ b/src/include/parser/parse_agg.h
@@ -16,13 +16,13 @@
 #include "parser/parse_node.h"
 
 extern void transformAggregateCall(ParseState *pstate, Aggref *agg,
-					   List *args, List *aggorder,
-					   bool agg_distinct);
+								   List *args, List *aggorder,
+								   bool agg_distinct);
 
 extern Node *transformGroupingFunc(ParseState *pstate, GroupingFunc *g);
 
 extern void transformWindowFuncCall(ParseState *pstate, WindowFunc *wfunc,
-						WindowDef *windef);
+									WindowDef *windef);
 
 extern void parseCheckAggregates(ParseState *pstate, Query *qry);
 
@@ -30,39 +30,39 @@ extern List *expand_grouping_sets(List *groupingSets, int limit);
 
 extern int	get_aggregate_argtypes(Aggref *aggref, Oid *inputTypes);
 
-extern Oid resolve_aggregate_transtype(Oid aggfuncid,
-							Oid aggtranstype,
-							Oid *inputTypes,
-							int numArguments);
+extern Oid	resolve_aggregate_transtype(Oid aggfuncid,
+										Oid aggtranstype,
+										Oid *inputTypes,
+										int numArguments);
 
 extern void build_aggregate_transfn_expr(Oid *agg_input_types,
-							 int agg_num_inputs,
-							 int agg_num_direct_inputs,
-							 bool agg_variadic,
-							 Oid agg_state_type,
-							 Oid agg_input_collation,
-							 Oid transfn_oid,
-							 Oid invtransfn_oid,
-							 Expr **transfnexpr,
-							 Expr **invtransfnexpr);
+										 int agg_num_inputs,
+										 int agg_num_direct_inputs,
+										 bool agg_variadic,
+										 Oid agg_state_type,
+										 Oid agg_input_collation,
+										 Oid transfn_oid,
+										 Oid invtransfn_oid,
+										 Expr **transfnexpr,
+										 Expr **invtransfnexpr);
 
 extern void build_aggregate_combinefn_expr(Oid agg_state_type,
-							   Oid agg_input_collation,
-							   Oid combinefn_oid,
-							   Expr **combinefnexpr);
+										   Oid agg_input_collation,
+										   Oid combinefn_oid,
+										   Expr **combinefnexpr);
 
 extern void build_aggregate_serialfn_expr(Oid serialfn_oid,
-							  Expr **serialfnexpr);
+										  Expr **serialfnexpr);
 
 extern void build_aggregate_deserialfn_expr(Oid deserialfn_oid,
-								Expr **deserialfnexpr);
+											Expr **deserialfnexpr);
 
 extern void build_aggregate_finalfn_expr(Oid *agg_input_types,
-							 int num_finalfn_inputs,
-							 Oid agg_state_type,
-							 Oid agg_result_type,
-							 Oid agg_input_collation,
-							 Oid finalfn_oid,
-							 Expr **finalfnexpr);
+										 int num_finalfn_inputs,
+										 Oid agg_state_type,
+										 Oid agg_result_type,
+										 Oid agg_input_collation,
+										 Oid finalfn_oid,
+										 Expr **finalfnexpr);
 
 #endif							/* PARSE_AGG_H */
diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h
index 179f3ab3c35..42adc63d1fc 100644
--- a/src/include/parser/parse_clause.h
+++ b/src/include/parser/parse_clause.h
@@ -17,36 +17,36 @@
 #include "parser/parse_node.h"
 
 extern void transformFromClause(ParseState *pstate, List *frmList);
-extern int setTargetTable(ParseState *pstate, RangeVar *relation,
-			   bool inh, bool alsoSource, AclMode requiredPerms);
+extern int	setTargetTable(ParseState *pstate, RangeVar *relation,
+						   bool inh, bool alsoSource, AclMode requiredPerms);
 
 extern Node *transformWhereClause(ParseState *pstate, Node *clause,
-					 ParseExprKind exprKind, const char *constructName);
+								  ParseExprKind exprKind, const char *constructName);
 extern Node *transformLimitClause(ParseState *pstate, Node *clause,
-					 ParseExprKind exprKind, const char *constructName);
+								  ParseExprKind exprKind, const char *constructName);
 extern List *transformGroupClause(ParseState *pstate, List *grouplist,
-					 List **groupingSets,
-					 List **targetlist, List *sortClause,
-					 ParseExprKind exprKind, bool useSQL99);
+								  List **groupingSets,
+								  List **targetlist, List *sortClause,
+								  ParseExprKind exprKind, bool useSQL99);
 extern List *transformSortClause(ParseState *pstate, List *orderlist,
-					List **targetlist, ParseExprKind exprKind,
-					bool useSQL99);
+								 List **targetlist, ParseExprKind exprKind,
+								 bool useSQL99);
 
 extern List *transformWindowDefinitions(ParseState *pstate,
-						   List *windowdefs,
-						   List **targetlist);
+										List *windowdefs,
+										List **targetlist);
 
 extern List *transformDistinctClause(ParseState *pstate,
-						List **targetlist, List *sortClause, bool is_agg);
+									 List **targetlist, List *sortClause, bool is_agg);
 extern List *transformDistinctOnClause(ParseState *pstate, List *distinctlist,
-						  List **targetlist, List *sortClause);
+									   List **targetlist, List *sortClause);
 extern void transformOnConflictArbiter(ParseState *pstate,
-						   OnConflictClause *onConflictClause,
-						   List **arbiterExpr, Node **arbiterWhere,
-						   Oid *constraint);
+									   OnConflictClause *onConflictClause,
+									   List **arbiterExpr, Node **arbiterWhere,
+									   Oid *constraint);
 
 extern List *addTargetToSortList(ParseState *pstate, TargetEntry *tle,
-					List *sortlist, List *targetlist, SortBy *sortby);
+								 List *sortlist, List *targetlist, SortBy *sortby);
 extern Index assignSortGroupRef(TargetEntry *tle, List *tlist);
 extern bool targetIsInSortList(TargetEntry *tle, Oid sortop, List *sortList);
 
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index 2a2d9a38053..37d73ae2cc6 100644
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -36,58 +36,58 @@ extern bool IsPreferredType(TYPCATEGORY category, Oid type);
 extern TYPCATEGORY TypeCategory(Oid type);
 
 extern Node *coerce_to_target_type(ParseState *pstate,
-					  Node *expr, Oid exprtype,
-					  Oid targettype, int32 targettypmod,
-					  CoercionContext ccontext,
-					  CoercionForm cformat,
-					  int location);
+								   Node *expr, Oid exprtype,
+								   Oid targettype, int32 targettypmod,
+								   CoercionContext ccontext,
+								   CoercionForm cformat,
+								   int location);
 extern bool can_coerce_type(int nargs, const Oid *input_typeids, const Oid *target_typeids,
-				CoercionContext ccontext);
+							CoercionContext ccontext);
 extern Node *coerce_type(ParseState *pstate, Node *node,
-			Oid inputTypeId, Oid targetTypeId, int32 targetTypeMod,
-			CoercionContext ccontext, CoercionForm cformat, int location);
+						 Oid inputTypeId, Oid targetTypeId, int32 targetTypeMod,
+						 CoercionContext ccontext, CoercionForm cformat, int location);
 extern Node *coerce_to_domain(Node *arg, Oid baseTypeId, int32 baseTypeMod,
-				 Oid typeId,
-				 CoercionContext ccontext, CoercionForm cformat, int location,
-				 bool hideInputCoercion);
+							  Oid typeId,
+							  CoercionContext ccontext, CoercionForm cformat, int location,
+							  bool hideInputCoercion);
 
 extern Node *coerce_to_boolean(ParseState *pstate, Node *node,
-				  const char *constructName);
+							   const char *constructName);
 extern Node *coerce_to_specific_type(ParseState *pstate, Node *node,
-						Oid targetTypeId,
-						const char *constructName);
+									 Oid targetTypeId,
+									 const char *constructName);
 
 extern Node *coerce_to_specific_type_typmod(ParseState *pstate, Node *node,
-							   Oid targetTypeId, int32 targetTypmod,
-							   const char *constructName);
+											Oid targetTypeId, int32 targetTypmod,
+											const char *constructName);
 
-extern int parser_coercion_errposition(ParseState *pstate,
-							int coerce_location,
-							Node *input_expr);
+extern int	parser_coercion_errposition(ParseState *pstate,
+										int coerce_location,
+										Node *input_expr);
 
-extern Oid select_common_type(ParseState *pstate, List *exprs,
-				   const char *context, Node **which_expr);
+extern Oid	select_common_type(ParseState *pstate, List *exprs,
+							   const char *context, Node **which_expr);
 extern Node *coerce_to_common_type(ParseState *pstate, Node *node,
-					  Oid targetTypeId,
-					  const char *context);
+								   Oid targetTypeId,
+								   const char *context);
 
 extern bool check_generic_type_consistency(const Oid *actual_arg_types,
-							   const Oid *declared_arg_types,
-							   int nargs);
-extern Oid enforce_generic_type_consistency(const Oid *actual_arg_types,
-								 Oid *declared_arg_types,
-								 int nargs,
-								 Oid rettype,
-								 bool allow_poly);
-extern Oid resolve_generic_type(Oid declared_type,
-					 Oid context_actual_type,
-					 Oid context_declared_type);
+										   const Oid *declared_arg_types,
+										   int nargs);
+extern Oid	enforce_generic_type_consistency(const Oid *actual_arg_types,
+											 Oid *declared_arg_types,
+											 int nargs,
+											 Oid rettype,
+											 bool allow_poly);
+extern Oid	resolve_generic_type(Oid declared_type,
+								 Oid context_actual_type,
+								 Oid context_declared_type);
 
 extern CoercionPathType find_coercion_pathway(Oid targetTypeId,
-					  Oid sourceTypeId,
-					  CoercionContext ccontext,
-					  Oid *funcid);
+											  Oid sourceTypeId,
+											  CoercionContext ccontext,
+											  Oid *funcid);
 extern CoercionPathType find_typmod_coercion_function(Oid typeId,
-							  Oid *funcid);
+													  Oid *funcid);
 
 #endif							/* PARSE_COERCE_H */
diff --git a/src/include/parser/parse_cte.h b/src/include/parser/parse_cte.h
index 7fd35bde019..0d4ce3608dc 100644
--- a/src/include/parser/parse_cte.h
+++ b/src/include/parser/parse_cte.h
@@ -19,6 +19,6 @@
 extern List *transformWithClause(ParseState *pstate, WithClause *withClause);
 
 extern void analyzeCTETargetList(ParseState *pstate, CommonTableExpr *cte,
-					 List *tlist);
+								 List *tlist);
 
 #endif							/* PARSE_CTE_H */
diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h
index 743e6668f02..d1ec2d97f21 100644
--- a/src/include/parser/parse_func.h
+++ b/src/include/parser/parse_func.h
@@ -32,42 +32,42 @@ typedef enum
 
 
 extern Node *ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
-				  Node *last_srf, FuncCall *fn, bool proc_call,
-				  int location);
+							   Node *last_srf, FuncCall *fn, bool proc_call,
+							   int location);
 
 extern FuncDetailCode func_get_detail(List *funcname,
-				List *fargs, List *fargnames,
-				int nargs, Oid *argtypes,
-				bool expand_variadic, bool expand_defaults,
-				Oid *funcid, Oid *rettype,
-				bool *retset, int *nvargs, Oid *vatype,
-				Oid **true_typeids, List **argdefaults);
+									  List *fargs, List *fargnames,
+									  int nargs, Oid *argtypes,
+									  bool expand_variadic, bool expand_defaults,
+									  Oid *funcid, Oid *rettype,
+									  bool *retset, int *nvargs, Oid *vatype,
+									  Oid **true_typeids, List **argdefaults);
 
-extern int func_match_argtypes(int nargs,
-					Oid *input_typeids,
-					FuncCandidateList raw_candidates,
-					FuncCandidateList *candidates);
+extern int	func_match_argtypes(int nargs,
+								Oid *input_typeids,
+								FuncCandidateList raw_candidates,
+								FuncCandidateList *candidates);
 
 extern FuncCandidateList func_select_candidate(int nargs,
-					  Oid *input_typeids,
-					  FuncCandidateList candidates);
+											   Oid *input_typeids,
+											   FuncCandidateList candidates);
 
 extern void make_fn_arguments(ParseState *pstate,
-				  List *fargs,
-				  Oid *actual_arg_types,
-				  Oid *declared_arg_types);
+							  List *fargs,
+							  Oid *actual_arg_types,
+							  Oid *declared_arg_types);
 
 extern const char *funcname_signature_string(const char *funcname, int nargs,
-						  List *argnames, const Oid *argtypes);
+											 List *argnames, const Oid *argtypes);
 extern const char *func_signature_string(List *funcname, int nargs,
-					  List *argnames, const Oid *argtypes);
+										 List *argnames, const Oid *argtypes);
 
-extern Oid LookupFuncName(List *funcname, int nargs, const Oid *argtypes,
-			   bool missing_ok);
-extern Oid LookupFuncWithArgs(ObjectType objtype, ObjectWithArgs *func,
-				   bool missing_ok);
+extern Oid	LookupFuncName(List *funcname, int nargs, const Oid *argtypes,
+						   bool missing_ok);
+extern Oid	LookupFuncWithArgs(ObjectType objtype, ObjectWithArgs *func,
+							   bool missing_ok);
 
 extern void check_srf_call_placement(ParseState *pstate, Node *last_srf,
-						 int location);
+									 int location);
 
 #endif							/* PARSE_FUNC_H */
diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h
index 63d88b7a26d..7c099e70845 100644
--- a/src/include/parser/parse_node.h
+++ b/src/include/parser/parse_node.h
@@ -269,20 +269,20 @@ extern void free_parsestate(ParseState *pstate);
 extern int	parser_errposition(ParseState *pstate, int location);
 
 extern void setup_parser_errposition_callback(ParseCallbackState *pcbstate,
-								  ParseState *pstate, int location);
+											  ParseState *pstate, int location);
 extern void cancel_parser_errposition_callback(ParseCallbackState *pcbstate);
 
 extern Var *make_var(ParseState *pstate, RangeTblEntry *rte, int attrno,
-		 int location);
+					 int location);
 extern Oid	transformContainerType(Oid *containerType, int32 *containerTypmod);
 
 extern SubscriptingRef *transformContainerSubscripts(ParseState *pstate,
-							 Node *containerBase,
-							 Oid containerType,
-							 Oid elementType,
-							 int32 containerTypMod,
-							 List *indirection,
-							 Node *assignFrom);
+													 Node *containerBase,
+													 Oid containerType,
+													 Oid elementType,
+													 int32 containerTypMod,
+													 List *indirection,
+													 Node *assignFrom);
 extern Const *make_const(ParseState *pstate, Value *value, int location);
 
 #endif							/* PARSE_NODE_H */
diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h
index 0690ef50cbf..2265c25e4d3 100644
--- a/src/include/parser/parse_oper.h
+++ b/src/include/parser/parse_oper.h
@@ -22,33 +22,33 @@
 typedef HeapTuple Operator;
 
 /* Routines to look up an operator given name and exact input type(s) */
-extern Oid LookupOperName(ParseState *pstate, List *opername,
-			   Oid oprleft, Oid oprright,
-			   bool noError, int location);
+extern Oid	LookupOperName(ParseState *pstate, List *opername,
+						   Oid oprleft, Oid oprright,
+						   bool noError, int location);
 extern Oid	LookupOperWithArgs(ObjectWithArgs *oper, bool noError);
 
 /* Routines to find operators matching a name and given input types */
 /* NB: the selected operator may require coercion of the input types! */
 extern Operator oper(ParseState *pstate, List *op, Oid arg1, Oid arg2,
-	 bool noError, int location);
+					 bool noError, int location);
 extern Operator right_oper(ParseState *pstate, List *op, Oid arg,
-		   bool noError, int location);
+						   bool noError, int location);
 extern Operator left_oper(ParseState *pstate, List *op, Oid arg,
-		  bool noError, int location);
+						  bool noError, int location);
 
 /* Routines to find operators that DO NOT require coercion --- ie, their */
 /* input types are either exactly as given, or binary-compatible */
 extern Operator compatible_oper(ParseState *pstate, List *op,
-				Oid arg1, Oid arg2,
-				bool noError, int location);
+								Oid arg1, Oid arg2,
+								bool noError, int location);
 
 /* currently no need for compatible_left_oper/compatible_right_oper */
 
 /* Routines for identifying "<", "=", ">" operators for a type */
 extern void get_sort_group_operators(Oid argtype,
-						 bool needLT, bool needEQ, bool needGT,
-						 Oid *ltOpr, Oid *eqOpr, Oid *gtOpr,
-						 bool *isHashable);
+									 bool needLT, bool needEQ, bool needGT,
+									 Oid *ltOpr, Oid *eqOpr, Oid *gtOpr,
+									 bool *isHashable);
 
 /* Convenience routines for common calls on the above */
 extern Oid	compatible_oper_opid(List *op, Oid arg1, Oid arg2, bool noError);
@@ -59,9 +59,9 @@ extern Oid	oprfuncid(Operator op);
 
 /* Build expression tree for an operator invocation */
 extern Expr *make_op(ParseState *pstate, List *opname,
-		Node *ltree, Node *rtree, Node *last_srf, int location);
+					 Node *ltree, Node *rtree, Node *last_srf, int location);
 extern Expr *make_scalar_array_op(ParseState *pstate, List *opname,
-					 bool useOr,
-					 Node *ltree, Node *rtree, int location);
+								  bool useOr,
+								  Node *ltree, Node *rtree, int location);
 
 #endif							/* PARSE_OPER_H */
diff --git a/src/include/parser/parse_param.h b/src/include/parser/parse_param.h
index 006e774cb6f..acd9e50be38 100644
--- a/src/include/parser/parse_param.h
+++ b/src/include/parser/parse_param.h
@@ -16,9 +16,9 @@
 #include "parser/parse_node.h"
 
 extern void parse_fixed_parameters(ParseState *pstate,
-					   Oid *paramTypes, int numParams);
+								   Oid *paramTypes, int numParams);
 extern void parse_variable_parameters(ParseState *pstate,
-						  Oid **paramTypes, int *numParams);
+									  Oid **paramTypes, int *numParams);
 extern void check_variable_parameters(ParseState *pstate, Query *query);
 extern bool query_contains_extern_params(Query *query);
 
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h
index 1d4fdfa78b7..f7e078172de 100644
--- a/src/include/parser/parse_relation.h
+++ b/src/include/parser/parse_relation.h
@@ -35,95 +35,95 @@ typedef struct
 
 
 extern RangeTblEntry *refnameRangeTblEntry(ParseState *pstate,
-					 const char *schemaname,
-					 const char *refname,
-					 int location,
-					 int *sublevels_up);
+										   const char *schemaname,
+										   const char *refname,
+										   int location,
+										   int *sublevels_up);
 extern CommonTableExpr *scanNameSpaceForCTE(ParseState *pstate,
-					const char *refname,
-					Index *ctelevelsup);
+											const char *refname,
+											Index *ctelevelsup);
 extern bool scanNameSpaceForENR(ParseState *pstate, const char *refname);
 extern void checkNameSpaceConflicts(ParseState *pstate, List *namespace1,
-						List *namespace2);
-extern int RTERangeTablePosn(ParseState *pstate,
-				  RangeTblEntry *rte,
-				  int *sublevels_up);
+									List *namespace2);
+extern int	RTERangeTablePosn(ParseState *pstate,
+							  RangeTblEntry *rte,
+							  int *sublevels_up);
 extern RangeTblEntry *GetRTEByRangeTablePosn(ParseState *pstate,
-					   int varno,
-					   int sublevels_up);
+											 int varno,
+											 int sublevels_up);
 extern CommonTableExpr *GetCTEForRTE(ParseState *pstate, RangeTblEntry *rte,
-			 int rtelevelsup);
+									 int rtelevelsup);
 extern Node *scanRTEForColumn(ParseState *pstate, RangeTblEntry *rte,
-				 const char *colname, int location,
-				 int fuzzy_rte_penalty, FuzzyAttrMatchState *fuzzystate);
+							  const char *colname, int location,
+							  int fuzzy_rte_penalty, FuzzyAttrMatchState *fuzzystate);
 extern Node *colNameToVar(ParseState *pstate, const char *colname, bool localonly,
-			 int location);
+						  int location);
 extern void markVarForSelectPriv(ParseState *pstate, Var *var,
-					 RangeTblEntry *rte);
+								 RangeTblEntry *rte);
 extern Relation parserOpenTable(ParseState *pstate, const RangeVar *relation,
-				int lockmode);
+								int lockmode);
 extern RangeTblEntry *addRangeTableEntry(ParseState *pstate,
-				   RangeVar *relation,
-				   Alias *alias,
-				   bool inh,
-				   bool inFromCl);
+										 RangeVar *relation,
+										 Alias *alias,
+										 bool inh,
+										 bool inFromCl);
 extern RangeTblEntry *addRangeTableEntryForRelation(ParseState *pstate,
-							  Relation rel,
-							  int lockmode,
-							  Alias *alias,
-							  bool inh,
-							  bool inFromCl);
+													Relation rel,
+													int lockmode,
+													Alias *alias,
+													bool inh,
+													bool inFromCl);
 extern RangeTblEntry *addRangeTableEntryForSubquery(ParseState *pstate,
-							  Query *subquery,
-							  Alias *alias,
-							  bool lateral,
-							  bool inFromCl);
+													Query *subquery,
+													Alias *alias,
+													bool lateral,
+													bool inFromCl);
 extern RangeTblEntry *addRangeTableEntryForFunction(ParseState *pstate,
-							  List *funcnames,
-							  List *funcexprs,
-							  List *coldeflists,
-							  RangeFunction *rangefunc,
-							  bool lateral,
-							  bool inFromCl);
+													List *funcnames,
+													List *funcexprs,
+													List *coldeflists,
+													RangeFunction *rangefunc,
+													bool lateral,
+													bool inFromCl);
 extern RangeTblEntry *addRangeTableEntryForValues(ParseState *pstate,
-							List *exprs,
-							List *coltypes,
-							List *coltypmods,
-							List *colcollations,
-							Alias *alias,
-							bool lateral,
-							bool inFromCl);
+												  List *exprs,
+												  List *coltypes,
+												  List *coltypmods,
+												  List *colcollations,
+												  Alias *alias,
+												  bool lateral,
+												  bool inFromCl);
 extern RangeTblEntry *addRangeTableEntryForTableFunc(ParseState *pstate,
-							   TableFunc *tf,
-							   Alias *alias,
-							   bool lateral,
-							   bool inFromCl);
+													 TableFunc *tf,
+													 Alias *alias,
+													 bool lateral,
+													 bool inFromCl);
 extern RangeTblEntry *addRangeTableEntryForJoin(ParseState *pstate,
-						  List *colnames,
-						  JoinType jointype,
-						  List *aliasvars,
-						  Alias *alias,
-						  bool inFromCl);
+												List *colnames,
+												JoinType jointype,
+												List *aliasvars,
+												Alias *alias,
+												bool inFromCl);
 extern RangeTblEntry *addRangeTableEntryForCTE(ParseState *pstate,
-						 CommonTableExpr *cte,
-						 Index levelsup,
-						 RangeVar *rv,
-						 bool inFromCl);
+											   CommonTableExpr *cte,
+											   Index levelsup,
+											   RangeVar *rv,
+											   bool inFromCl);
 extern RangeTblEntry *addRangeTableEntryForENR(ParseState *pstate,
-						 RangeVar *rv,
-						 bool inFromCl);
+											   RangeVar *rv,
+											   bool inFromCl);
 extern bool isLockedRefname(ParseState *pstate, const char *refname);
 extern void addRTEtoQuery(ParseState *pstate, RangeTblEntry *rte,
-			  bool addToJoinList,
-			  bool addToRelNameSpace, bool addToVarNameSpace);
+						  bool addToJoinList,
+						  bool addToRelNameSpace, bool addToVarNameSpace);
 extern void errorMissingRTE(ParseState *pstate, RangeVar *relation) pg_attribute_noreturn();
 extern void errorMissingColumn(ParseState *pstate,
-				   const char *relname, const char *colname, int location) pg_attribute_noreturn();
+							   const char *relname, const 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);
+					  int location, bool include_dropped,
+					  List **colnames, List **colvars);
 extern List *expandRelAttrs(ParseState *pstate, RangeTblEntry *rte,
-			   int rtindex, int sublevels_up, int location);
+							int rtindex, int sublevels_up, int location);
 extern int	attnameAttNum(Relation rd, const char *attname, bool sysColOK);
 extern const NameData *attnumAttName(Relation rd, int attid);
 extern Oid	attnumTypeId(Relation rd, int attid);
diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h
index a7291fa59d4..2052254cdd2 100644
--- a/src/include/parser/parse_target.h
+++ b/src/include/parser/parse_target.h
@@ -18,28 +18,28 @@
 
 
 extern List *transformTargetList(ParseState *pstate, List *targetlist,
-					ParseExprKind exprKind);
+								 ParseExprKind exprKind);
 extern List *transformExpressionList(ParseState *pstate, List *exprlist,
-						ParseExprKind exprKind, bool allowDefault);
+									 ParseExprKind exprKind, bool allowDefault);
 extern void resolveTargetListUnknowns(ParseState *pstate, List *targetlist);
 extern void markTargetListOrigins(ParseState *pstate, List *targetlist);
 extern TargetEntry *transformTargetEntry(ParseState *pstate,
-					 Node *node, Node *expr, ParseExprKind exprKind,
-					 char *colname, bool resjunk);
+										 Node *node, Node *expr, ParseExprKind exprKind,
+										 char *colname, bool resjunk);
 extern Expr *transformAssignedExpr(ParseState *pstate, Expr *expr,
-					  ParseExprKind exprKind,
-					  const char *colname,
-					  int attrno,
-					  List *indirection,
-					  int location);
+								   ParseExprKind exprKind,
+								   const char *colname,
+								   int attrno,
+								   List *indirection,
+								   int location);
 extern void updateTargetListEntry(ParseState *pstate, TargetEntry *tle,
-					  char *colname, int attrno,
-					  List *indirection,
-					  int location);
+								  char *colname, int attrno,
+								  List *indirection,
+								  int location);
 extern List *checkInsertTargets(ParseState *pstate, List *cols,
-				   List **attrnos);
+								List **attrnos);
 extern TupleDesc expandRecordVariable(ParseState *pstate, Var *var,
-					 int levelsup);
+									  int levelsup);
 extern char *FigureColname(Node *node);
 extern char *FigureIndexColname(Node *node);
 
diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h
index 662ffdf29a9..f90ea9b7ecf 100644
--- a/src/include/parser/parse_type.h
+++ b/src/include/parser/parse_type.h
@@ -20,14 +20,14 @@
 typedef HeapTuple Type;
 
 extern Type LookupTypeName(ParseState *pstate, const TypeName *typeName,
-			   int32 *typmod_p, bool missing_ok);
-extern Oid LookupTypeNameOid(ParseState *pstate, const TypeName *typeName,
-				  bool missing_ok);
+						   int32 *typmod_p, bool missing_ok);
+extern Oid	LookupTypeNameOid(ParseState *pstate, const TypeName *typeName,
+							  bool missing_ok);
 extern Type typenameType(ParseState *pstate, const TypeName *typeName,
-			 int32 *typmod_p);
+						 int32 *typmod_p);
 extern Oid	typenameTypeId(ParseState *pstate, const TypeName *typeName);
 extern void typenameTypeIdAndMod(ParseState *pstate, const TypeName *typeName,
-					 Oid *typeid_p, int32 *typmod_p);
+								 Oid *typeid_p, int32 *typmod_p);
 
 extern char *TypeNameToString(const TypeName *typeName);
 extern char *TypeNameListToString(List *typenames);
diff --git a/src/include/parser/parse_utilcmd.h b/src/include/parser/parse_utilcmd.h
index 6928aefb06d..1348064ad07 100644
--- a/src/include/parser/parse_utilcmd.h
+++ b/src/include/parser/parse_utilcmd.h
@@ -19,17 +19,17 @@
 
 extern List *transformCreateStmt(CreateStmt *stmt, const char *queryString);
 extern List *transformAlterTableStmt(Oid relid, AlterTableStmt *stmt,
-						const char *queryString);
+									 const char *queryString);
 extern IndexStmt *transformIndexStmt(Oid relid, IndexStmt *stmt,
-				   const char *queryString);
+									 const char *queryString);
 extern void transformRuleStmt(RuleStmt *stmt, const char *queryString,
-				  List **actions, Node **whereClause);
+							  List **actions, Node **whereClause);
 extern List *transformCreateSchemaStmt(CreateSchemaStmt *stmt);
 extern PartitionBoundSpec *transformPartitionBound(ParseState *pstate, Relation parent,
-						PartitionBoundSpec *spec);
+												   PartitionBoundSpec *spec);
 extern IndexStmt *generateClonedIndexStmt(RangeVar *heapRel,
-						Relation source_idx,
-						const AttrNumber *attmap, int attmap_length,
-						Oid *constraintOid);
+										  Relation source_idx,
+										  const AttrNumber *attmap, int attmap_length,
+										  Oid *constraintOid);
 
 #endif							/* PARSE_UTILCMD_H */
diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h
index 9ba78893b00..cf47e107b9a 100644
--- a/src/include/parser/parsetree.h
+++ b/src/include/parser/parsetree.h
@@ -42,14 +42,14 @@ extern char *get_rte_attribute_name(RangeTblEntry *rte, AttrNumber attnum);
  * type and typemod info for that attribute of that RTE.
  */
 extern void get_rte_attribute_type(RangeTblEntry *rte, AttrNumber attnum,
-					   Oid *vartype, int32 *vartypmod, Oid *varcollid);
+								   Oid *vartype, int32 *vartypmod, Oid *varcollid);
 
 /*
  * Check whether an attribute of an RTE has been dropped (note that
  * get_rte_attribute_type will fail on such an attr)
  */
 extern bool get_rte_attribute_is_dropped(RangeTblEntry *rte,
-							 AttrNumber attnum);
+										 AttrNumber attnum);
 
 
 /* ----------------
diff --git a/src/include/parser/scanner.h b/src/include/parser/scanner.h
index 91e1c836d22..731a2bd264a 100644
--- a/src/include/parser/scanner.h
+++ b/src/include/parser/scanner.h
@@ -121,12 +121,12 @@ extern PGDLLIMPORT const uint16 ScanKeywordTokens[];
 
 /* Entry points in parser/scan.l */
 extern core_yyscan_t scanner_init(const char *str,
-			 core_yy_extra_type *yyext,
-			 const ScanKeywordList *keywordlist,
-			 const uint16 *keyword_tokens);
+								  core_yy_extra_type *yyext,
+								  const ScanKeywordList *keywordlist,
+								  const uint16 *keyword_tokens);
 extern void scanner_finish(core_yyscan_t yyscanner);
-extern int core_yylex(core_YYSTYPE *lvalp, YYLTYPE *llocp,
-		   core_yyscan_t yyscanner);
+extern int	core_yylex(core_YYSTYPE *lvalp, YYLTYPE *llocp,
+					   core_yyscan_t yyscanner);
 extern int	scanner_errposition(int location, core_yyscan_t yyscanner);
 extern void scanner_yyerror(const char *message, core_yyscan_t yyscanner) pg_attribute_noreturn();
 
diff --git a/src/include/parser/scansup.h b/src/include/parser/scansup.h
index 377f0181a4d..fb2980bd178 100644
--- a/src/include/parser/scansup.h
+++ b/src/include/parser/scansup.h
@@ -18,10 +18,10 @@
 extern char *scanstr(const char *s);
 
 extern char *downcase_truncate_identifier(const char *ident, int len,
-							 bool warn);
+										  bool warn);
 
 extern char *downcase_identifier(const char *ident, int len,
-					bool warn, bool truncate);
+								 bool warn, bool truncate);
 
 extern void truncate_identifier(char *ident, int len, bool warn);