[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 12/47] qlit: Replace open-coded qnum_get_int() by
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 12/47] qlit: Replace open-coded qnum_get_int() by call |
Date: |
Fri, 1 Sep 2017 17:37:23 +0200 |
From: Marc-André Lureau <address@hidden>
Bonus: rids us of a side effect in an assertion.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
qobject/qlit.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/qobject/qlit.c b/qobject/qlit.c
index 07ad6b05e8..b1d9146220 100644
--- a/qobject/qlit.c
+++ b/qobject/qlit.c
@@ -43,8 +43,6 @@ static void compare_helper(QObject *obj, void *opaque)
bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs)
{
- int64_t val;
-
if (!rhs || lhs->type != qobject_type(rhs)) {
return false;
}
@@ -53,8 +51,7 @@ bool qlit_equal_qobject(const QLitObject *lhs, const QObject
*rhs)
case QTYPE_QBOOL:
return lhs->value.qbool == qbool_get_bool(qobject_to_qbool(rhs));
case QTYPE_QNUM:
- g_assert(qnum_get_try_int(qobject_to_qnum(rhs), &val));
- return lhs->value.qnum == val;
+ return lhs->value.qnum == qnum_get_int(qobject_to_qnum(rhs));
case QTYPE_QSTRING:
return (strcmp(lhs->value.qstr,
qstring_get_str(qobject_to_qstring(rhs))) == 0);
--
2.13.5
- [Qemu-devel] [PULL v2 31/47] qapi-schema: Improve section headings, (continued)
- [Qemu-devel] [PULL v2 31/47] qapi-schema: Improve section headings, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 41/47] qapi: Use qapi_enum_parse() in input_type_enum(), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 15/47] qlit: Tighten QLit list vs QList comparison, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 45/47] qapi: Convert indirect uses of FOO_lookup[...] to qapi_enum_lookup(), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 47/47] qapi: drop the sentinel in enum array, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 21/47] qapi-schema: Collect char device stuff in qapi/char.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 40/47] crypto: Use qapi_enum_parse() in qcrypto_block_luks_name_lookup(), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 20/47] qapi-schema: Collect run state stuff in qapi/run-state.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 46/47] qapi: Change data type of the FOO_lookup generated for enum FOO, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 38/47] block: Use qemu_enum_parse() in blkdebug_debug_breakpoint(), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 12/47] qlit: Replace open-coded qnum_get_int() by call,
Markus Armbruster <=
- [Qemu-devel] [PULL v2 33/47] qapi: Drop superfluous qapi_enum_parse() parameter max, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 43/47] qapi: Generate FOO_str() macro for QAPI enum FOO, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 35/47] tpm: Clean up model registration & lookup, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 36/47] hmp: Use qapi_enum_parse() in hmp_migrate_set_capability(), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 22/47] qapi-schema: Collect net device stuff in qapi/net.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 37/47] hmp: Use qapi_enum_parse() in hmp_migrate_set_parameter(), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 09/47] qlit: make qlit_equal_qobject return a bool, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 19/47] qapi-schema: Collect sockets stuff in qapi/sockets.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 23/47] qapi-schema: Collect UI stuff in qapi/ui.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 44/47] qapi: Mechanically convert FOO_lookup[...] to FOO_str(...), Markus Armbruster, 2017/09/01