From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 3 Dec 2014 21:14:01 +0000 (+0100)
Subject: Make default cache size suffix be "G", like documented
X-Git-Tag: v3.2.1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd93cb5ea735dc1c64e3b9e8fab6b202c71c19ad;p=thirdparty%2Fccache.git

Make default cache size suffix be "G", like documented
---

diff --git a/test/test_util.c b/test/test_util.c
index a9c54793b..156789d63 100644
--- a/test/test_util.c
+++ b/test/test_util.c
@@ -164,7 +164,7 @@ TEST(parse_size_with_suffix)
 	size_t i;
 	struct { const char *size; int64_t expected; } sizes[] = {
 		{"0", 0},
-		{"42", 42},
+		{"42", (int64_t)42 * 1000 * 1000 * 1000}, /* Default suffix: G */
 
 		{"78k",       78 * 1000},
 		{"78K",       78 * 1000},
diff --git a/util.c b/util.c
index f453959e5..a375a4269 100644
--- a/util.c
+++ b/util.c
@@ -947,6 +947,9 @@ parse_size_with_suffix(const char *str, uint64_t *size)
 		default:
 			return false;
 		}
+	} else {
+		/* Default suffix: G. */
+		x *= 1000 * 1000 * 1000;
 	}
 	*size = x;
 	return true;