Commit fdeaae67 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

SM's patch applied, we should not use arguments or variables that have the 

same name as common functions...
parent f30102f0

lib/connect.c

+9 −7
Original line number Diff line number Diff line
@@ -308,8 +308,9 @@ static CURLcode bindlocal(struct connectdata *conn, 


  return CURLE_HTTP_PORT_FAILED;

}

#endif /* end of ipv4-specific section */

#else /* end of ipv4-specific section */



/* we only use socketerror() on IPv6-enabled machines */

static

int socketerror(int sockfd)

{
@@ -322,6 +323,7 @@ int socketerror(int sockfd) 
  

  return err;

}

#endif



/*

 * TCP connect to the given host with timeout, proxy or remote doesn't matter.
@@ -332,7 +334,7 @@ int socketerror(int sockfd) 
CURLcode Curl_connecthost(struct connectdata *conn,  /* context */

                          Curl_addrinfo *remotehost, /* use one in here */

                          int port,                  /* connect to this */

                          int *socket,           /* the connected socket */

                          int *sockconn,             /* the connected socket */

                          Curl_ipconnect **addr)     /* the one we used */

{

  struct SessionHandle *data = conn->data;
@@ -531,7 +533,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ 
  if(-1 == rc) {

    /* no good connect was made */

    sclose(sockfd);

    *socket = -1;

    *sockconn = -1;

    return CURLE_COULDNT_CONNECT;

  }
@@ -544,8 +546,8 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ 
#endif



  /* allow NULL-pointers to get passed in */

  if(socket)

    *socket = sockfd;    /* the socket descriptor we've connected */

  if(sockconn)

    *sockconn = sockfd;    /* the socket descriptor we've connected */



  return CURLE_OK;

}

lib/connect.h

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

                          Curl_addrinfo *host, /* connect to this */

                          long port,      /* connect to this port number */

                          int *socket,  /* not set if error is returned */

                          int *sockconn,  /* not set if error is returned */

                          Curl_ipconnect **addr /* the one we used */

                          ); /*  index we used */

#endif