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

fix compiler warning: end-of-loop code not reached

Browse Source
This commit is contained in:
Yang Tse 2009-09-25 13:05:36 +00:00
parent 37489a855f
commit c7c84e7420
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/ssluse.c
View File

@ -2300,6 +2300,7 @@ ossl_connect_common(struct connectdata *conn,
struct ssl_connect_data *connssl = &conn->ssl[sockindex]; struct ssl_connect_data *connssl = &conn->ssl[sockindex];
curl_socket_t sockfd = conn->sock[sockindex]; curl_socket_t sockfd = conn->sock[sockindex];
long timeout_ms; long timeout_ms;
int what;
if(ssl_connect_1==connssl->connecting_state) { if(ssl_connect_1==connssl->connecting_state) {
/* Find out how much more time we're allowed */ /* Find out how much more time we're allowed */
@ -2337,32 +2338,27 @@ ossl_connect_common(struct connectdata *conn,
curl_socket_t readfd = ssl_connect_2_reading== curl_socket_t readfd = ssl_connect_2_reading==
connssl->connecting_state?sockfd:CURL_SOCKET_BAD; connssl->connecting_state?sockfd:CURL_SOCKET_BAD;
while(1) { what = Curl_socket_ready(readfd, writefd,
int what = Curl_socket_ready(readfd, writefd, nonblocking?0:(int)timeout_ms);
nonblocking?0:(int)timeout_ms); if(what < 0) {
if(what > 0) /* fatal error */
/* readable or writable, go loop in the outer loop */ failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);
break; return CURLE_SSL_CONNECT_ERROR;
else if(0 == what) { }
if(nonblocking) { else if(0 == what) {
*done = FALSE; if(nonblocking) {
return CURLE_OK; *done = FALSE;
} return CURLE_OK;
else {
/* timeout */
failf(data, "SSL connection timeout");
return CURLE_OPERATION_TIMEDOUT;
}
} }
else { else {
/* anything that gets here is fatally bad */ /* timeout */
failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO); failf(data, "SSL connection timeout");
return CURLE_SSL_CONNECT_ERROR; return CURLE_OPERATION_TIMEDOUT;
} }
} /* while()-loop for the select() */ }
/* socket is readable or writable */
} }
/* get the timeout from step2 to avoid computing it twice. */
retcode = ossl_connect_step2(conn, sockindex); retcode = ossl_connect_step2(conn, sockindex);
if(retcode) if(retcode)
return retcode; return retcode;