aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2015-03-07 22:04:23 +0200
committerLasse Collin <lasse.collin@tukaani.org>2015-03-07 22:04:23 +0200
commit8bcca29a65335fd679c13814b70b35b68fa5daed (patch)
tree24247e4be142334dfbabdb3ce035a2527d313df6 /src
parentliblzma: Silence more uint32_t vs. size_t warnings. (diff)
downloadxz-8bcca29a65335fd679c13814b70b35b68fa5daed.tar.xz
xz: Fix a comment and silence a warning in message.c.
Diffstat (limited to 'src')
-rw-r--r--src/xz/message.c5
1 files changed, 3 insertions, 2 deletions
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)