diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-10-23 12:05:49 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-10-25 09:54:37 +0200 |
| commit | b9d25f9a6b3ca791385b80a6a3c3fa5ae113e1e0 (patch) | |
| tree | ad56d8b7a703e96e9de0ef07bacab079b7169904 /lib/telnet.c | |
| parent | 016c6a6abb525ffb9431a00a4eda6b70683f838e (diff) | |
| download | curl-b9d25f9a6b3ca791385b80a6a3c3fa5ae113e1e0.tar.gz | |
timediff: return timediff_t from the time diff functions
... to cater for systems with unsigned time_t variables.
- Renamed the functions to curlx_timediff and Curl_timediff_us.
- Added overflow protection for both of them in either direction for
both 32 bit and 64 bit time_ts
- Reprefixed the curlx_time functions to use Curl_*
Reported-by: Peter Piekarski
Fixes #2004
Closes #2005
Diffstat (limited to 'lib/telnet.c')
| -rw-r--r-- | lib/telnet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/telnet.c b/lib/telnet.c index a7bed3da1..a5f87d81d 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -1561,7 +1561,7 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done) if(data->set.timeout) { now = Curl_tvnow(); - if(Curl_tvdiff(now, conn->created) >= data->set.timeout) { + if(Curl_timediff(now, conn->created) >= data->set.timeout) { failf(data, "Time-out"); result = CURLE_OPERATION_TIMEDOUT; keepon = FALSE; @@ -1679,7 +1679,7 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done) if(data->set.timeout) { now = Curl_tvnow(); - if(Curl_tvdiff(now, conn->created) >= data->set.timeout) { + if(Curl_timediff(now, conn->created) >= data->set.timeout) { failf(data, "Time-out"); result = CURLE_OPERATION_TIMEDOUT; keepon = FALSE; |