diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2006-05-05 10:24:27 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2006-05-05 10:24:27 +0000 |
| commit | 9bece2b313ec75901410b52056adbaae8c49e508 (patch) | |
| tree | ec55ec40f428fd1f856423ad47afd0743bea9b14 | |
| parent | e85e30546c89e17b6fb0cf383de25b7ed7f3bf3d (diff) | |
additional renames of Curl_ourerrno => Curl_sockerrno
| -rw-r--r-- | lib/gtls.c | 2 | ||||
| -rw-r--r-- | lib/hostip6.c | 2 | ||||
| -rw-r--r-- | lib/select.c | 4 | ||||
| -rw-r--r-- | lib/sendf.c | 2 | ||||
| -rw-r--r-- | lib/ssluse.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/lib/gtls.c b/lib/gtls.c index 4cf78080b..dc33dc600 100644 --- a/lib/gtls.c +++ b/lib/gtls.c @@ -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; } } diff --git a/lib/hostip6.c b/lib/hostip6.c index 2168f255f..07bb37ae0 100644 --- a/lib/hostip6.c +++ b/lib/hostip6.c @@ -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 diff --git a/lib/select.c b/lib/select.c index cf5f15a8f..42a9a5c35 100644 --- a/lib/select.c +++ b/lib/select.c @@ -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; diff --git a/lib/sendf.c b/lib/sendf.c index c922ce38e..d248c189a 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -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 */ diff --git a/lib/ssluse.c b/lib/ssluse.c index ce1947bac..21346d300 100644 --- a/lib/ssluse.c +++ b/lib/ssluse.c @@ -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" |