From patchwork Mon Sep 4 16:12:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 719989 Delivered-To: patch@linaro.org Received: by 2002:adf:d08b:0:b0:31d:da82:a3b4 with SMTP id y11csp1686362wrh; Mon, 4 Sep 2023 09:15:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHtxgTy2vmzMs0IRqlH71qfgpAUT4gb5zbPNALnwdRE39A2gqeqimTICaZKyctHl3cJ7rpF X-Received: by 2002:a05:620a:370d:b0:765:8204:dd64 with SMTP id de13-20020a05620a370d00b007658204dd64mr11014853qkb.7.1693844122971; Mon, 04 Sep 2023 09:15:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693844122; cv=none; d=google.com; s=arc-20160816; b=An0dq3oEKb9RbSuH4MaLjOiqutfkl2IbO+avWjPBcSxGtkNjO7am5Y0/pkfEAB9i+4 ByFShmUtNxpieE4ziStwKYjq8ZYc8qIvZF2xay8qajWWPqdOaGq8vdEKjIMYLBcUQ1j2 O/yHPvofQMT/WnHezH61nl7kFwO1dUJsOnAL+pQYj8ZynHkh9KOEKMgCW0tUXIC9BPGH v1zrypJUgauqHZXfOeTeG/YRPorBwrp0mHJKGCEo5P9FS4ZW6TMJXywlBYU+21/Jehco kj6G91HR0NtXcQJABtv11ZzXwwKCVe4AxISANFZtuzFefxdVwD7bsEaiBSqPm8yqVoXs 8lVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZsTnNe2odIs1TlMwUjNe64GWSQVkGVh+b8/mlWNguvM=; fh=M4+wifAeNQ6fagA7lq67eYgVVAfcj+heqTkZZhMPaG0=; b=v9OyPmSkSU487/+T58NcAocGsZ3etRntSCQ63ZVcjubOf+p8fIfbFLj0ST8x/OXR4n bOYTO14oi0+Ty7XSiwOrBJj7TpoinNh77OffCY6tTen5G3F94bIKsii5TvQSgjnr3Box lPVgy8UcPhHTkDLYR1uPT0sAVSxMXavn8V9nRN6lMCzLqKMAR4SHagcgvtwVBseTfylD cZrEFmtoENO3veWP6/JSpBEQFT6R0hj6BXMc16p2CHWqql99Ufmfmdxw9KBI7Aq3Mlwg TsSYRBdgRVOa77jPBBpbxFvqZ7DEJ+f0mfhaguX/nmimS8TVF4j2L8BFQpfGjOYYWr9E Mr1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g9QVPfK4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d1-20020a05620a240100b0076d1fb36875si7079490qkn.459.2023.09.04.09.15.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Sep 2023 09:15:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g9QVPfK4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdCDf-0005jg-O1; Mon, 04 Sep 2023 12:14:31 -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 1qdCDd-0005aS-7L for qemu-devel@nongnu.org; Mon, 04 Sep 2023 12:14:29 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qdCDa-0007mO-Gf for qemu-devel@nongnu.org; Mon, 04 Sep 2023 12:14:28 -0400 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-9a2185bd83cso241072966b.0 for ; Mon, 04 Sep 2023 09:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693844065; x=1694448865; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZsTnNe2odIs1TlMwUjNe64GWSQVkGVh+b8/mlWNguvM=; b=g9QVPfK4eZnVme7n94l/byTu2MOkqs/7+pfhpNlvhSSd0M99+ZL5OK59FjqmdoEL8u VgHW9cHqYqj5epCqSn1gETL0OQvsBXHUzWJ9bSdMe477etsXWR4ngCOh8yG8kcjd1btS z+U8pqD7Jzmd61Gq6atqUFUEie/q1yoT6sRV9T+gJNbu9k0pwXxwNMgQCzk4llc5AUqN 2DKg+8KUO5DBn607uhsra33KwbegPgKc1NA+tPaA3qDA808Y5abKAyOmGxbyoLdsbMLb xUK0rWmAcu8B5DpFIZaPCmGNoy5MLtK/WqAp2j8MNkvjUVVbNKYiEXJJF7dVjCgSdWo+ VMyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693844065; x=1694448865; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZsTnNe2odIs1TlMwUjNe64GWSQVkGVh+b8/mlWNguvM=; b=D9BqUqh0fqjj645M6D4iBnT/l55VrC3lrM2iYlr+6Xoa6uG43Pl/iPsDL/U51qZtKS k3ktsLaqWhb3shAGF0Z2Bagu5gAssKbrdvFai30o9EK70KSH52eMyt7DW8lL83fPDpox ct964A/JQuq7Dz2AjJ+/0V7eDSU+qBkbTMj5dZS/SMDARIkP2kDF9H27YeKWS26+MDvg sHpJdzsWHipy/BrMz3gJFdJYtSfubSgNvY4iBnSjDUMmv1DnWlEtsY9fYwrHtoKcMlzD KONtlaoQwfROC0LT3mOhMuLHGsflAHZd87pDLnJHWiBnRgC0yF5XezQQ5Bj1w/u3qdoJ a2yQ== X-Gm-Message-State: AOJu0YwL/RKAsmrsp/rCvsy0CdTNBBWcfpxgrBu5cFb1wypM3URg+SV4 fKXA/84EK2c+9l/j017zoumhpQ== X-Received: by 2002:a17:907:75e6:b0:988:9b29:5653 with SMTP id jz6-20020a17090775e600b009889b295653mr6541467ejc.77.1693844065083; Mon, 04 Sep 2023 09:14:25 -0700 (PDT) Received: from m1x-phil.lan ([176.187.209.227]) by smtp.gmail.com with ESMTPSA id f3-20020a170906824300b0099b921de301sm6338473ejx.159.2023.09.04.09.14.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 04 Sep 2023 09:14:24 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Laurent Vivier Subject: [PATCH v2 19/22] linux-user/strace: Clean up local variable shadowing Date: Mon, 4 Sep 2023 18:12:31 +0200 Message-ID: <20230904161235.84651-20-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230904161235.84651-1-philmd@linaro.org> References: <20230904161235.84651-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=philmd@linaro.org; helo=mail-ej1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Fix: linux-user/strace.c: In function ‘print_sockaddr’: linux-user/strace.c:370:17: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local] 370 | int i; | ^ linux-user/strace.c:361:9: note: shadowed declaration is here 361 | int i; | ^ Signed-off-by: Philippe Mathieu-Daudé --- linux-user/strace.c | 1 - 1 file changed, 1 deletion(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index e0ab8046ec..cf26e55264 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -367,7 +367,6 @@ print_sockaddr(abi_ulong addr, abi_long addrlen, int last) switch (sa_family) { case AF_UNIX: { struct target_sockaddr_un *un = (struct target_sockaddr_un *)sa; - int i; qemu_log("{sun_family=AF_UNIX,sun_path=\""); for (i = 0; i < addrlen - offsetof(struct target_sockaddr_un, sun_path) &&