[GNUnet-SVN] [gnurl] 64/208: progress: fix "time spent", broke in adef394ac

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.

commit 64ed44a815e4ee158ea1c0a57a714f0d501ad109
Author: Daniel Stenberg <address@hidden>
AuthorDate: Sat Jun 24 01:18:21 2017 +0200

    progress: fix "time spent", broke in adef394ac
---
 lib/progress.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/progress.c b/lib/progress.c
index ccabe3c5d..dce756b7b 100644
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -361,18 +361,18 @@ int Curl_pgrsUpdate(struct connectdata *conn)
   now = Curl_tvnow(); /* what time is it */
 
   /* The time spent so far (from the start) */
-  data->progress.timespent = Curl_tvdiff_us(now, data->progress.start);
-  timespent = (curl_off_t)data->progress.timespent;
+  data->progress.timespent = Curl_tvdiff(now, data->progress.start);
+  timespent = (curl_off_t)data->progress.timespent/1000; /* integer seconds */
 
   /* The average download speed this far */
   data->progress.dlspeed = (curl_off_t)
     (data->progress.downloaded/
-     (data->progress.timespent>0?data->progress.timespent:1));
+     (timespent>0?timespent:1));
 
   /* The average upload speed this far */
   data->progress.ulspeed = (curl_off_t)
     (data->progress.uploaded/
-     (data->progress.timespent>0?data->progress.timespent:1));
+     (timespent>0?timespent:1));
 
   /* Calculations done at most once a second, unless end is reached */
   if(data->progress.lastshow != now.tv_sec) {

-- 
To stop receiving notification emails like this one, please contact
address@hidden