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]

1 files changed, 19 insertions, 19 deletions

diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 71c9ff650ec..343e5303d99 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -152,7 +152,7 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	if (conn->lobjfuncs->fn_lo_truncate == 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-			libpq_gettext("cannot determine OID of function lo_truncate\n"));
+						  libpq_gettext("cannot determine OID of function lo_truncate\n"));
 		return -1;
 	}
 
@@ -168,7 +168,7 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	if (len > (size_t) INT_MAX)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-		   libpq_gettext("argument of lo_truncate exceeds integer range\n"));
+						  libpq_gettext("argument of lo_truncate exceeds integer range\n"));
 		return -1;
 	}
 
@@ -219,7 +219,7 @@ lo_truncate64(PGconn *conn, int fd, pg_int64 len)
 	if (conn->lobjfuncs->fn_lo_truncate64 == 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-		  libpq_gettext("cannot determine OID of function lo_truncate64\n"));
+						  libpq_gettext("cannot determine OID of function lo_truncate64\n"));
 		return -1;
 	}
 
@@ -277,7 +277,7 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	if (len > (size_t) INT_MAX)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-			   libpq_gettext("argument of lo_read exceeds integer range\n"));
+						  libpq_gettext("argument of lo_read exceeds integer range\n"));
 		return -1;
 	}
 
@@ -332,7 +332,7 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	if (len > (size_t) INT_MAX)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-			  libpq_gettext("argument of lo_write exceeds integer range\n"));
+						  libpq_gettext("argument of lo_write exceeds integer range\n"));
 		return -1;
 	}
 
@@ -423,7 +423,7 @@ lo_lseek64(PGconn *conn, int fd, pg_int64 offset, int whence)
 	if (conn->lobjfuncs->fn_lo_lseek64 == 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-			 libpq_gettext("cannot determine OID of function lo_lseek64\n"));
+						  libpq_gettext("cannot determine OID of function lo_lseek64\n"));
 		return -1;
 	}
 
@@ -519,7 +519,7 @@ lo_create(PGconn *conn, Oid lobjId)
 	if (conn->lobjfuncs->fn_lo_create == 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-			  libpq_gettext("cannot determine OID of function lo_create\n"));
+						  libpq_gettext("cannot determine OID of function lo_create\n"));
 		return InvalidOid;
 	}
 
@@ -598,7 +598,7 @@ lo_tell64(PGconn *conn, int fd)
 	if (conn->lobjfuncs->fn_lo_tell64 == 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-			  libpq_gettext("cannot determine OID of function lo_tell64\n"));
+						  libpq_gettext("cannot determine OID of function lo_tell64\n"));
 		return -1;
 	}
 
@@ -759,7 +759,7 @@ lo_import_internal(PGconn *conn, const char *filename, Oid oid)
 		(void) lo_close(conn, lobj);
 		(void) close(fd);
 		printfPQExpBuffer(&conn->errorMessage,
-					  libpq_gettext("could not read from file \"%s\": %s\n"),
+						  libpq_gettext("could not read from file \"%s\": %s\n"),
 						  filename,
 						  pqStrerror(save_errno, sebuf, sizeof(sebuf)));
 		return InvalidOid;
@@ -833,7 +833,7 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 			(void) lo_close(conn, lobj);
 			(void) close(fd);
 			printfPQExpBuffer(&conn->errorMessage,
-					   libpq_gettext("could not write to file \"%s\": %s\n"),
+							  libpq_gettext("could not write to file \"%s\": %s\n"),
 							  filename,
 							  pqStrerror(save_errno, sebuf, sizeof(sebuf)));
 			return -1;
@@ -857,7 +857,7 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 	if (close(fd) && result >= 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-					   libpq_gettext("could not write to file \"%s\": %s\n"),
+						  libpq_gettext("could not write to file \"%s\": %s\n"),
 						  filename, pqStrerror(errno, sebuf, sizeof(sebuf)));
 		result = -1;
 	}
@@ -993,56 +993,56 @@ lo_initialize(PGconn *conn)
 	if (lobjfuncs->fn_lo_open == 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-				libpq_gettext("cannot determine OID of function lo_open\n"));
+						  libpq_gettext("cannot determine OID of function lo_open\n"));
 		free(lobjfuncs);
 		return -1;
 	}
 	if (lobjfuncs->fn_lo_close == 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-			   libpq_gettext("cannot determine OID of function lo_close\n"));
+						  libpq_gettext("cannot determine OID of function lo_close\n"));
 		free(lobjfuncs);
 		return -1;
 	}
 	if (lobjfuncs->fn_lo_creat == 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-			   libpq_gettext("cannot determine OID of function lo_creat\n"));
+						  libpq_gettext("cannot determine OID of function lo_creat\n"));
 		free(lobjfuncs);
 		return -1;
 	}
 	if (lobjfuncs->fn_lo_unlink == 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-			  libpq_gettext("cannot determine OID of function lo_unlink\n"));
+						  libpq_gettext("cannot determine OID of function lo_unlink\n"));
 		free(lobjfuncs);
 		return -1;
 	}
 	if (lobjfuncs->fn_lo_lseek == 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-			   libpq_gettext("cannot determine OID of function lo_lseek\n"));
+						  libpq_gettext("cannot determine OID of function lo_lseek\n"));
 		free(lobjfuncs);
 		return -1;
 	}
 	if (lobjfuncs->fn_lo_tell == 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-				libpq_gettext("cannot determine OID of function lo_tell\n"));
+						  libpq_gettext("cannot determine OID of function lo_tell\n"));
 		free(lobjfuncs);
 		return -1;
 	}
 	if (lobjfuncs->fn_lo_read == 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-				 libpq_gettext("cannot determine OID of function loread\n"));
+						  libpq_gettext("cannot determine OID of function loread\n"));
 		free(lobjfuncs);
 		return -1;
 	}
 	if (lobjfuncs->fn_lo_write == 0)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-				libpq_gettext("cannot determine OID of function lowrite\n"));
+						  libpq_gettext("cannot determine OID of function lowrite\n"));
 		free(lobjfuncs);
 		return -1;
 	}