| Message ID | 20170824103350.16400-10-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
Marc-André Lureau <marcandre.lureau@redhat.com> writes: > qnum_get_int() will assert if underlying type isn't compatible. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > qobject/qlit.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/qobject/qlit.c b/qobject/qlit.c > index 07ad6b05e8..7e4bf92862 100644 > --- a/qobject/qlit.c > +++ b/qobject/qlit.c > @@ -53,7 +53,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)); > + val = qnum_get_int(qobject_to_qnum(rhs)); > return lhs->value.qnum == val; > case QTYPE_QSTRING: > return (strcmp(lhs->value.qstr, Suggest commit message qlit: Replace open-coded qnum_get_int() by call Bonus: rids us of a side effect in an assertion. Can do on commit. Reviewed-by: Markus Armbruster <armbru@redhat.com>
diff --git a/qobject/qlit.c b/qobject/qlit.c index 07ad6b05e8..7e4bf92862 100644 --- a/qobject/qlit.c +++ b/qobject/qlit.c @@ -53,7 +53,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)); + val = qnum_get_int(qobject_to_qnum(rhs)); return lhs->value.qnum == val; case QTYPE_QSTRING: return (strcmp(lhs->value.qstr,
qnum_get_int() will assert if underlying type isn't compatible. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- qobject/qlit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)