Phase 2 of pgindent updates.

Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.

Commit e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code.  The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there.  BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs.  So the
net result is that in about half the cases, such comments are placed
one tab stop left of before.  This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.

Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.

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/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us

3 files changed, 12 insertions, 12 deletions

diff --git a/src/fe_utils/mbprint.c b/src/fe_utils/mbprint.c
index 364baa6a1b..8db72624d5 100644
--- a/src/fe_utils/mbprint.c
+++ b/src/fe_utils/mbprint.c
@@ -233,14 +233,14 @@ pg_wcssize(const unsigned char *pwcs, size_t len, int encoding,
 					width = linewidth;
 				linewidth = 0;
 				height += 1;
-				format_size += 1;		/* For NUL char */
+				format_size += 1;	/* For NUL char */
 			}
-			else if (*pwcs == '\r')		/* Linefeed */
+			else if (*pwcs == '\r') /* Linefeed */
 			{
 				linewidth += 2;
 				format_size += 2;
 			}
-			else if (*pwcs == '\t')		/* Tab */
+			else if (*pwcs == '\t') /* Tab */
 			{
 				do
 				{
@@ -321,13 +321,13 @@ pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding,
 				/* make next line point to remaining memory */
 				lines->ptr = ptr;
 			}
-			else if (*pwcs == '\r')		/* Linefeed */
+			else if (*pwcs == '\r') /* Linefeed */
 			{
 				strcpy((char *) ptr, "\\r");
 				linewidth += 2;
 				ptr += 2;
 			}
-			else if (*pwcs == '\t')		/* Tab */
+			else if (*pwcs == '\t') /* Tab */
 			{
 				do
 				{
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c
index 4c320b215c..4f3d9e3afe 100644
--- a/src/fe_utils/print.c
+++ b/src/fe_utils/print.c
@@ -608,12 +608,12 @@ print_aligned_text(const printTableContent *cont, FILE *fout, bool is_pager)
 
 	const char *const *ptr;
 
-	struct lineptr **col_lineptrs;		/* pointers to line pointer per column */
+	struct lineptr **col_lineptrs;	/* pointers to line pointer per column */
 
 	bool	   *header_done;	/* Have all header lines been output? */
 	int		   *bytes_output;	/* Bytes output for column value */
 	printTextLineWrap *wrap;	/* Wrap status for each column */
-	int			output_columns = 0;		/* Width of interactive console */
+	int			output_columns = 0; /* Width of interactive console */
 	bool		is_local_pager = false;
 
 	if (cancel_pressed)
@@ -1086,7 +1086,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout, bool is_pager)
 				 * If left-aligned, pad out remaining space if needed (not
 				 * last column, and/or wrap marks required).
 				 */
-				if (cont->aligns[j] != 'r')		/* Left aligned cell */
+				if (cont->aligns[j] != 'r') /* Left aligned cell */
 				{
 					if (finalspaces ||
 						wrap[j] == PRINT_LINE_WRAP_WRAP ||
@@ -1249,7 +1249,7 @@ print_aligned_vertical(const printTableContent *cont,
 	bool		is_local_pager = false,
 				hmultiline = false,
 				dmultiline = false;
-	int			output_columns = 0;		/* Width of interactive console */
+	int			output_columns = 0; /* Width of interactive console */
 
 	if (cancel_pressed)
 		return;
diff --git a/src/fe_utils/string_utils.c b/src/fe_utils/string_utils.c
index 45a08c7ee1..c7e42ddec9 100644
--- a/src/fe_utils/string_utils.c
+++ b/src/fe_utils/string_utils.c
@@ -536,7 +536,7 @@ appendShellStringNoError(PQExpBuffer buf, const char *str)
 		backslash_run_length--;
 	}
 	appendPQExpBufferStr(buf, "^\"");
-#endif   /* WIN32 */
+#endif							/* WIN32 */
 
 	return ok;
 }
@@ -713,9 +713,9 @@ parsePGArray(const char *atext, char ***itemarray, int *nitems)
 					{
 						atext++;
 						if (*atext == '\0')
-							return false;		/* premature end of string */
+							return false;	/* premature end of string */
 					}
-					*strings++ = *atext++;		/* copy quoted data */
+					*strings++ = *atext++;	/* copy quoted data */
 				}
 				atext++;
 			}