[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/14] qlit: Replace open-coded qnum_get_int() by
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 09/14] qlit: Replace open-coded qnum_get_int() by call |
Date: |
Fri, 25 Aug 2017 12:59:08 +0200 |
Bonus: rids us of a side effect in an assertion.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-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.14.1.146.gd35faa819
- [Qemu-devel] [PATCH v2 02/14] qlit: move qlit from check-qjson to qobject/, (continued)
- [Qemu-devel] [PATCH v2 05/14] qlit: rename compare_litqobj_to_qobj() to qlit_equal_qobject(), Marc-André Lureau, 2017/08/25
- [Qemu-devel] [PATCH v2 06/14] qlit: make qlit_equal_qobject return a bool, Marc-André Lureau, 2017/08/25
- [Qemu-devel] [PATCH v2 07/14] qlit: make qlit_equal_qobject() take const arguments, Marc-André Lureau, 2017/08/25
- [Qemu-devel] [PATCH v2 08/14] qlit: add QLIT_QNULL and QLIT_BOOL, Marc-André Lureau, 2017/08/25
- [Qemu-devel] [PATCH v2 09/14] qlit: Replace open-coded qnum_get_int() by call,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 10/14] tests: add qlit tests, Marc-André Lureau, 2017/08/25
- [Qemu-devel] [PATCH v2 11/14] qlit: improve QLit dict vs qdict comparison, Marc-André Lureau, 2017/08/25
- [Qemu-devel] [PATCH v2 13/14] qlit: add qobject_form_qlit(), Marc-André Lureau, 2017/08/25