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.

diff --git a/lib/connect.c b/lib/connect.c
index 369ba053e5dcb85baafcfa115c89be058a2fc1a9..6d657eb5e6584f44ceef545d9fff68080fe70082 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -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;
 

diff --git a/lib/cyassl.c b/lib/cyassl.c
index 8fdbc33b17219cd88121899227f021635997faaf..81bcabaa13343f4de3b591fe2eed168af9bb7ee0 100644 (file)
--- a/lib/cyassl.c
+++ b/lib/cyassl.c
@@ -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);

diff --git a/lib/ftp.c b/lib/ftp.c
index e9cca1b15e4c036dafa7877352e4d761cba4dc68..d758301f5b5f7ff42b2bcb9c622d3022168b9c37 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -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);

diff --git a/lib/gtls.c b/lib/gtls.c
index bb2ee10689cc6a3d02f85b3991586fa9c1da3962..a376fb0b96bbfe36c2cae38cd7dcc1b6e199e402 100644 (file)
--- a/lib/gtls.c
+++ b/lib/gtls.c
@@ -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);
@@ -907,7 +907,7 @@ int Curl_gtls_shutdown(struct connectdata *conn, int sockindex)
   if(conn->ssl[sockindex].session) {
     while(!done) {
       int what = Curl_socket_ready(conn->sock[sockindex],
-                             CURL_SOCKET_BAD, SSL_SHUTDOWN_TIMEOUT);
+                                   CURL_SOCKET_BAD, SSL_SHUTDOWN_TIMEOUT);
       if(what > 0) {
         /* Something to read, let's do it and hope that it is the close
            notify alert from the server */

diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index 08ca1006fe17d6126da18119ea5e582394ddc45c..9fa832e4d0b0cf715c217ead71aed6b172a62126 100644 (file)
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -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");

diff --git a/lib/pingpong.c b/lib/pingpong.c
index 8f026676088f6231e9d69a2ffdfaca88e737aa9b..23ab69fb214d83ca4fb01f7089012ef122a20d79 100644 (file)
--- a/lib/pingpong.c
+++ b/lib/pingpong.c
@@ -138,7 +138,7 @@ CURLcode Curl_pp_easy_statemach(struct pingpong *pp)
 
   rc = Curl_socket_ready(pp->sendleft?CURL_SOCKET_BAD:sock, /* reading */
                          pp->sendleft?sock:CURL_SOCKET_BAD, /* writing */
-                         (int)interval_ms);
+                         interval_ms);
 
   if(Curl_pgrsUpdate(conn))
     result = CURLE_ABORTED_BY_CALLBACK;

diff --git a/lib/polarssl.c b/lib/polarssl.c
index 370b8c64c23189686bf7e47d820327b0fec20f82..2e70a28d52453407a20ea8c48093632db80bd517 100644 (file)
--- a/lib/polarssl.c
+++ b/lib/polarssl.c
@@ -238,7 +238,7 @@ Curl_polarssl_connect(struct connectdata *conn,
       }
 
       switch(Curl_socket_ready(conn->sock[sockindex],
-                        CURL_SOCKET_BAD, timeout_ms)) {
+                               CURL_SOCKET_BAD, timeout_ms)) {
       case 0:
         failf(data, "SSL handshake timeout");
         return CURLE_OPERATION_TIMEDOUT;

diff --git a/lib/select.c b/lib/select.c
index 86af1dda924a53137c82069f21a4109bf4bdee35..35053938435418ebbef7d21b0cdbc7401cf48780 100644 (file)
--- a/lib/select.c
+++ b/lib/select.c
@@ -160,7 +160,7 @@ static int wait_ms(int timeout_ms)
  *    CURL_CSELECT_IN | CURL_CSELECT_OUT | CURL_CSELECT_ERR
  */
 int Curl_socket_ready(curl_socket_t readfd, curl_socket_t writefd,
-                      int timeout_ms)
+                      long timeout_ms)
 {
 #ifdef HAVE_POLL_FINE
   struct pollfd pfd[2];

diff --git a/lib/select.h b/lib/select.h
index e431e5f07be23fbf0947e31f74d0a62c943f2304..e012c63f3b7c52ea40e1a01f54d106856bd8cb45 100644 (file)
--- a/lib/select.h
+++ b/lib/select.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -85,7 +85,7 @@ struct pollfd
 #endif
 
 int Curl_socket_ready(curl_socket_t readfd, curl_socket_t writefd,
-                      int timeout_ms);
+                      long timeout_ms);
 
 int Curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms);
 

diff --git a/lib/socks.c b/lib/socks.c
index bbd2b447e2955a9dc20c9c9be0fa4a2c1ceb889a..82293019baf1229e041792caac2b9fd50adcf94d 100644 (file)
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -81,7 +81,7 @@ int Curl_blockread_all(struct connectdata *conn, /* connection data */
       break;
     }
     if(Curl_socket_ready(sockfd, CURL_SOCKET_BAD,
-                   (int)(conn_timeout - conntime)) <= 0) {
+                         conn_timeout - conntime) <= 0) {
       result = ~CURLE_OK;
       break;
     }
