mirror of
https://github.com/qemu/qemu.git
synced 2025-01-19 03:53:28 +08:00
qlit: Replace open-coded qnum_get_int() by call
Bonus: rids us of a side effect in an assertion. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20170825105913.4060-10-marcandre.lureau@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
6c6084c1b0
commit
5f4bd80936
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user