falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Marc-André Lureau 2017-08-25 12:59:08 +02:00 committed by Markus Armbruster
parent 6c6084c1b0
commit 5f4bd80936
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qobject/qlit.c
View File

@ -43,8 +43,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;
} }
@ -53,8 +51,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);