@@ -409,7 +409,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
   curlx_nonblock(sock, TRUE);
 
   /* wait until socket gets connected */
-  result = Curl_socket_ready(CURL_SOCKET_BAD, sock, (int)timeout);
+  result = Curl_socket_ready(CURL_SOCKET_BAD, sock, timeout);
 
   if(-1 == result) {
     failf(conn->data, "SOCKS5: no connection here");
@@ -448,7 +448,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
 
   curlx_nonblock(sock, TRUE);
 
-  result = Curl_socket_ready(sock, CURL_SOCKET_BAD, (int)timeout);
+  result = Curl_socket_ready(sock, CURL_SOCKET_BAD, timeout);
 
   if(-1 == result) {
     failf(conn->data, "SOCKS5 nothing to read");

diff --git a/lib/ssh.c b/lib/ssh.c
index bc05de69d69c7d048f74a2b708526ce5f9f03ff2..1c14b34d5602a22b222c8298ab4b7b1066a83e15 100644 (file)
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -2548,7 +2548,7 @@ static CURLcode ssh_easy_statemach(struct connectdata *conn,
         fd_write = sock;
       /* wait for the socket to become ready */
       Curl_socket_ready(fd_read, fd_write,
-                        (int)(left>1000?1000:left)); /* ignore result */
+                        left>1000?1000:left); /* ignore result */
     }
 #endif
 

diff --git a/lib/ssluse.c b/lib/ssluse.c
index 67fd99a38ea251a3c7bd89432923211f721daade..5bdc536a334339cb192b710345c16f759fe36966 100644 (file)
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -881,7 +881,7 @@ int Curl_ossl_shutdown(struct connectdata *conn, int sockindex)
     buffsize = (int)sizeof(buf);
     while(!done) {
       int what = Curl_socket_ready(conn->sock[sockindex],
-                             CURL_SOCKET_BAD, SSL_SHUTDOWN_TIMEOUT);
+                                   CURL_SOCKET_BAD, SSL_SHUTDOWN_TIMEOUT);
       if(what > 0) {
         ERR_clear_error();
 
@@ -2477,8 +2477,7 @@ ossl_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);

diff --git a/lib/tftp.c b/lib/tftp.c
index 6612389870eff61e30a5a86df07c0c2a93490ace..46b3ecfcb32556785c19658c70ec14279f64ff07 100644 (file)
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -1255,7 +1255,7 @@ static CURLcode tftp_easy_statemach(struct connectdata *conn)
 
 
     /* Wait until ready to read or timeout occurs */
-    rc = Curl_socket_ready(fd_read, CURL_SOCKET_BAD, (int)(timeout_ms));
+    rc = Curl_socket_ready(fd_read, CURL_SOCKET_BAD, timeout_ms);
 
     k->now = Curl_tvnow();
 

diff --git a/lib/transfer.c b/lib/transfer.c
index 59d4792fd67eb904eff27d9eee1dffdeadb67ca2..c82fb3594e1958bfaa2a08c399d1c34c8f4e44dd 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -1282,9 +1282,9 @@ Transfer(struct connectdata *conn)
   struct SingleRequest *k = &data->req;
   bool done=FALSE;
   bool first=TRUE;
-  int timeout_ms;
+  long timeout_ms;
   int buffersize;
-  int totmp;
+  long totmp;
 
   if((conn->sockfd == CURL_SOCKET_BAD) &&
      (conn->writesockfd == CURL_SOCKET_BAD))
@@ -1322,8 +1322,8 @@ Transfer(struct connectdata *conn)
         /* calculate upload rate-limitation timeout. */
         buffersize = (int)(data->set.buffer_size ?
                            data->set.buffer_size : BUFSIZE);
-        totmp = (int)Curl_sleep_time(data->set.max_send_speed,
-                                     data->progress.ulspeed, buffersize);
+        totmp = Curl_sleep_time(data->set.max_send_speed,
+                                data->progress.ulspeed, buffersize);
         if(totmp < timeout_ms)
           timeout_ms = totmp;
       }
@@ -1343,8 +1343,8 @@ Transfer(struct connectdata *conn)
         /* Calculate download rate-limitation timeout. */
         buffersize = (int)(data->set.buffer_size ?
                            data->set.buffer_size : BUFSIZE);
-        totmp = (int)Curl_sleep_time(data->set.max_recv_speed,
-                                     data->progress.dlspeed, buffersize);
+        totmp = Curl_sleep_time(data->set.max_recv_speed,
+                                data->progress.dlspeed, buffersize);
         if(totmp < timeout_ms)
           timeout_ms = totmp;
       }