From nobody Sun May 19 16:58:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1589074432; cv=none; d=zohomail.com; s=zohoarc; b=QXwqj8DBMjH1ztyMrzKBeybuOX8GcDy86awUKF8g5rjLp4dUydAO+Q5a1gJYDxHH9Pe4AWanB1DTktRoZE7m4gBPLncG/FBiDSShu9kOOui9VTc28DuP5b/9ldycVJAHyTPTGpDhNKLwLcMbTMTJjprYocO/5c2kzsq4lUhuLMc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589074432; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=KbpFI1jAE6OftW1TG+fD7c5LM9KgQP75oygUNcgET2w=; b=KDjouqOAx1DVrxjEuY1fC2tPYjHg4Q38bEOs5+MDTqsjdyfyf10oGymQixDmEaEdSvcXU1bheFLfvoPCg7F15Jxmp1GQbBU0UIJs2WDM6qRmgeC5XHkxY4+MnUKpfl7npKfQMi3QjE3zaoeicugfHN3YUy4GcflUQImb9kj29Fw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589074432589700.0774131587862; Sat, 9 May 2020 18:33:52 -0700 (PDT) Received: from localhost ([::1]:52394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXaql-0000Zr-0d for importer@patchew.org; Sat, 09 May 2020 21:33:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXaq7-0008K9-NX for qemu-devel@nongnu.org; Sat, 09 May 2020 21:33:11 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:47399) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXaq5-0001Ir-Me for qemu-devel@nongnu.org; Sat, 09 May 2020 21:33:11 -0400 Received: from oscar.flets-west.jp (softbank126090202047.bbtec.net [126.90.202.47]) (authenticated) by conuserg-07.nifty.com with ESMTP id 04A1WcoN012946; Sun, 10 May 2020 10:32:38 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 04A1WcoN012946 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1589074358; bh=KbpFI1jAE6OftW1TG+fD7c5LM9KgQP75oygUNcgET2w=; h=From:To:Cc:Subject:Date:From; b=H4MdutyzKaK6veMO4/4OQeYJOJyD9S4mvwGFLA6AOGkEa0GJ8+jP2ziwxm2zIJRwc AtLfojoCziDZxpyJxNBFspirc9uICNLvmiIV2wdzwJ+fwrEuBYvLn11Vo/QN28GwpG c0Ejjd6RWFG/J+jSTGxmNpCkYeC8ZuDqc64kQPfNJM8y98N6g671eoKRb/g379n5qG 1I1IYspA55YFzXC02+x48FGEl8i2C/2m8yNdxhzTOEdmCmPgszhYhX5q7ZQWnN1QnE UiLzGb/6sxut5TIvihBrYuIPL1vsI6RwJzl8DnIZOxVoAF7Ctv3Az+jBA5JE5dwDL+ Nr4PYZvH5aThQ== X-Nifty-SrcIP: [126.90.202.47] From: Masahiro Yamada To: qemu-devel@nongnu.org, Paolo Bonzini , "Daniel P . Berrange" , Eduardo Habkost Subject: [PATCH] qom: remove index from object_resolve_abs_path() Date: Sun, 10 May 2020 10:32:35 +0900 Message-Id: <20200510013235.954906-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=210.131.2.74; envelope-from=masahiroy@kernel.org; helo=conuserg-07.nifty.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/09 21:33:05 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_BL=0.001, RCVD_IN_MSPIKE_L3=0.001, SPF_SOFTFAIL=0.665, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Masahiro Yamada Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @nifty.com) Content-Type: text/plain; charset="utf-8" You can advance 'parts' to track the current path fragment. The 'index' parameter is unneeded. Signed-off-by: Masahiro Yamada --- qom/object.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/qom/object.c b/qom/object.c index aa8a3f24e6..a3ee968b12 100644 --- a/qom/object.c +++ b/qom/object.c @@ -2012,25 +2012,24 @@ Object *object_resolve_path_component(Object *paren= t, const gchar *part) =20 static Object *object_resolve_abs_path(Object *parent, gchar **parts, - const char *typename, - int index) + const char *typename) { Object *child; =20 - if (parts[index] =3D=3D NULL) { + if (*parts =3D=3D NULL) { return object_dynamic_cast(parent, typename); } =20 - if (strcmp(parts[index], "") =3D=3D 0) { - return object_resolve_abs_path(parent, parts, typename, index + 1); + if (strcmp(*parts, "") =3D=3D 0) { + return object_resolve_abs_path(parent, parts + 1, typename); } =20 - child =3D object_resolve_path_component(parent, parts[index]); + child =3D object_resolve_path_component(parent, *parts); if (!child) { return NULL; } =20 - return object_resolve_abs_path(child, parts, typename, index + 1); + return object_resolve_abs_path(child, parts + 1, typename); } =20 static Object *object_resolve_partial_path(Object *parent, @@ -2042,7 +2041,7 @@ static Object *object_resolve_partial_path(Object *pa= rent, GHashTableIter iter; ObjectProperty *prop; =20 - obj =3D object_resolve_abs_path(parent, parts, typename, 0); + obj =3D object_resolve_abs_path(parent, parts, typename); =20 g_hash_table_iter_init(&iter, parent->properties); while (g_hash_table_iter_next(&iter, NULL, (gpointer *)&prop)) { @@ -2087,7 +2086,7 @@ Object *object_resolve_path_type(const char *path, co= nst char *typename, *ambiguousp =3D ambiguous; } } else { - obj =3D object_resolve_abs_path(object_get_root(), parts, typename= , 1); + obj =3D object_resolve_abs_path(object_get_root(), parts + 1, type= name); } =20 g_strfreev(parts); --=20 2.25.1