From patchwork Fri Sep 29 08:50:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 727615 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp333038wrt; Fri, 29 Sep 2023 01:56:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHa+n6DZypnZQsvKKNSOF+7YWqZRTRBvVU+DQjAyz6eWImvF3u0pynyUgCGQgVgSs11YYx8 X-Received: by 2002:a05:620a:2913:b0:775:9032:45c4 with SMTP id m19-20020a05620a291300b00775903245c4mr1023306qkp.8.1695977767609; Fri, 29 Sep 2023 01:56:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695977767; cv=none; d=google.com; s=arc-20160816; b=XShnjLINU8fe0hdKLurN6XfYngOSX/mMUt0nhwke8CLMCz8IPWIClkuE1tHxJVH8IS yp1qqk+A/ymwQSBl2SepXNq8cMMoH8xyE8evXP/NAWJOiQNGsUtrIyPYYs5qalHAdUTB wzW+RYGgwrI+IHadvk7l1sCAaAa8LTtXrcm0l4xUi3F9ZkPb5Emr/CtsHPk0Tn9v6L8J G9eW6D58ZxvENT2XS+68fas1V6YG9pMYa24AePe5tYYTUY490b/pHIarm0wf8dpEp+9m YPUh28rPLHUsnfHtcx/Ur7EIypEIm8bnor3tqztJRxpaD3XvqS95SzR1c/ObgevNokEU +j2A== 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=EzuqQcLXPkEwoJkgWGFTACoAmjwA24zZHh83aGo4fhg=; fh=vkIKEHcwKJya0eJ7ZEuSZlQ+z9UQVjOKAU0iaZuC/Ks=; b=MrI1fTfLwndq5GtbRJl317NWNxeNFxOF239PCdhriKHPLYnSq+70RcNzv9tHrVis8k dqG7tM2DTMv+4CdIM4hMzZMEE/0f6k3qj0oIPRiQc1u42rvQhH+G5ZsPaGzsY1ksOTez 2qCA9zZ5HMDndgbr19VebPBC9hj14JFSJ3yhpB+CpqAE2SEesutWk4HWKyjcdzkQ80+Q 1kv+G8A8xrGERR2U/hHcFBTfcA+FB1n0piix2SYMpmqNg2zhv+oPEFQIFiEfsMyrRs+p 9jh/emYw2jk4iW4kKiw1EGuHGslnxgT4dUJykvewQBjJlZeTJ1D2phLccwlla3fvhWwU d3OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=OVuAXnWa; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m1-20020a05620a290100b00773af69e5fesi3028648qkp.124.2023.09.29.01.56.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Sep 2023 01:56:07 -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=@redhat.com header.s=mimecast20190719 header.b=OVuAXnWa; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9Dj-0005Gl-1r; Fri, 29 Sep 2023 04:51:35 -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 1qm9DQ-00050A-VQ for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9DB-0005cg-Pm for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695977461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EzuqQcLXPkEwoJkgWGFTACoAmjwA24zZHh83aGo4fhg=; b=OVuAXnWaRL+awcw95w845dYhzOzbhuc/yTdUVKwnXqdHFrTRkjsJRiYlw0NFzO+R7VACRs mPy9px+rfB9SussUmJtYRodTieUdEK/tmsD7kE2JKrIkxXXDUo4y7VN/spGDs7nU5iHm5W TsPtEhhZa8No098qYOdaXWY89bTPnGE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-693-1RxhfZimOkSXlzdINSbOpg-1; Fri, 29 Sep 2023 04:50:57 -0400 X-MC-Unique: 1RxhfZimOkSXlzdINSbOpg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A8F6A185A79B; Fri, 29 Sep 2023 08:50:56 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 86C29C15BB8; Fri, 29 Sep 2023 08:50:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 91D6A21E6887; Fri, 29 Sep 2023 10:50:53 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 23/56] linux-user/strace: Clean up local variable shadowing Date: Fri, 29 Sep 2023 10:50:20 +0200 Message-ID: <20230929085053.2789105-24-armbru@redhat.com> In-Reply-To: <20230929085053.2789105-1-armbru@redhat.com> References: <20230929085053.2789105-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é Message-ID: <20230904161235.84651-20-philmd@linaro.org> Signed-off-by: Markus Armbruster --- 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) &&