diff options
author | Bruce Momjian <bruce@momjian.us> | 2002-08-27 15:02:50 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2002-08-27 15:02:50 +0000 |
commit | 840deabfe01ddea7c68fe6e8c25ea1faf382474b (patch) | |
tree | 933164d6f5fddd1dffd0b420793bdc5ded115e13 /src | |
parent | 4e723e6717567116bb7b37ea3e60c78e6a782300 (diff) | |
download | postgresql-840deabfe01ddea7c68fe6e8c25ea1faf382474b.tar.gz postgresql-840deabfe01ddea7c68fe6e8c25ea1faf382474b.zip |
More connection timeout cleanups.
Diffstat (limited to 'src')
-rw-r--r-- | src/interfaces/libpq/fe-connect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 5ab095e101d..57123c5bd04 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.195 2002/08/27 14:49:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.196 2002/08/27 15:02:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1078,7 +1078,7 @@ connectDBComplete(PGconn *conn) rp = &remains; } - while (rp == NULL || remains.tv_sec > 0 || (remains.tv_sec == 0 && remains.tv_usec > 0)) + while (rp == NULL || remains.tv_sec > 0 || remains.tv_usec > 0) { /* * If connecting timeout is set, get current time. @@ -1111,7 +1111,7 @@ connectDBComplete(PGconn *conn) break; case PGRES_POLLING_WRITING: - if (pqWaitTimed(0, 1, conn, rp)) + if (pqWaitTimed(0, 1, conn, rp)) { conn->status = CONNECTION_BAD; return 0; @@ -1347,7 +1347,7 @@ keep_going: /* We will come back to here until there if (pqGetc(&beresp, conn)) { - /* We'll come back when there are more data */ + /* We'll come back when there is more data */ return PGRES_POLLING_READING; } |