From 00fc1211ae7b687ac912098f4479112059deccbd Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Sun, 7 Mar 2010 13:50:23 +0200 Subject: Consistently round up the memory usage limit in messages. It still feels a bit wrong to round 1 byte to 1 MiB but at least it is now done consistently so that the same byte value is always rounded the same way to MiB. --- src/xz/message.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/xz') diff --git a/src/xz/message.c b/src/xz/message.c index 88efb0c0..5dd9bc37 100644 --- a/src/xz/message.c +++ b/src/xz/message.c @@ -1016,7 +1016,8 @@ message_memlimit(void) printf("%" PRIu64 "\n", hardware_memlimit_get()); else printf(_("%s MiB (%s bytes)\n"), - uint64_to_str(hardware_memlimit_get() >> 20, 0), + uint64_to_str( + round_up_to_mib(hardware_memlimit_get()), 0), uint64_to_str(hardware_memlimit_get(), 1)); tuklib_exit(E_SUCCESS, E_ERROR, verbosity != V_SILENT); @@ -1180,7 +1181,7 @@ message_help(bool long_help) if (long_help) { printf(_( "On this system and configuration, this program will use a maximum of roughly\n" -"%s MiB RAM and "), uint64_to_str(hardware_memlimit_get() / (1024 * 1024), 0)); +"%s MiB RAM and "), uint64_to_str(round_up_to_mib(hardware_memlimit_get()), 0)); printf(N_("one thread.\n\n", "%s threads.\n\n", hardware_threadlimit_get()), uint64_to_str(hardware_threadlimit_get(), 0)); -- cgit v1.2.3