[svn] Switch to days when printing more than 48h rather than 100h.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7d782ced95439c5da7196d190627161de6574b25..48d12c3a1de4e55e001df68ea3f9dfa483a72722 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-11  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * progress.c (eta_to_human_short): Switch to days when printing
+       more than 48h rather than 100h.  (It's not immediately apparent
+       how many days there are in 83h.)
+
 2005-08-11  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * cmpt.c (strtoll): Define it if missing on the system and if Wget

diff --git a/src/progress.c b/src/progress.c
index f25ca6b606d366864be64f0f7df1ce3ba38ded7e..05a6c26f46d19ce40221efe6acff8675c7ded521 100644 (file)
--- a/src/progress.c
+++ b/src/progress.c
@@ -1051,7 +1051,7 @@ eta_to_human_short (int secs, bool condensed)
     sprintf (buf, "%ds", secs);
   else if (secs < 100 * 60)
     sprintf (buf, "%dm%s%ds", secs / 60, space, secs % 60);
-  else if (secs < 100 * 3600)
+  else if (secs < 48 * 3600)
     sprintf (buf, "%dh%s%dm", secs / 3600, space, (secs / 60) % 60);
   else if (secs < 100 * 86400)
     sprintf (buf, "%dd%s%dh", secs / 86400, space, (secs / 3600) % 60);