Commit 4f170ee8 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Curl_socket_ready: make timeout a 'long' 

It was mostly typecasted to int all over the code so switching to long
instead all over should be a net gain.
parent fba00c9f

lib/connect.c

+2 −2
Original line number Diff line number Diff line
@@ -211,8 +211,8 @@ int waitconnect(struct connectdata *conn, 
  for(;;) {



    /* now select() until we get connect or timeout */

    rc = Curl_socket_ready(CURL_SOCKET_BAD, sockfd, (int)(timeout_msec>1000?

                                                          1000:timeout_msec));

    rc = Curl_socket_ready(CURL_SOCKET_BAD, sockfd, timeout_msec>1000?

                           1000:timeout_msec);

    if(Curl_pgrsUpdate(conn))

      return WAITCONN_ABORTED;

lib/cyassl.c

+1 −2
Original line number Diff line number Diff line
@@ -490,8 +490,7 @@ cyassl_connect_common(struct connectdata *conn, 
      curl_socket_t readfd = ssl_connect_2_reading==

        connssl->connecting_state?sockfd:CURL_SOCKET_BAD;



      what = Curl_socket_ready(readfd, writefd,

                               nonblocking?0:(int)timeout_ms);

      what = Curl_socket_ready(readfd, writefd, nonblocking?0:timeout_ms);

      if(what < 0) {

        /* fatal error */

        failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);

lib/ftp.c

+2 −2
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static CURLcode AllowServerConnect(struct connectdata *conn) 
    if(timeout_ms < interval_ms)

      interval_ms = timeout_ms;



    switch (Curl_socket_ready(sock, CURL_SOCKET_BAD, (int)interval_ms)) {

    switch (Curl_socket_ready(sock, CURL_SOCKET_BAD, interval_ms)) {

    case -1: /* error */

      /* let's die here */

      failf(data, "Error while waiting for server connect");
@@ -517,7 +517,7 @@ CURLcode Curl_GetFTPResponse(ssize_t *nreadp, /* return number of bytes read */ 
       */

    }

    else {

      switch (Curl_socket_ready(sockfd, CURL_SOCKET_BAD, (int)interval_ms)) {

      switch (Curl_socket_ready(sockfd, CURL_SOCKET_BAD, interval_ms)) {

      case -1: /* select() error, stop reading */

        failf(data, "FTP response aborted due to select/poll error: %d",

              SOCKERRNO);

lib/gtls.c

+2 −2
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static CURLcode handshake(struct connectdata *conn, 


      what = Curl_socket_ready(readfd, writefd,

                               nonblocking?0:

                               ((int)timeout_ms?timeout_ms:1000));

                               timeout_ms?timeout_ms:1000);

      if(what < 0) {

        /* fatal error */

        failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);

lib/http_proxy.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn, 


        /* loop every second at least, less if the timeout is near */

        switch (Curl_socket_ready(tunnelsocket, CURL_SOCKET_BAD,

                            check<1000L?(int)check:1000)) {

                                  check<1000L?check:1000)) {

        case -1: /* select() error, stop reading */

          error = SELECT_ERROR;

          failf(data, "Proxy CONNECT aborted due to select/poll error");