diff options
author | Daniel Stenberg <daniel@haxx.se> | 2017-10-26 15:24:50 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2017-10-28 10:40:51 +0200 |
commit | 0d85eed3dfbbce18303900385d17f84d939cef00 (patch) | |
tree | e86f91d28fd31de4cc625fc1db9e2650f5feef11 /lib/socks.c | |
parent | 9dfc541dd7d11870d51b69c93083b805de30239f (diff) | |
download | gnurl-0d85eed3dfbbce18303900385d17f84d939cef00.tar.gz gnurl-0d85eed3dfbbce18303900385d17f84d939cef00.tar.bz2 gnurl-0d85eed3dfbbce18303900385d17f84d939cef00.zip |
Curl_timeleft: change return type to timediff_t
returning 'time_t' is problematic when that type is unsigned and we
return values less than zero to signal "already expired", used in
several places in the code.
Closes #2021
Diffstat (limited to 'lib/socks.c')
-rw-r--r-- | lib/socks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/socks.c b/lib/socks.c index e64cb98d4..ac4270eac 100644 --- a/lib/socks.c +++ b/lib/socks.c @@ -57,7 +57,7 @@ int Curl_blockread_all(struct connectdata *conn, /* connection data */ ssize_t nread; ssize_t allread = 0; int result; - time_t timeleft; + timediff_t timeleft; *n = 0; for(;;) { timeleft = Curl_timeleft(conn->data, NULL, TRUE); @@ -382,7 +382,7 @@ CURLcode Curl_SOCKS5(const char *proxy_user, CURLcode code; curl_socket_t sock = conn->sock[sockindex]; struct Curl_easy *data = conn->data; - time_t timeout; + timediff_t timeout; bool socks5_resolve_local = (conn->socks_proxy.proxytype == CURLPROXY_SOCKS5) ? TRUE : FALSE; const size_t hostname_len = strlen(hostname); |