diff options
| author | Tom Lane | 2017-06-13 17:05:59 +0000 |
|---|---|---|
| committer | Tom Lane | 2017-06-13 17:05:59 +0000 |
| commit | 651902deb1551db8b401fdeab9bdb8a61cee7f9f (patch) | |
| tree | c06f24749e9421a403a425f9037a20911680ca3a /src/interfaces | |
| parent | 096f1ccd5290286b135822bb282fa884454d4b69 (diff) | |
Re-run pgindent.
This is just to have a clean base state for testing of Piotr Stefaniak's
latest version of FreeBSD indent. I fixed up a couple of places where
pgindent would have changed format not-nicely. perltidy not included.
Discussion: https://postgr.es/m/VI1PR03MB119959F4B65F000CA7CD9F6BF2CC0@VI1PR03MB1199.eurprd03.prod.outlook.com
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/pg_type.h | 28 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-auth.c | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 13 |
3 files changed, 26 insertions, 19 deletions
diff --git a/src/interfaces/ecpg/ecpglib/pg_type.h b/src/interfaces/ecpg/ecpglib/pg_type.h index a2f44324baa..48ae4801290 100644 --- a/src/interfaces/ecpg/ecpglib/pg_type.h +++ b/src/interfaces/ecpg/ecpglib/pg_type.h @@ -57,23 +57,23 @@ #define ZPBITOID 1560 #define VARBITOID 1562 #define NUMERICOID 1700 -#define REFCURSOROID 1790 +#define REFCURSOROID 1790 #define REGPROCEDUREOID 2202 -#define REGOPEROID 2203 -#define REGOPERATOROID 2204 -#define REGCLASSOID 2205 -#define REGTYPEOID 2206 -#define REGROLEOID 4096 -#define REGNAMESPACEOID 4089 +#define REGOPEROID 2203 +#define REGOPERATOROID 2204 +#define REGCLASSOID 2205 +#define REGTYPEOID 2206 +#define REGROLEOID 4096 +#define REGNAMESPACEOID 4089 #define REGTYPEARRAYOID 2211 #define UUIDOID 2950 -#define LSNOID 3220 -#define TSVECTOROID 3614 -#define GTSVECTOROID 3642 -#define TSQUERYOID 3615 -#define REGCONFIGOID 3734 -#define REGDICTIONARYOID 3769 +#define LSNOID 3220 +#define TSVECTOROID 3614 +#define GTSVECTOROID 3642 +#define TSQUERYOID 3615 +#define REGCONFIGOID 3734 +#define REGDICTIONARYOID 3769 #define JSONBOID 3802 -#define INT4RANGEOID 3904 +#define INT4RANGEOID 3904 #endif /* PG_TYPE_H */ diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index d906abf9c8f..181eeea8351 100644 --- a/src/interfaces/libpq/fe-auth.c +++ b/src/interfaces/libpq/fe-auth.c @@ -419,7 +419,7 @@ pg_SSPI_startup(PGconn *conn, int use_negotiate, int payloadlen) if (conn->sspictx) { printfPQExpBuffer(&conn->errorMessage, - libpq_gettext("duplicate SSPI authentication request\n")); + libpq_gettext("duplicate SSPI authentication request\n")); return STATUS_ERROR; } @@ -1218,7 +1218,7 @@ PQencryptPasswordConn(PGconn *conn, const char *passwd, const char *user, else { printfPQExpBuffer(&conn->errorMessage, - libpq_gettext("unrecognized password encryption algorithm \"%s\"\n"), + libpq_gettext("unrecognized password encryption algorithm \"%s\"\n"), algorithm); return NULL; } diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 1069e001bca..02ec8f0cea4 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -1842,16 +1842,23 @@ connectDBComplete(PGconn *conn) return 0; } - if (ret == 1) /* connect_timeout elapsed */ + if (ret == 1) /* connect_timeout elapsed */ { - /* If there are no more hosts, return (the error message is already set) */ + /* + * If there are no more hosts, return (the error message is + * already set) + */ if (++conn->whichhost >= conn->nconnhost) { conn->whichhost = 0; conn->status = CONNECTION_BAD; return 0; } - /* Attempt connection to the next host, starting the connect_timeout timer */ + + /* + * Attempt connection to the next host, starting the + * connect_timeout timer + */ pqDropConnection(conn, true); conn->addr_cur = conn->connhost[conn->whichhost].addrlist; conn->status = CONNECTION_NEEDED; |