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/hostip.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/hostip.c')
| -rw-r--r-- | lib/hostip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/hostip.c b/lib/hostip.c index 1a18a3ed7..1f988e9ac 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -688,8 +688,8 @@ clean_up: the time we spent until now! */ if(prev_alarm) { /* there was an alarm() set before us, now put it back */ - unsigned long elapsed_secs = (unsigned long) (Curl_tvdiff(Curl_tvnow(), - conn->created) / 1000); + timediff_t elapsed_secs = Curl_timediff(Curl_tvnow(), + conn->created) / 1000; /* the alarm period is counted in even number of seconds */ unsigned long alarm_set = prev_alarm - elapsed_secs; |