rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pgindent fe-connect.c --- done to make IPv6 patch easier to apply.

This commit is contained in:
Bruce Momjian 2002-12-19 19:30:24 +00:00
parent e77443fde0
commit abf6f48319
1 changed files with 135 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/interfaces/libpq/fe-connect.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.215 2002/12/06 04:37:05 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.216 2002/12/19 19:30:24 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1068,7 +1068,10 @@ connectDBComplete(PGconn *conn)
if (timeout > 0) if (timeout > 0)
{ {
/* Rounding could cause connection to fail; need at least 2 secs */ /*
* Rounding could cause connection to fail; need at least 2
* secs
*/
if (timeout < 2) if (timeout < 2)
timeout = 2; timeout = 2;
/* calculate the finish time based on start + timeout */ /* calculate the finish time based on start + timeout */
@ -1617,9 +1620,9 @@ PQsetenvPoll(PGconn *conn)
if (!env || *env == '\0') if (!env || *env == '\0')
{ {
/* /*
* PGCLIENTENCODING is not specified, so query server * PGCLIENTENCODING is not specified, so query
* for it. We must use begin/commit in case autocommit * server for it. We must use begin/commit in
* is off by default. * case autocommit is off by default.
*/ */
if (!PQsendQuery(conn, "begin; select getdatabaseencoding(); commit")) if (!PQsendQuery(conn, "begin; select getdatabaseencoding(); commit"))
goto error_return; goto error_return;
@ -1677,7 +1680,10 @@ PQsetenvPoll(PGconn *conn)
} }
else else
{ {
/* NULL result indicates that the query is finished */ /*
* NULL result indicates that the query is
* finished
*/
/* Move on to setting the environment options */ /* Move on to setting the environment options */
conn->setenv_state = SETENV_STATE_OPTION_SEND; conn->setenv_state = SETENV_STATE_OPTION_SEND;
} }
@ -1741,7 +1747,10 @@ PQsetenvPoll(PGconn *conn)
} }
else else
{ {
/* NULL result indicates that the query is finished */ /*
* NULL result indicates that the query is
* finished
*/
/* Send the next option */ /* Send the next option */
conn->next_eo++; conn->next_eo++;
conn->setenv_state = SETENV_STATE_OPTION_SEND; conn->setenv_state = SETENV_STATE_OPTION_SEND;