summaryrefslogtreecommitdiff
path: root/lib/socks.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-10-18 10:58:58 +0200
committerDaniel Stenberg <daniel@haxx.se>2016-10-18 11:05:45 +0200
commit8a6e89a9ebbaa79a2c4e4301774770efb3d24ef7 (patch)
treee1f5912ef215b364a0be7c0609f343070ecc6efb /lib/socks.c
parenta05906190ca6f7d6135f82595107bcabe4b75c77 (diff)
downloadcurl-8a6e89a9ebbaa79a2c4e4301774770efb3d24ef7.tar.gz
select: switch to macros in uppercase
Curl_select_ready() was the former API that was replaced with Curl_select_check() a while back and the former arg setup was provided with a define (in order to leave existing code unmodified). Now we instead offer SOCKET_READABLE and SOCKET_WRITABLE for the most common shortcuts where only one socket is checked. They're also more visibly macros.
Diffstat (limited to 'lib/socks.c')
-rw-r--r--lib/socks.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/socks.c b/lib/socks.c
index 1c01a0b93..291a2fb59 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -67,7 +67,7 @@ int Curl_blockread_all(struct connectdata *conn, /* connection data */
result = CURLE_OPERATION_TIMEDOUT;
break;
}
- if(Curl_socket_ready(sockfd, CURL_SOCKET_BAD, timeleft) <= 0) {
+ if(SOCKET_READABLE(sockfd, timeleft) <= 0) {
result = ~CURLE_OK;
break;
}
@@ -401,7 +401,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
(void)curlx_nonblock(sock, TRUE);
/* wait until socket gets connected */
- result = Curl_socket_ready(CURL_SOCKET_BAD, sock, timeout);
+ result = SOCKET_WRITABLE(sock, timeout);
if(-1 == result) {
failf(conn->data, "SOCKS5: no connection here");
@@ -442,7 +442,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
(void)curlx_nonblock(sock, TRUE);
- result = Curl_socket_ready(sock, CURL_SOCKET_BAD, timeout);
+ result = SOCKET_READABLE(sock, timeout);
if(-1 == result) {
failf(conn->data, "SOCKS5 nothing to read");