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

ourerrno became Curl_ourerrno() and is now available to all libcurl

parent f69ea2c6

lib/connect.c

+5 −6
Original line number Diff line number Diff line
@@ -81,8 +81,7 @@ 
#include "memdebug.h"

#endif



static

int ourerrno(void)

int Curl_ourerrno(void)

{

#ifdef WIN32

  return (int)GetLastError();
@@ -350,7 +349,7 @@ int socketerror(int sockfd) 


  if( -1 == getsockopt(sockfd, SOL_SOCKET, SO_ERROR,

                       (void *)&err, &errSize))

    err = ourerrno();

    err = Curl_ourerrno();

  

  return err;

}
@@ -414,7 +413,7 @@ CURLcode Curl_is_connected(struct connectdata *conn, 
    return CURLE_COULDNT_CONNECT;

  }

  else if(1 != rc) {

    int error = ourerrno();

    int error = Curl_ourerrno();

    failf(data, "Failed connect to %s:%d, errno: %d",

          conn->hostname, conn->port, error);

    return CURLE_COULDNT_CONNECT;
@@ -526,7 +525,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ 
      rc = connect(sockfd, ai->ai_addr, ai->ai_addrlen);



      if(-1 == rc) {

        int error=ourerrno();

        int error=Curl_ourerrno();



        switch (error) {

        case EINPROGRESS:
@@ -645,7 +644,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ 
                 sizeof(serv_addr));



    if(-1 == rc) {

      int error=ourerrno();

      int error=Curl_ourerrno();



      switch (error) {

      case EINPROGRESS:

lib/connect.h

+2 −0
Original line number Diff line number Diff line
@@ -37,4 +37,6 @@ CURLcode Curl_connecthost(struct connectdata *conn, 
                          Curl_ipconnect **addr, /* the one we used */

                          bool *connected /* truly connected? */

                          );



int Curl_ourerrno(void);

#endif