From patchwork Fri Dec 22 01:23:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82727 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A289B3865C1D for ; Fri, 22 Dec 2023 01:25:22 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 379213860C2B for ; Fri, 22 Dec 2023 01:24:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 379213860C2B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 379213860C2B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208266; cv=none; b=n3rbA98mMrAplFGaRufqvKumNkvE3gO7iKbuLQHafI/OgU4yU6oWwkFmE4FivaFbfbMb2TAKitUAUziXFCK4E0ycQNHH1khYSPIU0wiILMFHbm94dspVxACM9H018X3J7v3OakiJWUR/1oRS/fmaN1BpH7ApLdwNmScOv+Tyv80= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208266; c=relaxed/simple; bh=eaxcZSxL6HlnOqyc40fbxPI6gUAKIkz/F7ovIBOGel0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=jNvON/tCm3XFC7nQ/ioico7pfiomUl16I4hGjOLkoR46TWmBYqlVVTGpYjK3Aj/rPZ6Ggov3x0q4QUd6T2I1mJ+d4cQ1AmmjltyRQVoDtvu7tSoTB/PhNrcZbfFXAFjif/Y70ASPHyrOifa8aIgClznfHkIGkrS8IIeucGPnCLE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id D9079342FF8; Fri, 22 Dec 2023 01:24:24 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 14/15] sim: sh: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:54 -0500 Message-ID: <20231222012355.7504-14-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231222012355.7504-1-vapier@gentoo.org> References: <20231222012355.7504-1-vapier@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Rename the var to avoid shadowing & clobbering the higher context. --- sim/sh/interp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sim/sh/interp.c b/sim/sh/interp.c index 01d7a1c7be91..bbf26bb11893 100644 --- a/sim/sh/interp.c +++ b/sim/sh/interp.c @@ -1046,8 +1046,8 @@ trap (SIM_DESC sd, int i, int *regs, unsigned char *insn_ptr, if (regs[5] < countargv (prog_argv)) { /* Include the termination byte. */ - int i = strlen (prog_argv[regs[5]]) + 1; - regs[0] = sim_write (0, regs[6], prog_argv[regs[5]], i); + int len = strlen (prog_argv[regs[5]]) + 1; + regs[0] = sim_write (0, regs[6], prog_argv[regs[5]], len); } else regs[0] = -1;