From: hniksic <devnull@localhost>
Date: Tue, 23 Sep 2003 18:39:22 +0000 (-0700)
Subject: [svn] Cosmetic change in var names.
X-Git-Tag: v1.13~1663
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=d403f7f83522ffdd7d1e267fba378c1ea4fce273

[svn] Cosmetic change in var names.
---

diff --git a/src/progress.c b/src/progress.c
index c79be386..a0689f15 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -758,10 +758,12 @@ create_image (struct bar_progress *bp, double dl_total_time)
     {
       static char *short_units[] = { "B/s", "K/s", "M/s", "G/s" };
       int units = 0;
-      long bytes = hist->total_bytes + bp->recent_bytes;
-      double tm = hist->total_time + dl_total_time - bp->recent_start;
-      double dlrate = calc_rate (bytes, tm, &units);
-      sprintf (p, " %7.2f%s", dlrate, short_units[units]);
+      /* Calculate the download speed using the history ring and
+	 recent data that hasn't made it to the ring yet.  */
+      long dlquant = hist->total_bytes + bp->recent_bytes;
+      double dltime = hist->total_time + (dl_total_time - bp->recent_start);
+      double dlspeed = calc_rate (dlquant, dltime, &units);
+      sprintf (p, " %7.2f%s", dlspeed, short_units[units]);
       p += strlen (p);
     }
   else