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

5 files changed, 33 insertions, 33 deletions

diff --git a/src/include/fe_utils/mbprint.h b/src/include/fe_utils/mbprint.h
index 4d7c9eee502..97f0a590e8d 100644
--- a/src/include/fe_utils/mbprint.h
+++ b/src/include/fe_utils/mbprint.h
@@ -22,8 +22,8 @@ struct lineptr
 extern unsigned char *mbvalidate(unsigned char *pwcs, int encoding);
 extern int	pg_wcswidth(const char *pwcs, size_t len, int encoding);
 extern void pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding,
-			 struct lineptr *lines, int count);
+						 struct lineptr *lines, int count);
 extern void pg_wcssize(const unsigned char *pwcs, size_t len, int encoding,
-		   int *width, int *height, int *format_size);
+					   int *width, int *height, int *format_size);
 
 #endif							/* MBPRINT_H */
diff --git a/src/include/fe_utils/print.h b/src/include/fe_utils/print.h
index 2a9e72175c5..f138d963d3f 100644
--- a/src/include/fe_utils/print.h
+++ b/src/include/fe_utils/print.h
@@ -192,21 +192,21 @@ extern void ClosePager(FILE *pagerpipe);
 extern void html_escaped_print(const char *in, FILE *fout);
 
 extern void printTableInit(printTableContent *const content,
-			   const printTableOpt *opt, const char *title,
-			   const int ncolumns, const int nrows);
+						   const printTableOpt *opt, const char *title,
+						   const int ncolumns, const int nrows);
 extern void printTableAddHeader(printTableContent *const content,
-					char *header, const bool translate, const char align);
+								char *header, const bool translate, const char align);
 extern void printTableAddCell(printTableContent *const content,
-				  char *cell, const bool translate, const bool mustfree);
+							  char *cell, const bool translate, const bool mustfree);
 extern void printTableAddFooter(printTableContent *const content,
-					const char *footer);
+								const char *footer);
 extern void printTableSetFooter(printTableContent *const content,
-					const char *footer);
+								const char *footer);
 extern void printTableCleanup(printTableContent *const content);
 extern void printTable(const printTableContent *cont,
-		   FILE *fout, bool is_pager, FILE *flog);
+					   FILE *fout, bool is_pager, FILE *flog);
 extern void printQuery(const PGresult *result, const printQueryOpt *opt,
-		   FILE *fout, bool is_pager, FILE *flog);
+					   FILE *fout, bool is_pager, FILE *flog);
 
 extern char column_type_alignment(Oid);
 
diff --git a/src/include/fe_utils/psqlscan.h b/src/include/fe_utils/psqlscan.h
index c3a1d581171..dd2ebcb01d9 100644
--- a/src/include/fe_utils/psqlscan.h
+++ b/src/include/fe_utils/psqlscan.h
@@ -73,13 +73,13 @@ extern void psql_scan_destroy(PsqlScanState state);
 extern void psql_scan_set_passthrough(PsqlScanState state, void *passthrough);
 
 extern void psql_scan_setup(PsqlScanState state,
-				const char *line, int line_len,
-				int encoding, bool std_strings);
+							const char *line, int line_len,
+							int encoding, bool std_strings);
 extern void psql_scan_finish(PsqlScanState state);
 
 extern PsqlScanResult psql_scan(PsqlScanState state,
-		  PQExpBuffer query_buf,
-		  promptStatus_t *prompt);
+								PQExpBuffer query_buf,
+								promptStatus_t *prompt);
 
 extern void psql_scan_reset(PsqlScanState state);
 
diff --git a/src/include/fe_utils/psqlscan_int.h b/src/include/fe_utils/psqlscan_int.h
index 42a738f4221..2acb380078d 100644
--- a/src/include/fe_utils/psqlscan_int.h
+++ b/src/include/fe_utils/psqlscan_int.h
@@ -128,21 +128,21 @@ typedef struct PsqlScanStateData
  * compatible lexers.
  */
 extern void psqlscan_push_new_buffer(PsqlScanState state,
-						 const char *newstr, const char *varname);
+									 const char *newstr, const char *varname);
 extern void psqlscan_pop_buffer_stack(PsqlScanState state);
 extern void psqlscan_select_top_buffer(PsqlScanState state);
 extern bool psqlscan_var_is_current_source(PsqlScanState state,
-							   const char *varname);
+										   const char *varname);
 extern YY_BUFFER_STATE psqlscan_prepare_buffer(PsqlScanState state,
-						const char *txt, int len,
-						char **txtcopy);
+											   const char *txt, int len,
+											   char **txtcopy);
 extern void psqlscan_emit(PsqlScanState state, const char *txt, int len);
 extern char *psqlscan_extract_substring(PsqlScanState state,
-						   const char *txt, int len);
+										const char *txt, int len);
 extern void psqlscan_escape_variable(PsqlScanState state,
-						 const char *txt, int len,
-						 PsqlScanQuoteType quote);
+									 const char *txt, int len,
+									 PsqlScanQuoteType quote);
 extern void psqlscan_test_variable(PsqlScanState state,
-					   const char *txt, int len);
+								   const char *txt, int len);
 
 #endif							/* PSQLSCAN_INT_H */
diff --git a/src/include/fe_utils/string_utils.h b/src/include/fe_utils/string_utils.h
index 31c8d7d7a32..8c13cc0a66d 100644
--- a/src/include/fe_utils/string_utils.h
+++ b/src/include/fe_utils/string_utils.h
@@ -28,17 +28,17 @@ extern const char *fmtId(const char *identifier);
 extern const char *fmtQualifiedId(const char *schema, const char *id);
 
 extern char *formatPGVersionNumber(int version_number, bool include_minor,
-					  char *buf, size_t buflen);
+								   char *buf, size_t buflen);
 
 extern void appendStringLiteral(PQExpBuffer buf, const char *str,
-					int encoding, bool std_strings);
+								int encoding, bool std_strings);
 extern void appendStringLiteralConn(PQExpBuffer buf, const char *str,
-						PGconn *conn);
+									PGconn *conn);
 extern void appendStringLiteralDQ(PQExpBuffer buf, const char *str,
-					  const char *dqprefix);
+								  const char *dqprefix);
 extern void appendByteaLiteral(PQExpBuffer buf,
-				   const unsigned char *str, size_t length,
-				   bool std_strings);
+							   const unsigned char *str, size_t length,
+							   bool std_strings);
 
 extern void appendShellString(PQExpBuffer buf, const char *str);
 extern bool appendShellStringNoError(PQExpBuffer buf, const char *str);
@@ -48,12 +48,12 @@ extern void appendPsqlMetaConnect(PQExpBuffer buf, const char *dbname);
 extern bool parsePGArray(const char *atext, char ***itemarray, int *nitems);
 
 extern bool appendReloptionsArray(PQExpBuffer buffer, const char *reloptions,
-					  const char *prefix, int encoding, bool std_strings);
+								  const char *prefix, int encoding, bool std_strings);
 
 extern bool processSQLNamePattern(PGconn *conn, PQExpBuffer buf,
-					  const char *pattern,
-					  bool have_where, bool force_escape,
-					  const char *schemavar, const char *namevar,
-					  const char *altnamevar, const char *visibilityrule);
+								  const char *pattern,
+								  bool have_where, bool force_escape,
+								  const char *schemavar, const char *namevar,
+								  const char *altnamevar, const char *visibilityrule);
 
 #endif							/* STRING_UTILS_H */