From nobody Sun Feb 8 17:47:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1569356114; cv=none; d=zoho.com; s=zohoarc; b=VSPtNzsQxltEpDNktAiS91lBIzEP7HoGeBfgwGsv9iZ9BRxaVj9savMyV5KRGN/wvoJwyaUE2H2VGAxN1V5K5C5oypD45GSDP22QA5FKfnh3ZtgM/ZFRtEX7MIKsoF6Pr/PI+qNeS/15At2Ti81IKAZ8ovYI4BPzOfJ7sLa3nqs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569356114; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=PlKZaTtn6QocTrEJbwVoHanT0SQSCakjbvFYVulDCVY=; b=dfqHXXeAzSU6ju2Yk74qs76pHSj7Ic1bJ6+NebJwbgi5aEwk2pdBa/Ivnfldz3JR24HGZnA+cEAvE7kg8C3My59ufaen0TKBK1edbvin+NUobgTddF5KjdtjxwhSsCZoBDZu8OSz8ExnuXRuLm7RFHJ+Uqxib8cO6i2XtS2W/9A= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569356114495988.0223723866625; Tue, 24 Sep 2019 13:15:14 -0700 (PDT) Received: from localhost ([::1]:50620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCrDM-0006cL-KV for importer@patchew.org; Tue, 24 Sep 2019 16:15:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43701) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCr89-0000Uj-7c for qemu-devel@nongnu.org; Tue, 24 Sep 2019 16:09:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCr88-0002rH-3F for qemu-devel@nongnu.org; Tue, 24 Sep 2019 16:09:49 -0400 Received: from relay.sw.ru ([185.231.240.75]:38038) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCr87-0002qf-SB for qemu-devel@nongnu.org; Tue, 24 Sep 2019 16:09:48 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iCr86-0001Mk-Fg; Tue, 24 Sep 2019 23:09:46 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [PATCH v3 03/25] net/net: fix local variable shadowing in net_client_init Date: Tue, 24 Sep 2019 23:08:40 +0300 Message-Id: <20190924200902.4703-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190924200902.4703-1-vsementsov@virtuozzo.com> References: <20190924200902.4703-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , vsementsov@virtuozzo.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Don't shadow Error *err: it's a bad thing. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- net/net.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/net/net.c b/net/net.c index 84aa6d8d00..9e93c3f8a1 100644 --- a/net/net.c +++ b/net/net.c @@ -1126,16 +1126,13 @@ static int net_client_init(QemuOpts *opts, bool is_= netdev, Error **errp) =20 prefix_addr =3D substrings[0]; =20 - if (substrings[1]) { - /* User-specified prefix length. */ - int err; - - err =3D qemu_strtoul(substrings[1], NULL, 10, &prefix_len); - if (err) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - "ipv6-prefixlen", "a number"); - goto out; - } + /* Handle user-specified prefix length. */ + if (substrings[1] && + qemu_strtoul(substrings[1], NULL, 10, &prefix_len)) + { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, + "ipv6-prefixlen", "a number"); + goto out; } =20 qemu_opt_set(opts, "ipv6-prefix", prefix_addr, &error_abort); --=20 2.21.0