From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 17 Jul 2019 08:28:01 +0000 (+0200)
Subject: Remove the kB case from format_*_size* functions
X-Git-Tag: v4.0~894
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1dda2204e6a2c596e12ee1bcd09211cd1ad90c3;p=thirdparty%2Fccache.git

Remove the kB case from format_*_size* functions

Nobody will ever use or see non-zero kB sizes anyway, and this makes the
zero case for sizes in --show-compression nicer.
---

diff --git a/src/util.c b/src/util.c
index 34fcacdec..8fd77bf45 100644
--- a/src/util.c
+++ b/src/util.c
@@ -986,10 +986,8 @@ format_human_readable_size(uint64_t v)
 	char *s;
 	if (v >= 1000*1000*1000) {
 		s = format("%.1f GB", v/((double)(1000*1000*1000)));
-	} else if (v >= 1000*1000) {
-		s = format("%.1f MB", v/((double)(1000*1000)));
 	} else {
-		s = format("%.1f kB", v/((double)(1000)));
+		s = format("%.1f MB", v/((double)(1000*1000)));
 	}
 	return s;
 }
@@ -1003,8 +1001,6 @@ format_parsable_size_with_suffix(uint64_t size)
 		s = format("%.1fG", size / ((double)(1000*1000*1000)));
 	} else if (size >= 1000*1000) {
 		s = format("%.1fM", size / ((double)(1000*1000)));
-	} else if (size >= 1000) {
-		s = format("%.1fk", size / ((double)(1000)));
 	} else {
 		s = format("%u", (unsigned)size);
 	}
diff --git a/unittest/test_util.c b/unittest/test_util.c
index 07bd85c3b..056848ff5 100644
--- a/unittest/test_util.c
+++ b/unittest/test_util.c
@@ -125,10 +125,9 @@ TEST(subst_env_in_string)
 
 TEST(format_human_readable_size)
 {
-	CHECK_STR_EQ_FREE2("0.0 kB", format_human_readable_size(0));
-	CHECK_STR_EQ_FREE2("0.0 kB", format_human_readable_size(49));
-	CHECK_STR_EQ_FREE2("0.1 kB", format_human_readable_size(50));
-	CHECK_STR_EQ_FREE2("42.0 kB", format_human_readable_size(42 * 1000));
+	CHECK_STR_EQ_FREE2("0.0 MB", format_human_readable_size(0));
+	CHECK_STR_EQ_FREE2("0.0 MB", format_human_readable_size(49));
+	CHECK_STR_EQ_FREE2("0.4 MB", format_human_readable_size(420 * 1000));
 	CHECK_STR_EQ_FREE2("1.0 MB", format_human_readable_size(1000 * 1000));
 	CHECK_STR_EQ_FREE2("1.2 MB", format_human_readable_size(1234 * 1000));
 	CHECK_STR_EQ_FREE2("438.5 MB",
@@ -142,7 +141,7 @@ TEST(format_human_readable_size)
 TEST(format_parsable_size_with_suffix)
 {
 	CHECK_STR_EQ_FREE2("0", format_parsable_size_with_suffix(0));
-	CHECK_STR_EQ_FREE2("42.0k", format_parsable_size_with_suffix(42 * 1000));
+	CHECK_STR_EQ_FREE2("42000", format_parsable_size_with_suffix(42 * 1000));
 	CHECK_STR_EQ_FREE2("1.0M", format_parsable_size_with_suffix(1000 * 1000));
 	CHECK_STR_EQ_FREE2("1.2M", format_parsable_size_with_suffix(1234 * 1000));
 	CHECK_STR_EQ_FREE2("438.5M",