From patchwork Fri Dec 22 01:23:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82722 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 1219A3858296 for ; Fri, 22 Dec 2023 01:24:53 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 1AFB43858408 for ; Fri, 22 Dec 2023 01:24:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1AFB43858408 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 1AFB43858408 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208263; cv=none; b=Ei0bue/WODuouht8KGfb9FM7S6F924EjbimloQXb+G2D4rGhaDoqwaUrAH+0X0T+VmhjIkGMShS2JY0NQEmStv9U7VzYHzLrsXvLNL/++wD9yDmoocxQ8NdRrI9e1vYGdFGdPPCIP1gwxM3NOR662lhljvVy0Tu/pr02SkUHeFs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208263; c=relaxed/simple; bh=k8MsMudkNZGlpUhSwOraa4wdNUSbRU5o/SLVGiJnnRw=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=HBs7/ihf72Pa/JcXwpQOR00hGwe3/QoDxi6K7k/kUcjq6CEMo8kmchdoOEDrJ0I4Cb4QHb7O2WawaFv0F7syqn7caHY+eWbrCD8FsOpOwUG2WBrp9s2gMzi8/o5tVqa0TTPfvDkwCNRnTbzEcqBU/QUCRcqnDKV8/YKPpT2YdKM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id BD053342FF7; Fri, 22 Dec 2023 01:24:20 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 12/15] sim: ppc: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:52 -0500 Message-ID: <20231222012355.7504-12-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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 Use a local name in the macro to avoid shadowing wherever it's used. --- sim/ppc/debug.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sim/ppc/debug.h b/sim/ppc/debug.h index 08ea5795fd89..28e42c7bb753 100644 --- a/sim/ppc/debug.h +++ b/sim/ppc/debug.h @@ -125,14 +125,14 @@ do { \ #define DITRACE(OBJECT, ARGS) \ do { \ if (WITH_TRACE) { \ - device *me = device_instance_device(instance); \ - int trace_device = device_trace(me); \ + device *_me = device_instance_device(instance); \ + int trace_device = device_trace(_me); \ if (ppc_trace[trace_devices] \ || ppc_trace[trace_##OBJECT##_device] \ || trace_device) { \ sim_io_printf_filtered("%s:%d:%s:%s%s ", \ filter_filename(__FILE__), __LINE__, #OBJECT, \ - trace_device ? device_path(me) : "", \ + trace_device ? device_path(_me) : "", \ trace_device ? ":" : ""); \ sim_io_printf_filtered ARGS; \ } \