]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
Make default cache size suffix be "G", like documented
authorJoel Rosdahl <joel@rosdahl.net>
Wed, 3 Dec 2014 21:14:01 +0000 (22:14 +0100)
committerJoel Rosdahl <joel@rosdahl.net>
Thu, 4 Dec 2014 07:49:16 +0000 (08:49 +0100)
test/test_util.c
util.c

index a9c54793b1976746b94f1a5b8189bd6726602d19..156789d63b4ec18d18ca37e0cd660283424249f0 100644 (file)
@@ -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 f453959e534a71ab6b34684347c286235eccab32..a375a4269204589d80570c818b399892cba18e84 100644 (file)
--- 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;