| Message ID | 20170824103350.16400-6-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
Marc-André Lureau <marcandre.lureau@redhat.com> writes: > Use qlit_ prefix. Let's spell it out: qlit: rename compare_litqobj_to_qobj() to qlit_equal_qobject() By the way, not only is your name shorter, it's also more precise: "compare" suggests -1, 0, +1 for less than, equal and greater than, equal suggests non-zero for equal, zero for unequal. > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > include/qapi/qmp/qlit.h | 2 +- > qobject/qlit.c | 6 +++--- > tests/check-qjson.c | 14 +++++++------- > 3 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/include/qapi/qmp/qlit.h b/include/qapi/qmp/qlit.h > index 1e9696988a..e299e8fab0 100644 > --- a/include/qapi/qmp/qlit.h > +++ b/include/qapi/qmp/qlit.h > @@ -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_ */ Let's use this opportunity to change the return value to bool. With those changes: Reviewed-by: Markus Armbruster <armbru@redhat.com>
Markus Armbruster <armbru@redhat.com> writes: > Marc-André Lureau <marcandre.lureau@redhat.com> writes: > >> Use qlit_ prefix. > > Let's spell it out: > > qlit: rename compare_litqobj_to_qobj() to qlit_equal_qobject() > > By the way, not only is your name shorter, it's also more precise: > "compare" suggests -1, 0, +1 for less than, equal and greater than, > equal suggests non-zero for equal, zero for unequal. > >> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> >> --- >> include/qapi/qmp/qlit.h | 2 +- >> qobject/qlit.c | 6 +++--- >> tests/check-qjson.c | 14 +++++++------- >> 3 files changed, 11 insertions(+), 11 deletions(-) >> >> diff --git a/include/qapi/qmp/qlit.h b/include/qapi/qmp/qlit.h >> index 1e9696988a..e299e8fab0 100644 >> --- a/include/qapi/qmp/qlit.h >> +++ b/include/qapi/qmp/qlit.h >> @@ -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_ */ > > Let's use this opportunity to change the return value to bool. Maybe I should peek at the next patch once in a while. Nevermind! > With those changes: Scratch "those changes", just touch up the commit message a bit: 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. Can do on commit. > Reviewed-by: Markus Armbruster <armbru@redhat.com>
diff --git a/include/qapi/qmp/qlit.h b/include/qapi/qmp/qlit.h index 1e9696988a..e299e8fab0 100644 --- a/include/qapi/qmp/qlit.h +++ b/include/qapi/qmp/qlit.h @@ -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_ */ diff --git a/qobject/qlit.c b/qobject/qlit.c index 262d64988d..0c4101898d 100644 --- a/qobject/qlit.c +++ b/qobject/qlit.c @@ -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; } } diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 82b3681327..e5ca273cbc 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -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); }
Use qlit_ prefix. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- include/qapi/qmp/qlit.h | 2 +- qobject/qlit.c | 6 +++--- tests/check-qjson.c | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-)