qlit: make qlit_equal_qobject return a bool

elmarco · Markus Armbruster · commit d9eba57a6ad6 · 2017-09-04T13:09:11.000+02:00
Make it more obvious about the expected return values.

Signed-off-by: Marc-André Lureau &lt;marcandre.lureau@redhat.com&gt;
Reviewed-by: Markus Armbruster &lt;armbru@redhat.com&gt;
Message-Id: &lt;20170825105913.4060-7-marcandre.lureau@redhat.com&gt;
Signed-off-by: Markus Armbruster &lt;armbru@redhat.com&gt;
diff --git 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 qlit_equal_qobject(QLitObject *lhs, QObject *rhs);
+bool qlit_equal_qobject(QLitObject *lhs, QObject *rhs);
 
 #endif /* QLIT_H */
diff --git a/qobject/qlit.c b/qobject/qlit.c
@@ -21,32 +21,32 @@
 typedef struct QListCompareHelper {
     int index;
     QLitObject *objs;
-    int result;
+    bool result;
 } QListCompareHelper;
 
 static void compare_helper(QObject *obj, void *opaque)
 {
     QListCompareHelper *helper = opaque;
 
-    if (helper->result == 0) {
+    if (!helper->result) {
         return;
     }
 
     if (helper->objs[helper->index].type == QTYPE_NONE) {
-        helper->result = 0;
+        helper->result = false;
         return;
     }
 
     helper->result =
         qlit_equal_qobject(&helper->objs[helper->index++], obj);
 }
 
-int qlit_equal_qobject(QLitObject *lhs, QObject *rhs)
+bool qlit_equal_qobject(QLitObject *lhs, QObject *rhs)
 {
     int64_t val;
 
     if (!rhs || lhs->type != qobject_type(rhs)) {
-        return 0;
+        return false;
     }
 
     switch (lhs->type) {
@@ -64,18 +64,18 @@ int qlit_equal_qobject(QLitObject *lhs, QObject *rhs)
                                      lhs->value.qdict[i].key);
 
             if (!qlit_equal_qobject(&lhs->value.qdict[i].value, obj)) {
-                return 0;
+                return false;
             }
         }
 
-        return 1;
+        return true;
     }
     case QTYPE_QLIST: {
         QListCompareHelper helper;
 
         helper.index = 0;
         helper.objs = lhs->value.qlist;
-        helper.result = 1;
+        helper.result = true;
 
         qlist_iter(qobject_to_qlist(rhs), compare_helper, &helper);
 
@@ -85,5 +85,5 @@ int qlit_equal_qobject(QLitObject *lhs, QObject *rhs)
         break;
     }
 
-    return 0;
+    return false;
 }
diff --git 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(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);
+        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj));
 
         str = qobject_to_json(obj);
         qobject_decref(obj);
 
         obj = qobject_from_json(qstring_get_str(str), &error_abort);
-        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);
+        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj));
         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(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);
+        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj));
 
         str = qobject_to_json(obj);
         qobject_decref(obj);
 
         obj = qobject_from_json(qstring_get_str(str), &error_abort);
-        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);
+        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj));
         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(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);
+        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj));
 
         str = qobject_to_json(obj);
         qobject_decref(obj);
 
         obj = qobject_from_json(qstring_get_str(str), &error_abort);
-        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);
+        g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj));
 
         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(qlit_equal_qobject(&decoded, obj) == 1);
+    g_assert(qlit_equal_qobject(&decoded, obj));
 
     qobject_decref(obj);
 }

Original file line number	Diff line number	Diff line change
`@@ -21,32 +21,32 @@`
`21`	`21`	`typedef struct QListCompareHelper {`
`22`	`22`	`int index;`
`23`	`23`	`QLitObject *objs;`
`24`		`- int result;`
	`24`	`+ bool result;`
`25`	`25`	`} QListCompareHelper;`
`26`	`26`
`27`	`27`	`static void compare_helper(QObject obj, void opaque)`
`28`	`28`	`{`
`29`	`29`	`QListCompareHelper *helper = opaque;`
`30`	`30`
`31`		`- if (helper->result == 0) {`
	`31`	`+ if (!helper->result) {`
`32`	`32`	`return;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (helper->objs[helper->index].type == QTYPE_NONE) {`
`36`		`- helper->result = 0;`
	`36`	`+ helper->result = false;`
`37`	`37`	`return;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`helper->result =`
`41`	`41`	`qlit_equal_qobject(&helper->objs[helper->index++], obj);`
`42`	`42`	`}`
`43`	`43`
`44`		`-int qlit_equal_qobject(QLitObject lhs, QObject rhs)`
	`44`	`+bool qlit_equal_qobject(QLitObject lhs, QObject rhs)`
`45`	`45`	`{`
`46`	`46`	`int64_t val;`
`47`	`47`
`48`	`48`	`if (!rhs \|\| lhs->type != qobject_type(rhs)) {`
`49`		`- return 0;`
	`49`	`+ return false;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`switch (lhs->type) {`
`@@ -64,18 +64,18 @@ int qlit_equal_qobject(QLitObject lhs, QObject rhs)`
`64`	`64`	`lhs->value.qdict[i].key);`
`65`	`65`
`66`	`66`	`if (!qlit_equal_qobject(&lhs->value.qdict[i].value, obj)) {`
`67`		`- return 0;`
	`67`	`+ return false;`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`- return 1;`
	`71`	`+ return true;`
`72`	`72`	`}`
`73`	`73`	`case QTYPE_QLIST: {`
`74`	`74`	`QListCompareHelper helper;`
`75`	`75`
`76`	`76`	`helper.index = 0;`
`77`	`77`	`helper.objs = lhs->value.qlist;`
`78`		`- helper.result = 1;`
	`78`	`+ helper.result = true;`
`79`	`79`
`80`	`80`	`qlist_iter(qobject_to_qlist(rhs), compare_helper, &helper);`
`81`	`81`
`@@ -85,5 +85,5 @@ int qlit_equal_qobject(QLitObject lhs, QObject rhs)`
`85`	`85`	`break;`
`86`	`86`	`}`
`87`	`87`
`88`		`- return 0;`
	`88`	`+ return false;`
`89`	`89`	`}`