diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-02-21 21:13:58 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-02-23 20:35:36 +0100 |
| commit | d2734d2629266006b0413433778474d5801c60be (patch) | |
| tree | d02a4013292c549a001879034250be87fcb9b644 /tests | |
| parent | 0b742797aaada3a2e243175a69d542d2ed997aac (diff) | |
| download | qemu-d2734d2629266006b0413433778474d5801c60be.zip qemu-d2734d2629266006b0413433778474d5801c60be.tar.gz qemu-d2734d2629266006b0413433778474d5801c60be.tar.bz2 | |
util/cutils: New qemu_strtosz_metric()
To parse numbers with metric suffixes, we use
qemu_strtosz_suffix_unit(nptr, &eptr, QEMU_STRTOSZ_DEFSUFFIX_B, 1000)
Capture this in a new function for legibility:
qemu_strtosz_metric(nptr, &eptr)
Replace test_qemu_strtosz_suffix_unit() by test_qemu_strtosz_metric().
Rename qemu_strtosz_suffix_unit() to do_strtosz() and give it internal
linkage.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1487708048-2131-15-git-send-email-armbru@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-cutils.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/test-cutils.c b/tests/test-cutils.c index df6c330..e1d4054 100644 --- a/tests/test-cutils.c +++ b/tests/test-cutils.c @@ -1548,16 +1548,15 @@ static void test_qemu_strtosz_erange(void) g_assert(endptr == str + 3); } -static void test_qemu_strtosz_suffix_unit(void) +static void test_qemu_strtosz_metric(void) { - const char *str = "12345"; + const char *str = "12345k"; char *endptr = NULL; int64_t res; - res = qemu_strtosz_suffix_unit(str, &endptr, - QEMU_STRTOSZ_DEFSUFFIX_KB, 1000); + res = qemu_strtosz_metric(str, &endptr); g_assert_cmpint(res, ==, 12345000); - g_assert(endptr == str + 5); + g_assert(endptr == str + 6); } int main(int argc, char **argv) @@ -1754,8 +1753,8 @@ int main(int argc, char **argv) test_qemu_strtosz_trailing); g_test_add_func("/cutils/strtosz/erange", test_qemu_strtosz_erange); - g_test_add_func("/cutils/strtosz/suffix-unit", - test_qemu_strtosz_suffix_unit); + g_test_add_func("/cutils/strtosz/metric", + test_qemu_strtosz_metric); return g_test_run(); } |