diff options
Diffstat (limited to 'src/interfaces/libpq')
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 26 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-exec.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-misc.c | 6 |
3 files changed, 6 insertions, 32 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 6ee2716ec09..a31f34d7a98 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.235 2003/04/24 21:16:44 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.236 2003/04/25 01:24:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -956,7 +956,7 @@ retry1: /* ignore connect() failure if we have more addrs to try */ if (addr_cur->ai_next != NULL) { - close(conn->sock); + closesocket(conn->sock); conn->sock = -1; continue; } @@ -1015,11 +1015,7 @@ retry2: if (conn->Pfdebug) fprintf(conn->Pfdebug, "Postmaster reports error, attempting fallback to pre-7.0.\n"); pqsecure_close(conn); -#ifdef WIN32 closesocket(conn->sock); -#else - close(conn->sock); -#endif conn->sock = -1; conn->allow_ssl_try = FALSE; return connectDBStart(conn); @@ -1056,11 +1052,7 @@ connect_errReturn: if (conn->sock >= 0) { pqsecure_close(conn); -#ifdef WIN32 closesocket(conn->sock); -#else - close(conn->sock); -#endif conn->sock = -1; } conn->status = CONNECTION_BAD; @@ -1928,11 +1920,7 @@ freePGconn(PGconn *conn) if (conn->sock >= 0) { pqsecure_close(conn); -#ifdef WIN32 closesocket(conn->sock); -#else - close(conn->sock); -#endif } if (conn->pghost) free(conn->pghost); @@ -2003,11 +1991,7 @@ closePGconn(PGconn *conn) if (conn->sock >= 0) { pqsecure_close(conn); -#ifdef WIN32 closesocket(conn->sock); -#else - close(conn->sock); -#endif } conn->sock = -1; conn->status = CONNECTION_BAD; /* Well, not really _bad_ - just @@ -2187,11 +2171,10 @@ retry4: } /* Sent it, done */ -#ifdef WIN32 closesocket(tmpsock); +#ifdef WIN32 WSASetLastError(save_errno); #else - close(tmpsock); errno = save_errno; #endif @@ -2203,11 +2186,10 @@ cancel_errReturn: conn->errorMessage.len = strlen(conn->errorMessage.data); if (tmpsock >= 0) { -#ifdef WIN32 closesocket(tmpsock); +#ifdef WIN32 WSASetLastError(save_errno); #else - close(tmpsock); errno = save_errno; #endif } diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 3fe0ddc4920..84520987812 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.131 2003/04/24 21:16:44 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.132 2003/04/25 01:24:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1161,11 +1161,7 @@ handleSyncLoss(PGconn *conn, char id, int msgLength) id, msgLength); conn->status = CONNECTION_BAD; /* No more connection to backend */ pqsecure_close(conn); -#ifdef WIN32 closesocket(conn->sock); -#else - close(conn->sock); -#endif conn->sock = -1; } diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 76de4a87086..042ef204aba 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -23,7 +23,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.90 2003/04/22 00:08:07 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.91 2003/04/25 01:24:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -681,11 +681,7 @@ definitelyFailed: "\tbefore or while processing the request.\n")); conn->status = CONNECTION_BAD; /* No more connection to backend */ pqsecure_close(conn); -#ifdef WIN32 closesocket(conn->sock); -#else - close(conn->sock); -#endif conn->sock = -1; return -1; |