From: Daniel Stenberg Date: Fri, 11 Nov 2016 10:02:02 +0000 (+0100) Subject: Curl_pgrsUpdate: use dedicated function for time passed X-Git-Tag: curl-7_52_0~136 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbec00d914cd3e3ee4c7e139f470431db4ea0081;p=thirdparty%2Fcurl.git Curl_pgrsUpdate: use dedicated function for time passed --- diff --git a/lib/progress.c b/lib/progress.c index 0f67ef2505..5a1a1ae9c7 100644 --- a/lib/progress.c +++ b/lib/progress.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, , 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 */