moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

Compiler warning fix

Browse Source
This commit is contained in:
Yang Tse 2006-10-27 02:18:29 +00:00
parent 32ad212ac9
commit 8a7514de8a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/socks.c
View File

@ -71,25 +71,29 @@ static int blockread_all(struct connectdata *conn, /* connection data */
conntime = Curl_tvdiff(tvnow, conn->created); conntime = Curl_tvdiff(tvnow, conn->created);
if(conntime > conn_timeout) { if(conntime > conn_timeout) {
/* we already got the timeout */ /* we already got the timeout */
return -1; result = ~CURLE_OK;
break;
} }
if(Curl_select(sockfd, CURL_SOCKET_BAD, if(Curl_select(sockfd, CURL_SOCKET_BAD,
(int)(conn_timeout - conntime)) <= 0) { (int)(conn_timeout - conntime)) <= 0) {
return -1; result = ~CURLE_OK;
break;
} }
result = Curl_read(conn, sockfd, buf, buffersize, &nread); result = Curl_read(conn, sockfd, buf, buffersize, &nread);
if(result) if(result)
return result; break;
if(buffersize == nread) { if(buffersize == nread) {
allread += nread; allread += nread;
*n = allread; *n = allread;
return CURLE_OK; result = CURLE_OK;
break;
} }
buffersize -= nread; buffersize -= nread;
buf += nread; buf += nread;
allread += nread; allread += nread;
} while(1); } while(1);
return result;
} }
/* /*