diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-10-14 17:33:08 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-10-14 17:33:08 +0000 |
| commit | 6d9d97e8ab638c05ac617c625a17a7ace7f92f41 (patch) | |
| tree | a8d9ff5ecc002e560cb8a4da9a464b31e368e3a1 /src | |
| parent | 9eada51012274383be642af472f24fb55576ce17 (diff) | |
| download | postgresql-6d9d97e8ab638c05ac617c625a17a7ace7f92f41.tar.gz postgresql-6d9d97e8ab638c05ac617c625a17a7ace7f92f41.zip | |
Restore ptmp_timeout for cases where no timeout is passed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/libpq/fe-misc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index e820ad7fc59..32b197bf6b6 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -25,7 +25,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.81 2002/10/14 17:15:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.82 2002/10/14 17:33:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -790,6 +790,7 @@ pqWaitTimed(int forRead, int forWrite, PGconn *conn, const struct timeval *timeo fd_set except_mask; struct timeval tmp_timeout; + struct timeval *ptmp_timeout = NULL; if (conn->sock < 0) { @@ -826,9 +827,10 @@ retry5: * use copy */ tmp_timeout = *timeout; + ptmp_timeout = &tmp_timeout; } if (select(conn->sock + 1, &input_mask, &output_mask, - &except_mask, &tmp_timeout) < 0) + &except_mask, ptmp_timeout) < 0) { if (SOCK_ERRNO == EINTR) goto retry5; |