Commit d85bc181 authored by Gisle Vanem's avatar Gisle Vanem
Browse files

I changed my mind. Remove ioctl() macro in setup.h instead.

parent f0e66d8c

lib/setup.h

+0 −1
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ defined(HAVE_LIBSSL) && defined(HAVE_LIBCRYPTO) 
#define sread(x,y,z)      read_s(x,y,z)

#define swrite(x,y,z)     write_s(x,y,z)

#define select(n,r,w,x,t) select_s(n,r,w,x,t)

#define ioctl(x,y,z) ioctlsocket(x,y,(char *)(z))

#define IOCTL_3_ARGS

#include <tcp.h>

#ifdef word

lib/transfer.c

+6 −6
Original line number Diff line number Diff line
@@ -211,16 +211,16 @@ CURLcode Curl_readrewind(struct connectdata *conn) 
     (data->set.httpreq == HTTPREQ_POST_FORM))

    ; /* do nothing */

  else {

    if(data->set.ioctrl) {

    if(data->set.ioctl) {

      curlioerr err;



      err = data->set.ioctrl(data, CURLIOCMD_RESTARTREAD,

                             data->set.ioctrl_client);

      infof(data, "the ioctrl callback returned %d\n", (int)err);

      err = data->set.ioctl(data, CURLIOCMD_RESTARTREAD,

                            data->set.ioctl_client);

      infof(data, "the ioctl callback returned %d\n", (int)err);



      if(err) {

        /* FIXME: convert to a human readable error message */

        failf(data, "ioctrl callback returned error %d\n", (int)err);

        failf(data, "ioctl callback returned error %d\n", (int)err);

        return CURLE_SEND_FAIL_REWIND;

      }

    }

lib/url.c

+2 −2
Original line number Diff line number Diff line
@@ -1105,13 +1105,13 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...) 
    /*

     * I/O control callback. Might be NULL.

     */

    data->set.ioctrl = va_arg(param, curl_ioctl_callback);

    data->set.ioctl = va_arg(param, curl_ioctl_callback);

    break;

  case CURLOPT_IOCTLDATA:

    /*

     * I/O control data pointer. Might be NULL.

     */

    data->set.ioctrl_client = va_arg(param, void *);

    data->set.ioctl_client = va_arg(param, void *);

    break;

  case CURLOPT_SSLCERT:

    /*

lib/urldata.h

+2 −2
Original line number Diff line number Diff line
@@ -847,9 +847,9 @@ struct UserDefined { 
  curl_read_callback fread;          /* function that reads the input */

  curl_progress_callback fprogress;  /* function for progress information */

  curl_debug_callback fdebug;      /* function that write informational data */

  curl_ioctl_callback ioctrl;      /* function for I/O control */

  curl_ioctl_callback ioctl;       /* function for I/O control */

  void *progress_client; /* pointer to pass to the progress callback */

  void *ioctrl_client;  /* pointer to pass to the ioctrl callback */

  void *ioctl_client;   /* pointer to pass to the ioctl callback */

  long timeout;         /* in seconds, 0 means no timeout */

  long connecttimeout;  /* in seconds, 0 means no timeout */

  long ftp_response_timeout; /* in seconds, 0 means no timeout */