generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Gisle Vanem's fixes to use CURL_SOCKET_BAD more instead of -1 for sockets.

Browse Source
This commit is contained in:
Daniel Stenberg
2004-03-11 13:13:35 +00:00
parent 326e8b9fc1
commit e545e33d5f
7 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/url.c
View File

@@ -1341,9 +1341,9 @@ CURLcode Curl_disconnect(struct connectdata *conn)
Curl_SSL_Close(conn);
/* close possibly still open sockets */
if(-1 != conn->sock[SECONDARYSOCKET])
if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET])
sclose(conn->sock[SECONDARYSOCKET]);
if(-1 != conn->sock[FIRSTSOCKET])
if(CURL_SOCKET_BAD != conn->sock[FIRSTSOCKET])
sclose(conn->sock[FIRSTSOCKET]);
Curl_safefree(conn->user);
@@ -2022,8 +2022,8 @@ static CURLcode CreateConnection(struct SessionHandle *data,
/* and we setup a few fields in case we end up actually using this struct */
conn->data = data; /* remember our daddy */
conn->sock[FIRSTSOCKET] = -1; /* no file descriptor */
conn->sock[SECONDARYSOCKET] = -1; /* no file descriptor */
conn->sock[FIRSTSOCKET] = CURL_SOCKET_BAD; /* no file descriptor */
conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD; /* no file descriptor */
conn->connectindex = -1; /* no index */
conn->bits.httpproxy = (data->change.proxy && *data->change.proxy &&
(data->set.proxytype == CURLPROXY_HTTP))?
@@ -3164,7 +3164,7 @@ static CURLcode SetupConnection(struct connectdata *conn,
conn->bytecount = 0;
conn->headerbytecount = 0;
if(-1 == conn->sock[FIRSTSOCKET]) {
if(CURL_SOCKET_BAD == conn->sock[FIRSTSOCKET]) {
bool connected;
/* Connect only if not already connected! */