Commit 1c69f134 authored by Bruce Momjian's avatar Bruce Momjian

Clean up compile warnings.

parent e1659103
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.192 2002/08/17 12:33:17 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.193 2002/08/18 00:06:01 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#include <time.h>
#include "libpq-fe.h" #include "libpq-fe.h"
#include "libpq-int.h" #include "libpq-int.h"
...@@ -1078,12 +1079,12 @@ connectDBComplete(PGconn *conn) ...@@ -1078,12 +1079,12 @@ connectDBComplete(PGconn *conn)
} }
while (NULL == rp || remains.tv_sec > 0 || remains.tv_sec == 0 && remains.tv_usec > 0) while (rp == NULL || remains.tv_sec > 0 || (remains.tv_sec == 0 && remains.tv_usec > 0))
{ {
/* /*
* If connecting timeout is set, get current time. * If connecting timeout is set, get current time.
*/ */
if ( NULL != rp && -1 == gettimeofday(&start_time, NULL)) if (rp != NULL && gettimeofday(&start_time, NULL) == -1)
{ {
conn->status = CONNECTION_BAD; conn->status = CONNECTION_BAD;
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment