From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4ADFDC47255 for ; Sun, 10 May 2020 01:33:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1010120731 for ; Sun, 10 May 2020 01:33:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com header.b="H4Mdutyz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1010120731 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXaqi-0000Zr-99 for qemu-devel@archiver.kernel.org; Sat, 09 May 2020 21:33:48 -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: 8bit 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 *parent, const gchar *part) static Object *object_resolve_abs_path(Object *parent, gchar **parts, - const char *typename, - int index) + const char *typename) { Object *child; - if (parts[index] == NULL) { + if (*parts == NULL) { return object_dynamic_cast(parent, typename); } - if (strcmp(parts[index], "") == 0) { - return object_resolve_abs_path(parent, parts, typename, index + 1); + if (strcmp(*parts, "") == 0) { + return object_resolve_abs_path(parent, parts + 1, typename); } - child = object_resolve_path_component(parent, parts[index]); + child = object_resolve_path_component(parent, *parts); if (!child) { return NULL; } - return object_resolve_abs_path(child, parts, typename, index + 1); + return object_resolve_abs_path(child, parts + 1, typename); } static Object *object_resolve_partial_path(Object *parent, @@ -2042,7 +2041,7 @@ static Object *object_resolve_partial_path(Object *parent, GHashTableIter iter; ObjectProperty *prop; - obj = object_resolve_abs_path(parent, parts, typename, 0); + obj = object_resolve_abs_path(parent, parts, typename); 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, const char *typename, *ambiguousp = ambiguous; } } else { - obj = object_resolve_abs_path(object_get_root(), parts, typename, 1); + obj = object_resolve_abs_path(object_get_root(), parts + 1, typename); } g_strfreev(parts); -- 2.25.1