From a36ee96618a9613c234d1f4404769becdf5c55e3 Mon Sep 17 00:00:00 2001 From: Dainis Jonitis Date: Fri, 10 Jan 2020 16:41:04 +0200 Subject: blobmsg: blobmsg_add_json_element() 64-bit values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libjson-c json_type_int values are stored as int64_t. Use json_object_get_int64() instead of json_object_get_int() to avoid clamping to INT32_MAX. Reviewed-by: Jo-Philipp Wich Signed-off-by: Dainis Jonitis [fixed author to match SoB, added unit test results] Signed-off-by: Petr Štetiar --- tests/cram/test_blobmsg.t | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'tests') diff --git a/tests/cram/test_blobmsg.t b/tests/cram/test_blobmsg.t index 84ec143..74ad326 100644 --- a/tests/cram/test_blobmsg.t +++ b/tests/cram/test_blobmsg.t @@ -46,8 +46,8 @@ check that blobmsg is producing expected results: 32767 (i32) -2147483648 (i32) 2147483647 (i32) - -2147483648 (i32) - 2147483647 (i32) + -9223372036854775808 (i64) + 9223372036854775807 (i64) 133.700000 (dbl) } Testdata: { @@ -60,8 +60,8 @@ check that blobmsg is producing expected results: \tbar-max : 32767 (i32) (esc) \tbaz-min : -2147483648 (i32) (esc) \tbaz-max : 2147483647 (i32) (esc) - \ttaz-min : -2147483648 (i32) (esc) - \ttaz-max : 2147483647 (i32) (esc) + \ttaz-min : -9223372036854775808 (i64) (esc) + \ttaz-max : 9223372036854775807 (i64) (esc) \tworld : 2 (str) (esc) } @@ -109,8 +109,8 @@ check that blobmsg is producing expected results: 32767 (i32) -2147483648 (i32) 2147483647 (i32) - -2147483648 (i32) - 2147483647 (i32) + -9223372036854775808 (i64) + 9223372036854775807 (i64) 133.700000 (dbl) } Testdata: { @@ -123,8 +123,8 @@ check that blobmsg is producing expected results: \tbar-max : 32767 (i32) (esc) \tbaz-min : -2147483648 (i32) (esc) \tbaz-max : 2147483647 (i32) (esc) - \ttaz-min : -2147483648 (i32) (esc) - \ttaz-max : 2147483647 (i32) (esc) + \ttaz-min : -9223372036854775808 (i64) (esc) + \ttaz-max : 9223372036854775807 (i64) (esc) \tworld : 2 (str) (esc) } @@ -172,8 +172,8 @@ check that blobmsg is producing expected results: 32767 (i32) -2147483648 (i32) 2147483647 (i32) - -2147483648 (i32) - 2147483647 (i32) + -9223372036854775808 (i64) + 9223372036854775807 (i64) 133.700000 (dbl) } Testdata: { @@ -186,8 +186,8 @@ check that blobmsg is producing expected results: \tbar-max : 32767 (i32) (esc) \tbaz-min : -2147483648 (i32) (esc) \tbaz-max : 2147483647 (i32) (esc) - \ttaz-min : -2147483648 (i32) (esc) - \ttaz-max : 2147483647 (i32) (esc) + \ttaz-min : -9223372036854775808 (i64) (esc) + \ttaz-max : 9223372036854775807 (i64) (esc) \tworld : 2 (str) (esc) } @@ -235,8 +235,8 @@ check that blobmsg is producing expected results: 32767 (i32) -2147483648 (i32) 2147483647 (i32) - -2147483648 (i32) - 2147483647 (i32) + -9223372036854775808 (i64) + 9223372036854775807 (i64) 133.700000 (dbl) } Testdata: { @@ -249,7 +249,7 @@ check that blobmsg is producing expected results: \tbar-max : 32767 (i32) (esc) \tbaz-min : -2147483648 (i32) (esc) \tbaz-max : 2147483647 (i32) (esc) - \ttaz-min : -2147483648 (i32) (esc) - \ttaz-max : 2147483647 (i32) (esc) + \ttaz-min : -9223372036854775808 (i64) (esc) + \ttaz-max : 9223372036854775807 (i64) (esc) \tworld : 2 (str) (esc) } -- cgit v1.2.3