From: Lasse Collin <lasse.collin@tukaani.org>
Date: Sat, 7 Mar 2015 20:04:23 +0000 (+0200)
Subject: xz: Fix a comment and silence a warning in message.c.
X-Git-Tag: v5.2.2~21
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8bcca29a65335fd679c13814b70b35b68fa5daed;p=thirdparty%2Fxz.git

xz: Fix a comment and silence a warning in message.c.
---

diff --git a/src/xz/message.c b/src/xz/message.c
index 8a31b00e..f88c1231 100644
--- a/src/xz/message.c
+++ b/src/xz/message.c
@@ -381,7 +381,7 @@ progress_speed(uint64_t uncompressed_pos, uint64_t elapsed)
 }
 
 
-/// Make a string indicating elapsed or remaining time. The format is either
+/// Make a string indicating elapsed time. The format is either
 /// M:SS or H:MM:SS depending on if the time is an hour or more.
 static const char *
 progress_time(uint64_t mseconds)
@@ -389,7 +389,8 @@ progress_time(uint64_t mseconds)
 	// 9999 hours = 416 days
 	static char buf[sizeof("9999:59:59")];
 
-	uint32_t seconds = mseconds / 1000;
+	// 32-bit variable is enough for elapsed time (136 years).
+	uint32_t seconds = (uint32_t)(mseconds / 1000);
 
 	// Don't show anything if the time is zero or ridiculously big.
 	if (seconds == 0 || seconds > ((9999 * 60) + 59) * 60 + 59)