[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/24] test-cutils: Add missing qemu_strtosz()...
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 10/24] test-cutils: Add missing qemu_strtosz()... endptr checks |
Date: |
Tue, 21 Feb 2017 21:13:54 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/test-cutils.c | 37 ++++++++++++++++++++++++++-----------
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/tests/test-cutils.c b/tests/test-cutils.c
index 185b023..a3eb182 100644
--- a/tests/test-cutils.c
+++ b/tests/test-cutils.c
@@ -1393,60 +1393,75 @@ static void test_qemu_strtosz_units(void)
const char *t = "1T";
const char *p = "1P";
const char *e = "1E";
+ char *endptr = NULL;
int64_t res;
/* default is M */
- res = qemu_strtosz(none, NULL);
+ res = qemu_strtosz(none, &endptr);
g_assert_cmpint(res, ==, M_BYTE);
+ g_assert(endptr == none + 1);
- res = qemu_strtosz(b, NULL);
+ res = qemu_strtosz(b, &endptr);
g_assert_cmpint(res, ==, 1);
+ g_assert(endptr == b + 2);
- res = qemu_strtosz(k, NULL);
+ res = qemu_strtosz(k, &endptr);
g_assert_cmpint(res, ==, K_BYTE);
+ g_assert(endptr == k + 2);
- res = qemu_strtosz(m, NULL);
+ res = qemu_strtosz(m, &endptr);
g_assert_cmpint(res, ==, M_BYTE);
+ g_assert(endptr == m + 2);
- res = qemu_strtosz(g, NULL);
+ res = qemu_strtosz(g, &endptr);
g_assert_cmpint(res, ==, G_BYTE);
+ g_assert(endptr == g + 2);
- res = qemu_strtosz(t, NULL);
+ res = qemu_strtosz(t, &endptr);
g_assert_cmpint(res, ==, T_BYTE);
+ g_assert(endptr == t + 2);
- res = qemu_strtosz(p, NULL);
+ res = qemu_strtosz(p, &endptr);
g_assert_cmpint(res, ==, P_BYTE);
+ g_assert(endptr == p + 2);
- res = qemu_strtosz(e, NULL);
+ res = qemu_strtosz(e, &endptr);
g_assert_cmpint(res, ==, E_BYTE);
+ g_assert(endptr == e + 2);
}
static void test_qemu_strtosz_float(void)
{
const char *str = "12.345M";
+ char *endptr = NULL;
int64_t res;
- res = qemu_strtosz(str, NULL);
+ res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, 12.345 * M_BYTE);
+ g_assert(endptr == str + 7);
}
static void test_qemu_strtosz_erange(void)
{
const char *str = "10E";
+ char *endptr = NULL;
int64_t res;
- res = qemu_strtosz(str, NULL);
+ res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, -ERANGE);
+ g_assert(endptr == str + 3);
}
static void test_qemu_strtosz_suffix_unit(void)
{
const char *str = "12345";
+ char *endptr = NULL;
int64_t res;
- res = qemu_strtosz_suffix_unit(str, NULL,
+ res = qemu_strtosz_suffix_unit(str, &endptr,
QEMU_STRTOSZ_DEFSUFFIX_KB, 1000);
g_assert_cmpint(res, ==, 12345000);
+ g_assert(endptr == str + 5);
}
int main(int argc, char **argv)
--
2.7.4
- [Qemu-devel] [PATCH v2 00/24] QemuOpts util/cutils: Fix and clean up number conversions, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 04/24] test-cutils: Clean up qemu_strtoul() result checks, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 17/24] util/cutils: Drop QEMU_STRTOSZ_DEFSUFFIX_* macros, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 01/24] test-qemu-opts: Cover qemu_opts_parse(), Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 07/24] util/cutils: Clean up variable names around qemu_strtol(), Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 11/24] test-cutils: Cover qemu_strtosz() invalid input, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 10/24] test-cutils: Add missing qemu_strtosz()... endptr checks,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 05/24] util/cutils: Rewrite documentation of qemu_strtol() & friends, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 12/24] test-cutils: Cover qemu_strtosz() with trailing crap, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 08/24] util/cutils: Clean up control flow around qemu_strtol() a bit, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 03/24] test-cutils: Add missing qemu_strtol()... endptr checks, Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 19/24] test-cutils: Drop suffix from test_qemu_strtosz_simple(), Markus Armbruster, 2017/02/21
- [Qemu-devel] [PATCH v2 13/24] test-cutils: Cover qemu_strtosz() around range limits, Markus Armbruster, 2017/02/21
- [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