Commit fba4cd0e authored by Yang Tse's avatar Yang Tse
Browse files

Internal function Curl_select() renamed to Curl_socket_ready()

parent 2166645c

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 


                                  Changelog



Yang Tse (20 March 2007)

- Internal function Curl_select() renamed to Curl_socket_ready()



Daniel S (25 March 2007)

- Daniel Johnson fixed multi code to traverse the easy handle list properly.

  A left-over bug from the February 21 fix.

lib/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ int waitconnect(curl_socket_t sockfd, /* socket */ 
#endif



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

  rc = Curl_select(CURL_SOCKET_BAD, sockfd, (int)timeout_msec);

  rc = Curl_socket_ready(CURL_SOCKET_BAD, sockfd, (int)timeout_msec);

  if(-1 == rc)

    /* error, no connect here, try next */

    return WAITCONN_SELECT_ERROR;

lib/ftp.c

+4 −4
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static CURLcode AllowServerConnect(struct connectdata *conn) 
     Note the typecast here. */

  timeout_ms = (timeout?(int)timeout:60000);



  switch (Curl_select(sock, CURL_SOCKET_BAD, timeout_ms)) {

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

  case -1: /* error */

    /* let's die here */

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

        interval_ms = timeout;



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

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

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

        result = CURLE_RECV_ERROR;

        failf(data, "FTP response aborted due to select() error: %d",
@@ -2808,7 +2808,7 @@ CURLcode Curl_ftp_multi_statemach(struct connectdata *conn, 
    return CURLE_OPERATION_TIMEDOUT;

  }



  rc = Curl_select(ftpc->sendleft?CURL_SOCKET_BAD:sock, /* reading */

  rc = Curl_socket_ready(ftpc->sendleft?CURL_SOCKET_BAD:sock, /* reading */

                   ftpc->sendleft?sock:CURL_SOCKET_BAD, /* writing */

                   0);
@@ -2841,7 +2841,7 @@ static CURLcode ftp_easy_statemach(struct connectdata *conn) 
      return CURLE_OPERATION_TIMEDOUT; /* already too little time */

    }



    rc = Curl_select(ftpc->sendleft?CURL_SOCKET_BAD:sock, /* reading */

    rc = Curl_socket_ready(ftpc->sendleft?CURL_SOCKET_BAD:sock, /* reading */

                     ftpc->sendleft?sock:CURL_SOCKET_BAD, /* writing */

                     (int)timeout_ms);

lib/gtls.c

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static CURLcode handshake(struct connectdata *conn, 
        return CURLE_OPERATION_TIMEOUTED;

      }



      rc = Curl_select(conn->sock[sockindex],

      rc = Curl_socket_ready(conn->sock[sockindex],

                       conn->sock[sockindex], (int)timeout_ms);

      if(rc > 0)

        /* reabable or writable, go loop*/
@@ -535,7 +535,7 @@ int Curl_gtls_shutdown(struct connectdata *conn, int sockindex) 


  if(conn->ssl[sockindex].session) {

    while(!done) {

      int what = Curl_select(conn->sock[sockindex],

      int what = Curl_socket_ready(conn->sock[sockindex],

                             CURL_SOCKET_BAD, SSL_SHUTDOWN_TIMEOUT);

      if(what > 0) {

        /* Something to read, let's do it and hope that it is the close

lib/http.c

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


    /* if we're in multi-mode and we would block, return instead for a retry */

    if (Curl_if_multi == data->state.used_interface) {

      if (0 == Curl_select(tunnelsocket, CURL_SOCKET_BAD, 0))

      if (0 == Curl_socket_ready(tunnelsocket, CURL_SOCKET_BAD, 0))

        /* return so we'll be called again polling-style */

        return CURLE_OK;

      else {
@@ -1273,7 +1273,7 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn, 
        }



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

        switch (Curl_select(tunnelsocket, CURL_SOCKET_BAD,

        switch (Curl_socket_ready(tunnelsocket, CURL_SOCKET_BAD,

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

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

          error = SELECT_ERROR;