From: Björn Stenberg Date: Tue, 5 Nov 2013 22:57:22 +0000 (+0100) Subject: url.c: Remove superfluous for loop X-Git-Tag: curl-7_34_0~135 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ea05be46d5901e449a79f95f9df31ff67c43fe1;p=thirdparty%2Fcurl.git url.c: Remove superfluous for loop The reason for this loop's existence was removed in commit 02fbc26d59c591. --- diff --git a/lib/url.c b/lib/url.c index b069375a7f..9526cdcc11 100644 --- a/lib/url.c +++ b/lib/url.c @@ -5559,25 +5559,19 @@ CURLcode Curl_setup_conn(struct connectdata *conn, is later set again for the progress meter purpose */ conn->now = Curl_tvnow(); - for(;;) { - /* loop for CURL_SERVER_CLOSED_CONNECTION */ - - if(CURL_SOCKET_BAD == conn->sock[FIRSTSOCKET]) { - conn->bits.tcpconnect[FIRSTSOCKET] = FALSE; - result = Curl_connecthost(conn, conn->dns_entry); - if(CURLE_OK != result) - return result; - } - else { - Curl_pgrsTime(data, TIMER_CONNECT); /* we're connected already */ - Curl_pgrsTime(data, TIMER_APPCONNECT); /* we're connected already */ - conn->bits.tcpconnect[FIRSTSOCKET] = TRUE; - *protocol_done = TRUE; - Curl_updateconninfo(conn, conn->sock[FIRSTSOCKET]); - Curl_verboseconnect(conn); - } - /* Stop the loop now */ - break; + if(CURL_SOCKET_BAD == conn->sock[FIRSTSOCKET]) { + conn->bits.tcpconnect[FIRSTSOCKET] = FALSE; + result = Curl_connecthost(conn, conn->dns_entry); + if(CURLE_OK != result) + return result; + } + else { + Curl_pgrsTime(data, TIMER_CONNECT); /* we're connected already */ + Curl_pgrsTime(data, TIMER_APPCONNECT); /* we're connected already */ + conn->bits.tcpconnect[FIRSTSOCKET] = TRUE; + *protocol_done = TRUE; + Curl_updateconninfo(conn, conn->sock[FIRSTSOCKET]); + Curl_verboseconnect(conn); } conn->now = Curl_tvnow(); /* time this *after* the connect is done, we