Commit 64ed44a8 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

progress: fix "time spent", broke in adef394a

parent 924cd3e2

lib/progress.c

+4 −4
Original line number Diff line number Diff line
@@ -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) {