yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-08 10:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

qlit: Replace open-coded qnum_get_int() by call

Browse source 
Bonus: rids us of a side effect in an assertion.

Backports commit 5f4bd8093671962093d9ec7d57ef65244b270dd4 from qemu
This commit is contained in:
Marc-André Lureau 2018-03-07 17:19:33 -05:00 committed by Lioncash
parent bc2ffe2a71
commit c1ad032a88
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 2 additions and 4 deletions

6
qemu/qobject/qlit.c
View file

@ -15,6 +15,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/qmp/qbool.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h" #include "qapi/qmp/qlist.h"
#include "qapi/qmp/qlit.h" #include "qapi/qmp/qlit.h"
@ -47,8 +48,6 @@ static void compare_helper(QObject *obj, void *opaque)
bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs) bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs)
{ {
int64_t val;
if (!rhs || lhs->type != qobject_type(rhs)) { if (!rhs || lhs->type != qobject_type(rhs)) {
return false; return false;
} }
@ -57,8 +56,7 @@ bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs)
case QTYPE_QBOOL: case QTYPE_QBOOL:
return lhs->value.qbool == qbool_get_bool(qobject_to_qbool(rhs)); return lhs->value.qbool == qbool_get_bool(qobject_to_qbool(rhs));
case QTYPE_QNUM: case QTYPE_QNUM:
g_assert(qnum_get_try_int(qobject_to_qnum(rhs), &val)); return lhs->value.qnum == qnum_get_int(qobject_to_qnum(rhs));
return lhs->value.qnum == val;
case QTYPE_QSTRING: case QTYPE_QSTRING:
return (strcmp(lhs->value.qstr, return (strcmp(lhs->value.qstr,
qstring_get_str(qobject_to_qstring(rhs))) == 0); qstring_get_str(qobject_to_qstring(rhs))) == 0);