Commit 7225b140 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

curl_socket_t mistakes cleanup

parent 85838a89

lib/http.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn, 
  fd_set readfd;

  char *line_start;

  char *host_port;

  int tunnelsocket = conn->sock[sockindex];

  curl_socket_t tunnelsocket = conn->sock[sockindex];



#define SELECT_OK      0

#define SELECT_ERROR   1

lib/multi.c

+2 −2
Original line number Diff line number Diff line
@@ -279,8 +279,8 @@ CURLMcode curl_multi_fdset(CURLM *multi_handle, 
          FD_SET(sockfd, write_fd_set);

        }



        if(sockfd > *max_fd)

          *max_fd = sockfd;

        if((int)sockfd > *max_fd)

          *max_fd = (int)sockfd;

      }

      break;

    case CURLM_STATE_PERFORM:

lib/sendf.h

+4 −2
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
 * $Id$

 ***************************************************************************/



CURLcode Curl_sendf(int fd, struct connectdata *, const char *fmt, ...);

CURLcode Curl_sendf(curl_socket_t sockfd, struct connectdata *,

                    const char *fmt, ...);

void Curl_infof(struct SessionHandle *, const char *fmt, ...);

void Curl_failf(struct SessionHandle *, const char *fmt, ...);
@@ -42,7 +43,8 @@ int Curl_read(struct connectdata *conn, curl_socket_t sockfd, 
              char *buf, size_t buffersize,

              ssize_t *n);

/* internal write-function, does plain socket, SSL and krb4 */

CURLcode Curl_write(struct connectdata *conn, int sockfd,

CURLcode Curl_write(struct connectdata *conn,

                    curl_socket_t sockfd,

                    void *mem, size_t len,

                    ssize_t *written);

lib/ssluse.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 * $Id$

 ***************************************************************************/

#include "urldata.h"

CURLcode Curl_SSLConnect(struct connectdata *conn, curl_socket_t sockfd);

CURLcode Curl_SSLConnect(struct connectdata *conn, int sockindex);



void Curl_SSL_init(void);    /* Global SSL init */

void Curl_SSL_cleanup(void); /* Global SSL cleanup */

lib/transfer.c

+4 −1
Original line number Diff line number Diff line
@@ -1368,7 +1368,10 @@ void Curl_single_fdset(struct connectdata *conn, 
  }

  if(conn->keep.keepon & KEEP_WRITE) {

    FD_SET(conn->writesockfd, write_fd_set);

    if(conn->writesockfd > *max_fd)



    /* since sockets are curl_socket_t nowadays, we typecast it to int here

       to compare it nicely */

    if((int)conn->writesockfd > *max_fd)

      *max_fd = conn->writesockfd;

    conn->keep.writefdp = write_fd_set; /* store the address of the set */

  }