diff options
| author | Eric Blake <eblake@redhat.com> | 2015-05-15 16:24:59 -0600 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-06-22 17:40:00 +0200 |
| commit | fc48ffc39ed1060856475e4320d5896f26c945e8 (patch) | |
| tree | 4e4a5a4b9a6b9a0602fe5863e694ec472edccbf8 /tests/check-qjson.c | |
| parent | 0a3346f5dea0a679322df804e1e78d7c10d12a9f (diff) | |
| download | focaccia-qemu-fc48ffc39ed1060856475e4320d5896f26c945e8.tar.gz focaccia-qemu-fc48ffc39ed1060856475e4320d5896f26c945e8.zip | |
qobject: Use 'bool' for qbool
We require a C99 compiler, so let's use 'bool' instead of 'int' when dealing with boolean values. There are few enough clients to fix them all in one pass. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Alberto Garcia <berto@igalia.com> Acked-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests/check-qjson.c')
| -rw-r--r-- | tests/check-qjson.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 60e5b22a98..1cfffa5934 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -1013,7 +1013,7 @@ static void keyword_literal(void) g_assert(qobject_type(obj) == QTYPE_QBOOL); qbool = qobject_to_qbool(obj); - g_assert(qbool_get_int(qbool) != 0); + g_assert(qbool_get_bool(qbool) == true); str = qobject_to_json(obj); g_assert(strcmp(qstring_get_str(str), "true") == 0); @@ -1026,7 +1026,7 @@ static void keyword_literal(void) g_assert(qobject_type(obj) == QTYPE_QBOOL); qbool = qobject_to_qbool(obj); - g_assert(qbool_get_int(qbool) == 0); + g_assert(qbool_get_bool(qbool) == false); str = qobject_to_json(obj); g_assert(strcmp(qstring_get_str(str), "false") == 0); @@ -1039,16 +1039,17 @@ static void keyword_literal(void) g_assert(qobject_type(obj) == QTYPE_QBOOL); qbool = qobject_to_qbool(obj); - g_assert(qbool_get_int(qbool) == 0); + g_assert(qbool_get_bool(qbool) == false); QDECREF(qbool); - obj = qobject_from_jsonf("%i", true); + /* Test that non-zero values other than 1 get collapsed to true */ + obj = qobject_from_jsonf("%i", 2); g_assert(obj != NULL); g_assert(qobject_type(obj) == QTYPE_QBOOL); qbool = qobject_to_qbool(obj); - g_assert(qbool_get_int(qbool) != 0); + g_assert(qbool_get_bool(qbool) == true); QDECREF(qbool); |