Commit 8a6e89a9 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

select: switch to macros in uppercase 

Curl_select_ready() was the former API that was replaced with
Curl_select_check() a while back and the former arg setup was provided
with a define (in order to leave existing code unmodified).

Now we instead offer SOCKET_READABLE and SOCKET_WRITABLE for the most
common shortcuts where only one socket is checked. They're also more
visibly macros.
parent a0590619

lib/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ CURLcode Curl_is_connected(struct connectdata *conn, 
#endif



    /* check socket for connect */

    rc = Curl_socket_ready(CURL_SOCKET_BAD, conn->tempsock[i], 0);

    rc = SOCKET_WRITABLE(conn->tempsock[i], 0);



    if(rc == 0) { /* no connection yet */

      error = 0;

lib/ftp.c

+2 −2
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ CURLcode Curl_GetFTPResponse(ssize_t *nreadp, /* return number of bytes read */ 
       */

    }

    else {

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

      switch (SOCKET_READABLE(sockfd, interval_ms)) {

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

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

              SOCKERRNO);
@@ -3165,7 +3165,7 @@ static CURLcode ftp_multi_statemach(struct connectdata *conn, 
  struct ftp_conn *ftpc = &conn->proto.ftpc;

  CURLcode result = Curl_pp_statemach(&ftpc->pp, FALSE);



  /* Check for the state outside of the Curl_socket_ready() return code checks

  /* Check for the state outside of the Curl_socket_check() return code checks

     since at times we are in fact already in this state when this function

     gets called. */

  *done = (ftpc->state == FTP_STOP) ? TRUE : FALSE;

lib/gopher.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2016, 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
@@ -144,7 +144,7 @@ static CURLcode gopher_do(struct connectdata *conn, bool *done) 
       Wait a while for the socket to be writable. Note that this doesn't

       acknowledge the timeout.

    */

    Curl_socket_ready(CURL_SOCKET_BAD, sockfd, 100);

    SOCKET_WRITABLE(sockfd, 100);

  }



  free(sel_org);

lib/http_proxy.c

+3 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2016, 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
@@ -245,7 +245,7 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn, 
    }



    if(!blocking) {

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

      if(0 == SOCKET_READABLE(tunnelsocket, 0))

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

        return CURLE_OK;

      else {
@@ -280,8 +280,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?check:1000)) {

        switch (SOCKET_READABLE(tunnelsocket, check<1000L?check:1000)) {

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

          error = SELECT_ERROR;

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

lib/pingpong.c

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ CURLcode Curl_pp_statemach(struct pingpong *pp, bool block) 
    /* We are receiving and there is data ready in the SSL library */

    rc = 1;

  else

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

    rc = Curl_socket_check(pp->sendleft?CURL_SOCKET_BAD:sock, /* reading */

                           CURL_SOCKET_BAD,

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

                           interval_ms);