From nobody Tue Feb 10 20:07:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1503571610814630.0953724672343; Thu, 24 Aug 2017 03:46:50 -0700 (PDT) Received: from localhost ([::1]:47694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkpez-0000ns-Kr for importer@patchew.org; Thu, 24 Aug 2017 06:46:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkpTC-0007J3-36 for qemu-devel@nongnu.org; Thu, 24 Aug 2017 06:34:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkpTB-0004BR-9E for qemu-devel@nongnu.org; Thu, 24 Aug 2017 06:34:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49458) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkpTB-0004AK-0d for qemu-devel@nongnu.org; Thu, 24 Aug 2017 06:34:37 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 044FF85541 for ; Thu, 24 Aug 2017 10:34:36 +0000 (UTC) Received: from localhost (ovpn-112-52.ams2.redhat.com [10.36.112.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 288547F56A; Thu, 24 Aug 2017 10:34:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 044FF85541 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 24 Aug 2017 12:33:48 +0200 Message-Id: <20170824103350.16400-13-marcandre.lureau@redhat.com> In-Reply-To: <20170824103350.16400-1-marcandre.lureau@redhat.com> References: <20170824103350.16400-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 24 Aug 2017 10:34:36 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 12/14] qlit: improve QLit list vs qlist comparison X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Check that the QLit list has the same size as the qlist, this should ensure that we have an exact match when iterating over qlist for comparing the elements. Signed-off-by: Marc-Andr=C3=A9 Lureau --- qobject/qlit.c | 39 ++++++++++++++++++++++++++------------- tests/check-qlit.c | 3 +++ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/qobject/qlit.c b/qobject/qlit.c index 45ae0635c0..0a60802d74 100644 --- a/qobject/qlit.c +++ b/qobject/qlit.c @@ -67,6 +67,28 @@ end: return success; } =20 +static bool qlit_equal_qlist(const QLitObject *lhs, const QList *qlist) +{ + QListCompareHelper helper; + int i; + + for (i =3D 0; lhs->value.qlist[i].type !=3D QTYPE_NONE; i++) { + continue; + } + + if (qlist_size(qlist) !=3D i) { + return false; + } + + helper.index =3D 0; + helper.objs =3D lhs->value.qlist; + helper.result =3D true; + + qlist_iter(qlist, compare_helper, &helper); + + return helper.result; +} + bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs) { int64_t val; @@ -82,21 +104,12 @@ bool qlit_equal_qobject(const QLitObject *lhs, const Q= Object *rhs) val =3D qnum_get_int(qobject_to_qnum(rhs)); return lhs->value.qnum =3D=3D val; case QTYPE_QSTRING: - return (strcmp(lhs->value.qstr, - qstring_get_str(qobject_to_qstring(rhs))) =3D=3D 0); + return g_str_equal(lhs->value.qstr, + qstring_get_str(qobject_to_qstring(rhs))); case QTYPE_QDICT: return qlit_equal_qdict(lhs, qobject_to_qdict(rhs)); - case QTYPE_QLIST: { - QListCompareHelper helper; - - helper.index =3D 0; - helper.objs =3D lhs->value.qlist; - helper.result =3D true; - - qlist_iter(qobject_to_qlist(rhs), compare_helper, &helper); - - return helper.result; - } + case QTYPE_QLIST: + return qlit_equal_qlist(lhs, qobject_to_qlist(rhs)); case QTYPE_QNULL: return true; default: diff --git a/tests/check-qlit.c b/tests/check-qlit.c index 5d9558dfd9..ae74bfcb83 100644 --- a/tests/check-qlit.c +++ b/tests/check-qlit.c @@ -58,6 +58,9 @@ static void qlit_equal_qobject_test(void) =20 g_assert(!qlit_equal_qobject(&qlit_foo, qobj)); =20 + qdict_put(qobject_to_qdict(qobj), "bee", qlist_new()); + g_assert(!qlit_equal_qobject(&qlit, qobj)); + qobject_decref(qobj); } =20 --=20 2.14.1.146.gd35faa819