From patchwork Fri Sep 29 08:50:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 727622 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp333801wrt; Fri, 29 Sep 2023 01:58:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHmJA5aHLsH/gf5K2MT1d5h0xy9DHZE5i9zYKfRV8oj4ysfqJ/pAOK1ODnR5nwEbUCGB68v X-Received: by 2002:a0c:a899:0:b0:65d:79:b3fe with SMTP id x25-20020a0ca899000000b0065d0079b3femr2878580qva.21.1695977932625; Fri, 29 Sep 2023 01:58:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695977932; cv=none; d=google.com; s=arc-20160816; b=EQ5JNc73qzeGSr1lfjBT94gZUokMlzfxihac35JARayo5bI2+7G0MWOfiHoKcIUw1t D4Mzn0yLQp0bLEgeKMBJyaN15tJHKEO95nXZDkwczvtQKdHXb1VbIc228rN2M17pgodJ 8d8oQ6pg+2PGtGXNwtuXJ54i+nQTl7v7dEZYzSLxaFURtkLRKFxe2xoGDMHakbOi/vZe jxx0V6Q0JGX2LX8boa6t3S/GWhYBNlc8s07cYMfpEmUotahFlL+UeJqA3o+RSkWKZ/32 Wn3ghsCGqWcQQS2xFcaukhgIo6Bb0WDLPBM4ObH4hhcCYzv8kHwMe83p5KqTqP81q8BV rdkg== 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=RblW5yTCxDRLJKGfYdaOTh+OR9JgnGGeaSPLNcKIiEI=; fh=tutAMg9N8A3i2oJMSFm+jg0IS8JudBlOJ2I8jnKxRbA=; b=O4N4B5eLCRWWRmdiBPk5VuU2yLtNQeiwtlT88yNtlPlyTUGViB06dVfdl9HnAMdmDc C2CmuMhmDPK41+aWShXFJSKrR1nFXwz1eawtro0VfUsHP1KwfCZU7GoE1WZ0EHxjxtqn o0ZiVRxxeAvEw0mD/DcpOAtYkckec1WMHEy4AOKP1yDNRA+4U/Qe2rdvpxHrlCwMecH+ Xi5GIH+2ISFw+Nv/xKWVqiXpnTsTQaIqh8r+pKK3LkLXD3dKTeylu81VoNwUoVYWxyCz rcZw/Dgv7Fz4WMOKHs685WzpUrQLmAkkoa3EYc7zylcA8Enk3ouG9el6Nk0lU0XEAhSi CmMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=IFvyYqqs; 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 b2-20020a0c9b02000000b006563c00dc87si5158386qve.342.2023.09.29.01.58.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Sep 2023 01:58:52 -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=IFvyYqqs; 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 1qm9Dg-0005F0-QZ; Fri, 29 Sep 2023 04:51:33 -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 1qm9DX-00055g-CK for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9DC-0005cJ-Qd for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695977460; 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=RblW5yTCxDRLJKGfYdaOTh+OR9JgnGGeaSPLNcKIiEI=; b=IFvyYqqszX13OwwLKTHRJiD5b5shUey++K2sQWRYT5orypy41WdE3yI8HEkFzNWKPVb8ao y2fBjW4bwwrSH8NyNCqG7UBGPHGTa0zocYF/9eTns8oez/aVZN0KO8wtmdSuIHnBjMnwCG guTdd2zkf7OHlbNisFgKgYSofaOtgDs= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-474-4mEqS7yhOa-bqshfaQiCSg-1; Fri, 29 Sep 2023 04:50:58 -0400 X-MC-Unique: 4mEqS7yhOa-bqshfaQiCSg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 03CE31C08974; Fri, 29 Sep 2023 08:50:58 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A0D614171B6; Fri, 29 Sep 2023 08:50:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 896F021E6884; 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?= , Akihiko Odaki , Eric Blake Subject: [PULL 20/56] net/eth: Clean up local variable shadowing Date: Fri, 29 Sep 2023 10:50:17 +0200 Message-ID: <20230929085053.2789105-21-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.7 Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: net/eth.c:435:20: error: declaration shadows a local variable [-Werror,-Wshadow] size_t input_size = iov_size(pkt, pkt_frags); ^ net/eth.c:413:16: note: previous declaration is here size_t input_size = iov_size(pkt, pkt_frags); ^ Suggested-by: Akihiko Odaki Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20230904161235.84651-16-philmd@linaro.org> Reviewed-by: Eric Blake Reviewed-by: Akihiko Odaki Signed-off-by: Markus Armbruster --- net/eth.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/eth.c b/net/eth.c index 649e66bb1f..3f680cc033 100644 --- a/net/eth.c +++ b/net/eth.c @@ -432,8 +432,6 @@ _eth_get_rss_ex_src_addr(const struct iovec *pkt, int pkt_frags, } if (opthdr.type == IP6_OPT_HOME) { - size_t input_size = iov_size(pkt, pkt_frags); - if (input_size < opt_offset + sizeof(opthdr)) { return false; }