From: Lasse Collin <lasse.collin@tukaani.org>
Date: Mon, 28 May 2012 12:37:43 +0000 (+0300)
Subject: xz: Don't show a huge number in -vv when memory limit is disabled.
X-Git-Tag: upstream/5.1.3~93
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7769ea051d739a38a1640fd448cf5eb83cb119c6;p=platform%2Fupstream%2Fxz.git

xz: Don't show a huge number in -vv when memory limit is disabled.
---

diff --git a/src/xz/message.c b/src/xz/message.c
index e559199..2b6ac5f 100644
--- a/src/xz/message.c
+++ b/src/xz/message.c
@@ -859,6 +859,17 @@ message_mem_needed(enum message_verbosity v, uint64_t memusage)
 	// the user might need to +1 MiB to get high enough limit.)
 	memusage = round_up_to_mib(memusage);
 
+	uint64_t memlimit = hardware_memlimit_get(opt_mode);
+
+	// Handle the case when there is no memory usage limit.
+	// This way we don't print a weird message with a huge number.
+	if (memlimit == UINT64_MAX) {
+		message(v, _("%s MiB of memory is required. "
+				"The limiter is disabled."),
+				uint64_to_str(memusage, 0));
+		return;
+	}
+
 	// With US-ASCII:
 	// 2^64 with thousand separators + " MiB" suffix + '\0' = 26 + 4 + 1
 	// But there may be multibyte chars so reserve enough space.
@@ -867,7 +878,6 @@ message_mem_needed(enum message_verbosity v, uint64_t memusage)
 	// Show the memory usage limit as MiB unless it is less than 1 MiB.
 	// This way it's easy to notice errors where one has typed
 	// --memory=123 instead of --memory=123MiB.
-	uint64_t memlimit = hardware_memlimit_get(opt_mode);
 	if (memlimit < (UINT32_C(1) << 20)) {
 		snprintf(memlimitstr, sizeof(memlimitstr), "%s B",
 				uint64_to_str(memlimit, 1));