Update typedefs.list and re-run pgindent

Discussion: http://postgr.es/m/CA+TgmoaA9=1RWKtBWpDaj+sF3Stgc8sHgf5z=KGtbjwPLQVDMA@mail.gmail.com

5 files changed, 14 insertions, 12 deletions

diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
index 8f901a83fb2..871e2011f3e 100644
--- a/src/interfaces/ecpg/ecpglib/data.c
+++ b/src/interfaces/ecpg/ecpglib/data.c
@@ -55,7 +55,8 @@ garbage_left(enum ARRAY_TYPE isarray, char **scan_length, enum COMPAT_MODE compa
 		if (INFORMIX_MODE(compat) && **scan_length == '.')
 		{
 			/* skip invalid characters */
-			do {
+			do
+			{
 				(*scan_length)++;
 			} while (isdigit((unsigned char) **scan_length));
 		}
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 7776813d1b4..7d6d7d0754c 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1109,7 +1109,7 @@ ecpg_build_params(struct statement *stmt)
 	struct variable *var;
 	int			desc_counter = 0;
 	int			position = 0;
-	const char	   *value;
+	const char *value;
 	bool		std_strings = false;
 
 	/* Get standard_conforming_strings setting. */
diff --git a/src/interfaces/libpq/fe-auth-scram.c b/src/interfaces/libpq/fe-auth-scram.c
index f2403147ca5..97db0b1faa8 100644
--- a/src/interfaces/libpq/fe-auth-scram.c
+++ b/src/interfaces/libpq/fe-auth-scram.c
@@ -491,9 +491,9 @@ build_client_final_message(fe_scram_state *state, PQExpBuffer errormessage)
 		free(cbind_input);
 	}
 	else if (state->ssl_in_use)
-		appendPQExpBuffer(&buf, "c=eSws"); /* base64 of "y,," */
+		appendPQExpBuffer(&buf, "c=eSws");	/* base64 of "y,," */
 	else
-		appendPQExpBuffer(&buf, "c=biws"); /* base64 of "n,," */
+		appendPQExpBuffer(&buf, "c=biws");	/* base64 of "n,," */
 
 	if (PQExpBufferDataBroken(buf))
 		goto oom_error;
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 9d394919eff..f54ad8e0cc6 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -534,7 +534,7 @@ pg_SASL_init(PGconn *conn, int payloadlen)
 		 */
 		if (conn->ssl_in_use &&
 			strcmp(mechanism_buf.data, SCRAM_SHA256_PLUS_NAME) == 0)
-				selected_mechanism = SCRAM_SHA256_PLUS_NAME;
+			selected_mechanism = SCRAM_SHA256_PLUS_NAME;
 		else if (strcmp(mechanism_buf.data, SCRAM_SHA256_NAME) == 0 &&
 				 !selected_mechanism)
 			selected_mechanism = SCRAM_SHA256_NAME;
@@ -569,6 +569,7 @@ pg_SASL_init(PGconn *conn, int payloadlen)
 	}
 
 #ifdef USE_SSL
+
 	/*
 	 * Get data for channel binding.
 	 */
@@ -581,8 +582,8 @@ pg_SASL_init(PGconn *conn, int payloadlen)
 #endif
 
 	/*
-	 * Initialize the SASL state information with all the information
-	 * gathered during the initial exchange.
+	 * Initialize the SASL state information with all the information gathered
+	 * during the initial exchange.
 	 *
 	 * Note: Only tls-unique is supported for the moment.
 	 */
diff --git a/src/interfaces/libpq/fe-auth.h b/src/interfaces/libpq/fe-auth.h
index 1525a527420..3e92410eaed 100644
--- a/src/interfaces/libpq/fe-auth.h
+++ b/src/interfaces/libpq/fe-auth.h
@@ -24,11 +24,11 @@ extern char *pg_fe_getauthname(PQExpBuffer errorMessage);
 
 /* Prototypes for functions in fe-auth-scram.c */
 extern void *pg_fe_scram_init(const char *username,
-							  const char *password,
-							  bool ssl_in_use,
-							  const char *sasl_mechanism,
-							  char *tls_finished_message,
-							  size_t tls_finished_len);
+				 const char *password,
+				 bool ssl_in_use,
+				 const char *sasl_mechanism,
+				 char *tls_finished_message,
+				 size_t tls_finished_len);
 extern void pg_fe_scram_free(void *opaq);
 extern void pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
 					 char **output, int *outputlen,