Run pgindent on libpq's fe-auth.c, fe-auth-scram.c and fe-connect.c

michaelpq · michaelpq · commit b6dfee28f2b4 · 2023-03-09T15:09:45.000+09:00
A patch sent by Jacob Champion has been touching this area of the code, and the set of changes done in a9e9a9f has made a run of pgindent on these files a bit annoying to handle. So let's clean up a bit the area, first, to ease the work on follow-up patches. Discussion: https://postgr.es/m/9e5a8ccddb8355ea9fa4b75a1e3a9edc88a70cd3.camel@vmware.com
diff --git a/src/interfaces/libpq/fe-auth-scram.c b/src/interfaces/libpq/fe-auth-scram.c
@@ -716,7 +716,7 @@ read_server_final_message(fe_scram_state *state, char *input)
 			return false;
 		}
 		libpq_append_conn_error(conn, "error received from server in SCRAM exchange: %s",
-						   errmsg);
+								errmsg);
 		return false;
 	}
 
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
@@ -73,7 +73,7 @@ pg_GSS_continue(PGconn *conn, int payloadlen)
 		if (!ginbuf.value)
 		{
 			libpq_append_conn_error(conn, "out of memory allocating GSSAPI buffer (%d)",
-							  payloadlen);
+									payloadlen);
 			return STATUS_ERROR;
 		}
 		if (pqGetnchar(ginbuf.value, payloadlen, conn))
@@ -223,7 +223,7 @@ pg_SSPI_continue(PGconn *conn, int payloadlen)
 		if (!inputbuf)
 		{
 			libpq_append_conn_error(conn, "out of memory allocating SSPI buffer (%d)",
-							  payloadlen);
+									payloadlen);
 			return STATUS_ERROR;
 		}
 		if (pqGetnchar(inputbuf, payloadlen, conn))
@@ -623,7 +623,7 @@ pg_SASL_continue(PGconn *conn, int payloadlen, bool final)
 	if (!challenge)
 	{
 		libpq_append_conn_error(conn, "out of memory allocating SASL buffer (%d)",
-						  payloadlen);
+								payloadlen);
 		return STATUS_ERROR;
 	}
 
@@ -1277,7 +1277,7 @@ PQencryptPasswordConn(PGconn *conn, const char *passwd, const char *user,
 	else
 	{
 		libpq_append_conn_error(conn, "unrecognized password encryption algorithm \"%s\"",
-						  algorithm);
+								algorithm);
 		return NULL;
 	}
 
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c

Original file line number	Diff line number	Diff line change
`@@ -716,7 +716,7 @@ read_server_final_message(fe_scram_state state, char input)`
`716`	`716`	`return false;`
`717`	`717`	`}`
`718`	`718`	`libpq_append_conn_error(conn, "error received from server in SCRAM exchange: %s",`
`719`		`- errmsg);`
	`719`	`+ errmsg);`
`720`	`720`	`return false;`
`721`	`721`	`}`
`722`	`722`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ pg_GSS_continue(PGconn *conn, int payloadlen)`
`73`	`73`	`if (!ginbuf.value)`
`74`	`74`	`{`
`75`	`75`	`libpq_append_conn_error(conn, "out of memory allocating GSSAPI buffer (%d)",`
`76`		`- payloadlen);`
	`76`	`+ payloadlen);`
`77`	`77`	`return STATUS_ERROR;`
`78`	`78`	`}`
`79`	`79`	`if (pqGetnchar(ginbuf.value, payloadlen, conn))`
`@@ -223,7 +223,7 @@ pg_SSPI_continue(PGconn *conn, int payloadlen)`
`223`	`223`	`if (!inputbuf)`
`224`	`224`	`{`
`225`	`225`	`libpq_append_conn_error(conn, "out of memory allocating SSPI buffer (%d)",`
`226`		`- payloadlen);`
	`226`	`+ payloadlen);`
`227`	`227`	`return STATUS_ERROR;`
`228`	`228`	`}`
`229`	`229`	`if (pqGetnchar(inputbuf, payloadlen, conn))`
`@@ -623,7 +623,7 @@ pg_SASL_continue(PGconn *conn, int payloadlen, bool final)`
`623`	`623`	`if (!challenge)`
`624`	`624`	`{`
`625`	`625`	`libpq_append_conn_error(conn, "out of memory allocating SASL buffer (%d)",`
`626`		`- payloadlen);`
	`626`	`+ payloadlen);`
`627`	`627`	`return STATUS_ERROR;`
`628`	`628`	`}`
`629`	`629`
`@@ -1277,7 +1277,7 @@ PQencryptPasswordConn(PGconn conn, const char passwd, const char *user,`
`1277`	`1277`	`else`
`1278`	`1278`	`{`
`1279`	`1279`	`libpq_append_conn_error(conn, "unrecognized password encryption algorithm \"%s\"",`
`1280`		`- algorithm);`
	`1280`	`+ algorithm);`
`1281`	`1281`	`return NULL;`
`1282`	`1282`	`}`
`1283`	`1283`