Commit 9bece2b3 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

additional renames of Curl_ourerrno => Curl_sockerrno

parent e85e3054

lib/gtls.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static CURLcode handshake(struct connectdata *conn, 
      }

      else {

        /* anything that gets here is fatally bad */

        failf(data, "select on SSL socket, errno: %d", Curl_ourerrno());

        failf(data, "select on SSL socket, errno: %d", Curl_sockerrno());

        return CURLE_SSL_CONNECT_ERROR;

      }

    }

lib/hostip6.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static void dump_addrinfo(struct connectdata *conn, const struct addrinfo *ai) 
    if (Curl_printable_address(ai, buf, sizeof(buf)))

      printf("%s\n", buf);

    else

      printf("failed; %s\n", Curl_strerror(conn, Curl_ourerrno()));

      printf("failed; %s\n", Curl_strerror(conn, Curl_sockerrno()));

  }

}

#else

lib/select.c

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ int Curl_select(curl_socket_t readfd, curl_socket_t writefd, int timeout_ms) 


  do {

    r = select((int)maxfd + 1, &fds_read, &fds_write, &fds_err, &timeout);

  } while((r == -1) && (Curl_ourerrno() == EINTR));

  } while((r == -1) && (Curl_sockerrno() == EINTR));



  if (r < 0)

    return -1;
@@ -237,7 +237,7 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms) 


  do {

    r = select((int)maxfd + 1, &fds_read, &fds_write, &fds_err, ptimeout);

  } while((r == -1) && (Curl_ourerrno() == EINTR));

  } while((r == -1) && (Curl_sockerrno() == EINTR));



  if (r < 0)

    return -1;

lib/sendf.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include <curl/curl.h>

#include "urldata.h"

#include "sendf.h"

#include "connect.h" /* for the Curl_ourerrno() proto */

#include "connect.h" /* for the Curl_sockerrno() proto */

#include "sslgen.h"



#define _MPRINTF_REPLACE /* use the internal *printf() functions */

lib/ssluse.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#include "url.h" /* for the ssl config check function */

#include "inet_pton.h"

#include "ssluse.h"

#include "connect.h" /* Curl_ourerrno() proto */

#include "connect.h" /* Curl_sockerrno() proto */

#include "strequal.h"

#include "select.h"

#include "sslgen.h"