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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5A6C9E743EC for ; Fri, 29 Sep 2023 06:08:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm6fR-0006va-D9; Fri, 29 Sep 2023 02:08:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm6fQ-0006vN-Lq; Fri, 29 Sep 2023 02:08:00 -0400 Received: from gandalf.ozlabs.org ([150.107.74.76]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm6fO-0000v8-0e; Fri, 29 Sep 2023 02:08:00 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4Rxfyp0qgqz4x80; Fri, 29 Sep 2023 16:07:46 +1000 (AEST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rxfyl2W1Qz4x5J; Fri, 29 Sep 2023 16:07:43 +1000 (AEST) Message-ID: Date: Fri, 29 Sep 2023 08:07:39 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [PATCH 8/8] spapr/drc: Clean up local variable shadowing in prop_get_fdt() To: Markus Armbruster , Harsh Prateek Bora Cc: Harsh Prateek Bora , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Daniel Henrique Barboza , David Gibson , Nicholas Piggin References: <20230918145850.241074-1-clg@kaod.org> <20230918145850.241074-9-clg@kaod.org> <660b5c89-d219-1e20-9fa5-1b7c390a2f1b@linux.ibm.com> <87v8btk07f.fsf@pond.sub.org> Content-Language: en-US From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= In-Reply-To: <87v8btk07f.fsf@pond.sub.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=150.107.74.76; envelope-from=SRS0=Yu9m=FN=kaod.org=clg@ozlabs.org; helo=gandalf.ozlabs.org X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NICE_REPLY_A=-1.473, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 9/29/23 07:39, Markus Armbruster wrote: > Harsh Prateek Bora writes: > >> On Tue, 19 Sept, 2023, 5:39 pm Cédric Le Goater, wrote: >> >>> On 9/19/23 10:48, Harsh Prateek Bora wrote: >>>> >>>> >>>> On 9/18/23 20:28, Cédric Le Goater wrote: >>>>> Rename 'name' variable to avoid this warning : >>>>> >>>>> ../hw/ppc/spapr_drc.c: In function ‘prop_get_fdt’: >>>>> ../hw/ppc/spapr_drc.c:344:21: warning: declaration of ‘name’ shadows >>> a parameter [-Wshadow=compatible-local] >>>>> 344 | const char *name = NULL; >>>>> | ^~~~ >>>>> ../hw/ppc/spapr_drc.c:325:63: note: shadowed declaration is here >>>>> 325 | static void prop_get_fdt(Object *obj, Visitor *v, const char >>> *name, >>>>> | >>> ~~~~~~~~~~~~^~~~ >>>>> >>>>> Signed-off-by: Cédric Le Goater >>>>> --- >>>>> hw/ppc/spapr_drc.c | 10 +++++----- >>>>> 1 file changed, 5 insertions(+), 5 deletions(-) >>>>> >>>>> diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c >>>>> index 843e318312d3..2b99d3b4b1a6 100644 >>>>> --- a/hw/ppc/spapr_drc.c >>>>> +++ b/hw/ppc/spapr_drc.c >>>>> @@ -341,7 +341,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, >>> const char *name, >>>>> fdt_depth = 0; >>>>> do { >>>>> - const char *name = NULL; >>>>> + const char *dt_name = NULL; >>>> >>>> I guess you wanted to use the input arg "name" here without >>> re-declaration. >>> >>> I don't understand. I don't want to use the input arg "name" here. >>> It seems useless in this case. >>> >> >> Yeh, I realize now. This patch can actually remove the unused arg "name" as >> well? > > Cédric? > > Lose ends like this one make me reluctant to queue a series, even when > they look minor to me. Unfortunately, we can not remove the unused arg "name" from the prototype. The routine is a ObjectPropertyAccessor argument of object_property_add(). Thanks, C. > >>> C. >>> >>>> I do not see "name" being used elsewhere in this routine. >>>> >>>> regards, >>>> Harsh >>>>> const struct fdt_property *prop = NULL; >>>>> int prop_len = 0, name_len = 0; >>>>> uint32_t tag; >>>>> @@ -351,8 +351,8 @@ static void prop_get_fdt(Object *obj, Visitor *v, >>> const char *name, >>>>> switch (tag) { >>>>> case FDT_BEGIN_NODE: >>>>> fdt_depth++; >>>>> - name = fdt_get_name(fdt, fdt_offset, &name_len); >>>>> - if (!visit_start_struct(v, name, NULL, 0, errp)) { >>>>> + dt_name = fdt_get_name(fdt, fdt_offset, &name_len); >>>>> + if (!visit_start_struct(v, dt_name, NULL, 0, errp)) { >>>>> return; >>>>> } >>>>> break; >>>>> @@ -369,8 +369,8 @@ static void prop_get_fdt(Object *obj, Visitor *v, >>> const char *name, >>>>> case FDT_PROP: { >>>>> int i; >>>>> prop = fdt_get_property_by_offset(fdt, fdt_offset, >>> &prop_len); >>>>> - name = fdt_string(fdt, fdt32_to_cpu(prop->nameoff)); >>>>> - if (!visit_start_list(v, name, NULL, 0, errp)) { >>>>> + dt_name = fdt_string(fdt, fdt32_to_cpu(prop->nameoff)); >>>>> + if (!visit_start_list(v, dt_name, NULL, 0, errp)) { >>>>> return; >>>>> } >>>>> for (i = 0; i < prop_len; i++) { >