Re: [Qemu-devel] [PATCH 10/24] tests/test-cutils: Add missing qemu_strtosz()... endptr checks

[Philippe Mathieu-Daudé]

On 02/14/2017 07:25 AM, Markus Armbruster wrote:

Signed-off-by: Markus Armbruster 


Reviewed-by: Philippe Mathieu-Daudé 


---
 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 47cc8a4..2dc6832 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, );
 g_assert_cmpint(res, ==, M_BYTE);
+g_assert(endptr == none + 1);

-res = qemu_strtosz(b, NULL);
+res = qemu_strtosz(b, );
 g_assert_cmpint(res, ==, 1);
+g_assert(endptr == b + 2);

-res = qemu_strtosz(k, NULL);
+res = qemu_strtosz(k, );
 g_assert_cmpint(res, ==, K_BYTE);
+g_assert(endptr == k + 2);

-res = qemu_strtosz(m, NULL);
+res = qemu_strtosz(m, );
 g_assert_cmpint(res, ==, M_BYTE);
+g_assert(endptr == m + 2);

-res = qemu_strtosz(g, NULL);
+res = qemu_strtosz(g, );
 g_assert_cmpint(res, ==, G_BYTE);
+g_assert(endptr == g + 2);

-res = qemu_strtosz(t, NULL);
+res = qemu_strtosz(t, );
 g_assert_cmpint(res, ==, T_BYTE);
+g_assert(endptr == t + 2);

-res = qemu_strtosz(p, NULL);
+res = qemu_strtosz(p, );
 g_assert_cmpint(res, ==, P_BYTE);
+g_assert(endptr == p + 2);

-res = qemu_strtosz(e, NULL);
+res = qemu_strtosz(e, );
 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, );
 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, );
 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, ,
QEMU_STRTOSZ_DEFSUFFIX_KB, 1000);
 g_assert_cmpint(res, ==, 12345000);
+g_assert(endptr == str + 5);
 }

 int main(int argc, char **argv)

Re: [Qemu-devel] [PATCH 10/24] tests/test-cutils: Add missing qemu_strtosz()... endptr checks

[Eric Blake]

On 02/14/2017 04:25 AM, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster 
> ---
>  tests/test-cutils.c | 37 ++---
>  1 file changed, 26 insertions(+), 11 deletions(-)
> 

Reviewed-by: Eric Blake 

-- 
Eric Blake   eblake redhat com+1-919-301-3266
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature