From: Bruce Momjian Date: Mon, 14 Oct 2002 17:33:08 +0000 (+0000) Subject: Restore ptmp_timeout for cases where no timeout is passed. X-Git-Tag: REL7_3~291 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d9d97e8ab638c05ac617c625a17a7ace7f92f41;p=postgresql Restore ptmp_timeout for cases where no timeout is passed. --- diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index e820ad7fc5..32b197bf6b 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;