diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-11-11 11:02:02 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-11-11 11:02:02 +0100 |
| commit | cbec00d914cd3e3ee4c7e139f470431db4ea0081 (patch) | |
| tree | dd4df763c00c545b82d3a3b1bb0d9ac29b01419d | |
| parent | 0649433da53c7165f839e24e889e131e2894dd32 (diff) | |
| download | curl-cbec00d914cd3e3ee4c7e139f470431db4ea0081.tar.gz | |
Curl_pgrsUpdate: use dedicated function for time passed
| -rw-r--r-- | lib/progress.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/progress.c b/lib/progress.c index 0f67ef250..5a1a1ae9c 100644 --- a/lib/progress.c +++ b/lib/progress.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -359,9 +359,7 @@ int Curl_pgrsUpdate(struct connectdata *conn) now = Curl_tvnow(); /* what time is it */ /* The time spent so far (from the start) */ - data->progress.timespent = - (double)(now.tv_sec - data->progress.start.tv_sec) + - (double)(now.tv_usec - data->progress.start.tv_usec)/1000000.0; + data->progress.timespent = curlx_tvdiff_secs(now, data->progress.start); timespent = (curl_off_t)data->progress.timespent; /* The average download speed this far */ |