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

1 files changed, 9 insertions, 9 deletions

diff --git a/src/interfaces/libpq/fe-auth-scram.c b/src/interfaces/libpq/fe-auth-scram.c
index d2e355a8b8d..8c5c3148c57 100644
--- a/src/interfaces/libpq/fe-auth-scram.c
+++ b/src/interfaces/libpq/fe-auth-scram.c
@@ -173,13 +173,13 @@ pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
 		if (inputlen == 0)
 		{
 			printfPQExpBuffer(errorMessage,
-				 libpq_gettext("malformed SCRAM message (empty message)\n"));
+							  libpq_gettext("malformed SCRAM message (empty message)\n"));
 			goto error;
 		}
 		if (inputlen != strlen(input))
 		{
 			printfPQExpBuffer(errorMessage,
-			   libpq_gettext("malformed SCRAM message (length mismatch)\n"));
+							  libpq_gettext("malformed SCRAM message (length mismatch)\n"));
 			goto error;
 		}
 	}
@@ -228,7 +228,7 @@ pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
 			{
 				*success = false;
 				printfPQExpBuffer(errorMessage,
-								libpq_gettext("invalid server signature\n"));
+								  libpq_gettext("invalid server signature\n"));
 			}
 			*done = true;
 			state->state = FE_SCRAM_FINISHED;
@@ -237,7 +237,7 @@ pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
 		default:
 			/* shouldn't happen */
 			printfPQExpBuffer(errorMessage,
-							libpq_gettext("invalid SCRAM exchange state\n"));
+							  libpq_gettext("invalid SCRAM exchange state\n"));
 			goto error;
 	}
 	return;
@@ -260,7 +260,7 @@ read_attr_value(char **input, char attr, PQExpBuffer errorMessage)
 	if (*begin != attr)
 	{
 		printfPQExpBuffer(errorMessage,
-					libpq_gettext("malformed SCRAM message (%c expected)\n"),
+						  libpq_gettext("malformed SCRAM message (%c expected)\n"),
 						  attr);
 		return NULL;
 	}
@@ -269,7 +269,7 @@ read_attr_value(char **input, char attr, PQExpBuffer errorMessage)
 	if (*begin != '=')
 	{
 		printfPQExpBuffer(errorMessage,
-		libpq_gettext("malformed SCRAM message (expected = in attr '%c')\n"),
+						  libpq_gettext("malformed SCRAM message (expected = in attr '%c')\n"),
 						  attr);
 		return NULL;
 	}
@@ -434,7 +434,7 @@ read_server_first_message(fe_scram_state *state, char *input,
 		memcmp(nonce, state->client_nonce, strlen(state->client_nonce)) != 0)
 	{
 		printfPQExpBuffer(errormessage,
-				 libpq_gettext("invalid SCRAM response (nonce mismatch)\n"));
+						  libpq_gettext("invalid SCRAM response (nonce mismatch)\n"));
 		return false;
 	}
 
@@ -473,7 +473,7 @@ read_server_first_message(fe_scram_state *state, char *input,
 	if (*endptr != '\0' || state->iterations < 1)
 	{
 		printfPQExpBuffer(errormessage,
-		libpq_gettext("malformed SCRAM message (invalid iteration count)\n"));
+						  libpq_gettext("malformed SCRAM message (invalid iteration count)\n"));
 		return false;
 	}
 
@@ -508,7 +508,7 @@ read_server_final_message(fe_scram_state *state, char *input,
 		char	   *errmsg = read_attr_value(&input, 'e', errormessage);
 
 		printfPQExpBuffer(errormessage,
-		  libpq_gettext("error received from server in SASL exchange: %s\n"),
+						  libpq_gettext("error received from server in SASL exchange: %s\n"),
 						  errmsg);
 		return false;
 	}