Commit 5f4bd809 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

qlit: Replace open-coded qnum_get_int() by call 



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

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20170825105913.4060-10-marcandre.lureau@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 6c6084c1

qobject/qlit.c

+1 −4
Original line number Diff line number Diff line
@@ -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);