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

qlit: rename compare_litqobj_to_qobj() to qlit_equal_qobject() 



compare_litqobj_to_qobj() lacks a qlit_ prefix.  Moreover, "compare"
suggests -1, 0, +1 for less than, equal and greater than.  The
function actually returns non-zero for equal, zero for unequal.
Rename to qlit_equal_qobject().

Its return type will be cleaned up in the next patch.

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

include/qapi/qmp/qlit.h

+1 −1
Original line number Diff line number Diff line
@@ -44,6 +44,6 @@ struct QLitDictEntry { 
#define QLIT_QLIST(val) \

    { .type = QTYPE_QLIST, .value.qlist = (val) }



int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs);

int qlit_equal_qobject(QLitObject *lhs, QObject *rhs);



#endif /* QLIT_H */

qobject/qlit.c

+3 −3
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ static void compare_helper(QObject *obj, void *opaque) 
    }



    helper->result =

        compare_litqobj_to_qobj(&helper->objs[helper->index++], obj);

        qlit_equal_qobject(&helper->objs[helper->index++], obj);

}



int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs)

int qlit_equal_qobject(QLitObject *lhs, QObject *rhs)

{

    int64_t val;
@@ -63,7 +63,7 @@ int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs) 
            QObject *obj = qdict_get(qobject_to_qdict(rhs),

                                     lhs->value.qdict[i].key);



            if (!compare_litqobj_to_qobj(&lhs->value.qdict[i].value, obj)) {

            if (!qlit_equal_qobject(&lhs->value.qdict[i].value, obj)) {

                return 0;

            }

        }

tests/check-qjson.c

+7 −7
Original line number Diff line number Diff line
@@ -1094,13 +1094,13 @@ static void simple_dict(void) 
        QString *str;



        obj = qobject_from_json(test_cases[i].encoded, &error_abort);

        g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);

        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);



        str = qobject_to_json(obj);

        qobject_decref(obj);



        obj = qobject_from_json(qstring_get_str(str), &error_abort);

        g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);

        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);

        qobject_decref(obj);

        QDECREF(str);

    }
@@ -1203,13 +1203,13 @@ static void simple_list(void) 
        QString *str;



        obj = qobject_from_json(test_cases[i].encoded, &error_abort);

        g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);

        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);



        str = qobject_to_json(obj);

        qobject_decref(obj);



        obj = qobject_from_json(qstring_get_str(str), &error_abort);

        g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);

        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);

        qobject_decref(obj);

        QDECREF(str);

    }
@@ -1265,13 +1265,13 @@ static void simple_whitespace(void) 
        QString *str;



        obj = qobject_from_json(test_cases[i].encoded, &error_abort);

        g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);

        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);



        str = qobject_to_json(obj);

        qobject_decref(obj);



        obj = qobject_from_json(qstring_get_str(str), &error_abort);

        g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);

        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);



        qobject_decref(obj);

        QDECREF(str);
@@ -1295,7 +1295,7 @@ static void simple_varargs(void) 
    g_assert(embedded_obj != NULL);



    obj = qobject_from_jsonf("[%d, 2, %p]", 1, embedded_obj);

    g_assert(compare_litqobj_to_qobj(&decoded, obj) == 1);

    g_assert(qlit_equal_qobject(&decoded, obj) == 1);



    qobject_decref(obj);

}