[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 18/24] test-cutils: Use qemu_strtosz() more often
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 18/24] test-cutils: Use qemu_strtosz() more often |
Date: |
Tue, 21 Feb 2017 21:14:02 +0100 |
Use qemu_strtosz() instead of qemu_strtosz_MiB() where it doesn't
really make a difference.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/test-cutils.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/tests/test-cutils.c b/tests/test-cutils.c
index 9eae067..d492d1e 100644
--- a/tests/test-cutils.c
+++ b/tests/test-cutils.c
@@ -1376,16 +1376,16 @@ static void test_qemu_strtosz_simple(void)
int64_t res;
str = "0";
- res = qemu_strtosz_MiB(str, &endptr);
+ res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, 0);
g_assert(endptr == str + 1);
str = "12345M";
- res = qemu_strtosz_MiB(str, &endptr);
+ res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, 12345 * M_BYTE);
g_assert(endptr == str + 6);
- res = qemu_strtosz_MiB(str, NULL);
+ res = qemu_strtosz(str, NULL);
g_assert_cmpint(res, ==, 12345 * M_BYTE);
/* Note: precision is 53 bits since we're parsing with strtod() */
@@ -1437,31 +1437,31 @@ static void test_qemu_strtosz_units(void)
g_assert_cmpint(res, ==, M_BYTE);
g_assert(endptr == none + 1);
- res = qemu_strtosz_MiB(b, &endptr);
+ res = qemu_strtosz(b, &endptr);
g_assert_cmpint(res, ==, 1);
g_assert(endptr == b + 2);
- res = qemu_strtosz_MiB(k, &endptr);
+ res = qemu_strtosz(k, &endptr);
g_assert_cmpint(res, ==, K_BYTE);
g_assert(endptr == k + 2);
- res = qemu_strtosz_MiB(m, &endptr);
+ res = qemu_strtosz(m, &endptr);
g_assert_cmpint(res, ==, M_BYTE);
g_assert(endptr == m + 2);
- res = qemu_strtosz_MiB(g, &endptr);
+ res = qemu_strtosz(g, &endptr);
g_assert_cmpint(res, ==, G_BYTE);
g_assert(endptr == g + 2);
- res = qemu_strtosz_MiB(t, &endptr);
+ res = qemu_strtosz(t, &endptr);
g_assert_cmpint(res, ==, T_BYTE);
g_assert(endptr == t + 2);
- res = qemu_strtosz_MiB(p, &endptr);
+ res = qemu_strtosz(p, &endptr);
g_assert_cmpint(res, ==, P_BYTE);
g_assert(endptr == p + 2);
- res = qemu_strtosz_MiB(e, &endptr);
+ res = qemu_strtosz(e, &endptr);
g_assert_cmpint(res, ==, E_BYTE);
g_assert(endptr == e + 2);
}
@@ -1472,7 +1472,7 @@ static void test_qemu_strtosz_float(void)
char *endptr = NULL;
int64_t res;
- res = qemu_strtosz_MiB(str, &endptr);
+ res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, 12.345 * M_BYTE);
g_assert(endptr == str + 7);
}
@@ -1484,17 +1484,17 @@ static void test_qemu_strtosz_invalid(void)
int64_t res;
str = "";
- res = qemu_strtosz_MiB(str, &endptr);
+ res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, -EINVAL);
g_assert(endptr == str);
str = " \t ";
- res = qemu_strtosz_MiB(str, &endptr);
+ res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, -EINVAL);
g_assert(endptr == str);
str = "crap";
- res = qemu_strtosz_MiB(str, &endptr);
+ res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, -EINVAL);
g_assert(endptr == str);
}
@@ -1511,7 +1511,7 @@ static void test_qemu_strtosz_trailing(void)
g_assert(endptr == str + 3);
str = "1kiB";
- res = qemu_strtosz_MiB(str, &endptr);
+ res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, 1024);
g_assert(endptr == str + 2);
}
@@ -1523,7 +1523,7 @@ static void test_qemu_strtosz_erange(void)
int64_t res;
str = "-1";
- res = qemu_strtosz_MiB(str, &endptr);
+ res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, -ERANGE);
g_assert(endptr == str + 2);
@@ -1543,7 +1543,7 @@ static void test_qemu_strtosz_erange(void)
g_assert(endptr == str + 19);
str = "10E";
- res = qemu_strtosz_MiB(str, &endptr);
+ res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, -ERANGE);
g_assert(endptr == str + 3);
}
--
2.7.4
- [Qemu-devel] [PATCH v2 09/24] option: Fix to reject invalid and overflowing numbers, (continued)
- [Qemu-devel] [PATCH v2 09/24] option: Fix to reject invalid and overflowing numbers, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 02/24] option: Assert value string isn't null, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 14/24] util/cutils: New qemu_strtosz_metric(), Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 24/24] option: Fix checking of sizes for overflow and trailing crap, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 16/24] util/cutils: New qemu_strtosz(), Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 15/24] util/cutils: Rename qemu_strtosz() to qemu_strtosz_MiB(), Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 20/24] qemu-img: Wrap cvtnum() around qemu_strtosz(), Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 06/24] util/cutils: Rename qemu_strtoll(), qemu_strtoull(), Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 23/24] util/cutils: Change qemu_strtosz*() from int64_t to uint64_t, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 21/24] util/cutils: Let qemu_strtosz*() optionally reject trailing crap, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 18/24] test-cutils: Use qemu_strtosz() more often,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 22/24] util/cutils: Return qemu_strtosz*() error and value separately, Markus Armbruster, 2017/02/21
- Re: [Qemu-devel] [PATCH v2 00/24] QemuOpts util/cutils: Fix and clean up number conversions, no-reply, 2017/02/21