{"id":808787,"url":"http://patchwork.ozlabs.org/api/patches/808787/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-10-armbru@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170901153758.8628-10-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:20","name":"[PULL,v2,09/47] qlit: make qlit_equal_qobject return a bool","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"079b7d2c20459bed77f3cf0dd088ca48a8728c1d","submitter":{"id":2645,"url":"http://patchwork.ozlabs.org/api/people/2645/?format=json","name":"Markus Armbruster","email":"armbru@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-10-armbru@redhat.com/mbox/","series":[{"id":1049,"url":"http://patchwork.ozlabs.org/api/series/1049/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1049","date":"2017-09-01T15:37:14","name":"[PULL,v2,01/47] qapi: Fix error handling code on alternate conflict","version":2,"mbox":"http://patchwork.ozlabs.org/series/1049/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808787/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808787/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=208.118.235.17; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=armbru@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [208.118.235.17])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkPQv51xWz9t3P\n\tfor ;\n\tSat, 2 Sep 2017 02:12:39 +1000 (AEST)","from localhost ([::1]:46961 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnoYf-0007Wr-1Q\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 12:12:37 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51764)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1V-0006mD-M0\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:28 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dno1O-0001mA-AT\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:21 -0400","from mx1.redhat.com ([209.132.183.28]:54388)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dno1O-0001l5-0e\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:14 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 0A3B619CBED\n\tfor ; Fri, 1 Sep 2017 15:38:13 +0000 (UTC)","from blackfin.pond.sub.org (ovpn-116-75.ams2.redhat.com\n\t[10.36.116.75])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 6A25F78392;\n\tFri, 1 Sep 2017 15:38:01 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 5DC05113866B; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0A3B619CBED","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:20 +0200","Message-Id":"<20170901153758.8628-10-armbru@redhat.com>","In-Reply-To":"<20170901153758.8628-1-armbru@redhat.com>","References":"<20170901153758.8628-1-armbru@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tFri, 01 Sep 2017 15:38:13 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL v2 09/47] qlit: make qlit_equal_qobject return a\n\tbool","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Marc-André Lureau \n\nMake it more obvious about the expected return values.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Markus Armbruster \nMessage-Id: <20170825105913.4060-7-marcandre.lureau@redhat.com>\nSigned-off-by: Markus Armbruster \n---\n include/qapi/qmp/qlit.h | 2 +-\n qobject/qlit.c | 18 +++++++++---------\n tests/check-qjson.c | 14 +++++++-------\n 3 files changed, 17 insertions(+), 17 deletions(-)","diff":"diff --git a/include/qapi/qmp/qlit.h b/include/qapi/qmp/qlit.h\nindex 5a180477c8..35aabbdc9f 100644\n--- a/include/qapi/qmp/qlit.h\n+++ b/include/qapi/qmp/qlit.h\n@@ -44,6 +44,6 @@ struct QLitDictEntry {\n #define QLIT_QLIST(val) \\\n { .type = QTYPE_QLIST, .value.qlist = (val) }\n \n-int qlit_equal_qobject(QLitObject *lhs, QObject *rhs);\n+bool qlit_equal_qobject(QLitObject *lhs, QObject *rhs);\n \n #endif /* QLIT_H */\ndiff --git a/qobject/qlit.c b/qobject/qlit.c\nindex 0c4101898d..a2975bef3f 100644\n--- a/qobject/qlit.c\n+++ b/qobject/qlit.c\n@@ -21,19 +21,19 @@\n typedef struct QListCompareHelper {\n int index;\n QLitObject *objs;\n- int result;\n+ bool result;\n } QListCompareHelper;\n \n static void compare_helper(QObject *obj, void *opaque)\n {\n QListCompareHelper *helper = opaque;\n \n- if (helper->result == 0) {\n+ if (!helper->result) {\n return;\n }\n \n if (helper->objs[helper->index].type == QTYPE_NONE) {\n- helper->result = 0;\n+ helper->result = false;\n return;\n }\n \n@@ -41,12 +41,12 @@ static void compare_helper(QObject *obj, void *opaque)\n qlit_equal_qobject(&helper->objs[helper->index++], obj);\n }\n \n-int qlit_equal_qobject(QLitObject *lhs, QObject *rhs)\n+bool qlit_equal_qobject(QLitObject *lhs, QObject *rhs)\n {\n int64_t val;\n \n if (!rhs || lhs->type != qobject_type(rhs)) {\n- return 0;\n+ return false;\n }\n \n switch (lhs->type) {\n@@ -64,18 +64,18 @@ int qlit_equal_qobject(QLitObject *lhs, QObject *rhs)\n lhs->value.qdict[i].key);\n \n if (!qlit_equal_qobject(&lhs->value.qdict[i].value, obj)) {\n- return 0;\n+ return false;\n }\n }\n \n- return 1;\n+ return true;\n }\n case QTYPE_QLIST: {\n QListCompareHelper helper;\n \n helper.index = 0;\n helper.objs = lhs->value.qlist;\n- helper.result = 1;\n+ helper.result = true;\n \n qlist_iter(qobject_to_qlist(rhs), compare_helper, &helper);\n \n@@ -85,5 +85,5 @@ int qlit_equal_qobject(QLitObject *lhs, QObject *rhs)\n break;\n }\n \n- return 0;\n+ return false;\n }\ndiff --git a/tests/check-qjson.c b/tests/check-qjson.c\nindex e5ca273cbc..59227934ce 100644\n--- a/tests/check-qjson.c\n+++ b/tests/check-qjson.c\n@@ -1094,13 +1094,13 @@ static void simple_dict(void)\n QString *str;\n \n obj = qobject_from_json(test_cases[i].encoded, &error_abort);\n- g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);\n+ g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj));\n \n str = qobject_to_json(obj);\n qobject_decref(obj);\n \n obj = qobject_from_json(qstring_get_str(str), &error_abort);\n- g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);\n+ g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj));\n qobject_decref(obj);\n QDECREF(str);\n }\n@@ -1203,13 +1203,13 @@ static void simple_list(void)\n QString *str;\n \n obj = qobject_from_json(test_cases[i].encoded, &error_abort);\n- g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);\n+ g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj));\n \n str = qobject_to_json(obj);\n qobject_decref(obj);\n \n obj = qobject_from_json(qstring_get_str(str), &error_abort);\n- g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);\n+ g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj));\n qobject_decref(obj);\n QDECREF(str);\n }\n@@ -1265,13 +1265,13 @@ static void simple_whitespace(void)\n QString *str;\n \n obj = qobject_from_json(test_cases[i].encoded, &error_abort);\n- g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);\n+ g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj));\n \n str = qobject_to_json(obj);\n qobject_decref(obj);\n \n obj = qobject_from_json(qstring_get_str(str), &error_abort);\n- g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj) == 1);\n+ g_assert(qlit_equal_qobject(&test_cases[i].decoded, obj));\n \n qobject_decref(obj);\n QDECREF(str);\n@@ -1295,7 +1295,7 @@ static void simple_varargs(void)\n g_assert(embedded_obj != NULL);\n \n obj = qobject_from_jsonf(\"[%d, 2, %p]\", 1, embedded_obj);\n- g_assert(qlit_equal_qobject(&decoded, obj) == 1);\n+ g_assert(qlit_equal_qobject(&decoded, obj));\n \n qobject_decref(obj);\n }\n","prefixes":["PULL","v2","09/47"]}