From patchwork Fri Aug 11 14:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3318 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:ed0c:b0:d7:3b0f:3938 with SMTP id oy12csp1444432dyb; Fri, 11 Aug 2023 07:53:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF8YWYo9rKUtumfGwZYsuwBQkCkeY6LBBpR//XZctpocHIyeUMIwtq4xvTp2ZXW3MVJcCBb X-Received: by 2002:a05:6870:e249:b0:1be:d9cc:d902 with SMTP id d9-20020a056870e24900b001bed9ccd902mr2211032oac.57.1691765604050; Fri, 11 Aug 2023 07:53:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691765604; cv=none; d=google.com; s=arc-20160816; b=cOoY2duqlNAKuZh4nfiXfQHTXhDinU4z6XginHgUv22NriyUEzOGCJgzYBZTm0IfQr z68g2S1Gg9e011qaHxUmARmjnybAvXhxogTs/dVwYIv3k7c5IeTUTRjPCQmkD8u4SgmD dkbTwi7O8L+QhzGklA1P81h3m3HhHh7WuKZJD6YRtbE8mwR83XVf8v08i9VDa2RPamJU EX2fIMkIbaybJEN8gH9yD53TmO3yILXu1s3+B+2y9Pjl1FgR9p0fbN+FBfCz4woeFVoD e4DEmlYL1rJvAqepM024qSPTEkEaltL1O3WsT/UN7pYTLls+sdqgAR6YNlJ3A94G27xM 78jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:in-reply-to:auto-submitted:to :date:from:dkim-signature:dkim-signature:dkim-signature; bh=VbpIp/d3dkPDU/RE/zfpAjxHLJrDWCBavLgLy5CtA3Y=; fh=+8LxD9Vc3yI9hgcq3+xqDghopRBOfNB6Jm6HpqQvs2Y=; b=Dq2a6+nKEJ+YlO16JLEHLRzfmfh7XNeR7xHlsIQ88QYdWPwzmBrhInAlC6ZIq4ckCk E/EvlzY9SCvkNayQ8B5haQAJ0QNgSYQLSBnJQxPgK4JGR1RAHsdYbhnerasUDeP1JTbr d8tytqCUqrHIMxPKYPA0aQf4SBqCckhMqzpLiULWwNe5cyTVWvUQ11IUnjXqqqeCRjhU ysWEe8gRSltL6KzmQL6pIoT0U18doE7j7zfbMQNRENNpNAMagmhMOrhoA7ALlSXyCXk0 KsBI/RlhUcvsuHQDBEeoIIt96A/XhJvDBf6BbrsrJuvqXva3MRRGYs91GWEY3gd5+zDu h8TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=PuZZyHZb; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="Q/QR5blG"; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=Bxuvm7eE; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id y24-20020a170902b49800b001bb8c814915si3354002plr.83.2023.08.11.07.53.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Aug 2023 07:53:24 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=PuZZyHZb; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="Q/QR5blG"; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=Bxuvm7eE; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1qUTVh-0007MJ-Ee; Fri, 11 Aug 2023 14:53:06 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qUTVg-0007MD-6K for openvpn-devel@lists.sourceforge.net; Fri, 11 Aug 2023 14:53:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:In-Reply-To:Subject:List-Unsubscribe:List-Id: Cc:To:Date:From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Help:List-Subscribe :List-Post:List-Owner:List-Archive; bh=x0+gMi9PtuPwhiG1oPsaUz+dkff0gMK8kPmeZEMr8uQ=; b=PuZZyHZbk2Smn+uXjgduBI6J62 fYgg02qE7cArsgZz/ETYDu1L1x9SQXmp9OCesjbXW8JHpQNlxubTv59prN4Y9iL/Lnrs12qNMQv7R 9kWX7eGbb07kjFo6PtTjLnGiHH5gb2ZVSpL7XHXJUULxWq38i92/tWQr+AfKmL9v7jPo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:In-Reply-To:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From: Sender:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=x0+gMi9PtuPwhiG1oPsaUz+dkff0gMK8kPmeZEMr8uQ=; b=Q /QR5blGeiBHDsmy5oGBL4tRTT0Rm2zDKZIXe0QNkVATwKV2EAVDt26NkFvv+BGzK5S0CO4Nf7QQkH PrdK3TmaOfTCjzc/9g9GsaRTni7RA2OXvD8kN4sr1UV2dYFJ2zCL6rJoYUMHBIEyti1B9vYs37dUx Jv6CDXSnX1tZh9bY=; Received: from mail-wm1-f48.google.com ([209.85.128.48]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qUTVb-002ar4-Ib for openvpn-devel@lists.sourceforge.net; Fri, 11 Aug 2023 14:53:05 +0000 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-3fe1fc8768aso19517335e9.1 for ; Fri, 11 Aug 2023 07:52:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1691765573; x=1692370373; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:in-reply-to:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=x0+gMi9PtuPwhiG1oPsaUz+dkff0gMK8kPmeZEMr8uQ=; b=Bxuvm7eEJF96cLt1SY0gW+6fZpdfPEc8Rn0ciu93aAFOA+NeWq3SL6n7jed2ZNt/4B sL3gTOF8FxVN2Iv5QZJtdC1AkuF96EoBfsQpWI3CRWZ5hKzgTCRKUDWYwEXReddJGAHj HRTqVY4SpJUvrhZdsXVaupmdtixj4d+NggRiGVdX4U2XkvxAuxzuZWSbqfP2GF6MeCs8 ezq3qCQfx398QEhjuu9yjuM5QnEUsQPU7Abhi0xID9WEiE55EIBF9G0CR40FeWDS1Hga Ueh7tDpwKk/TTZbM1Nz2QyFswZloKiTwwrzw2GFvMUOZb+M+AxYceZ8ECTUhWHz+GoPQ Ling== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691765573; x=1692370373; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:in-reply-to:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=x0+gMi9PtuPwhiG1oPsaUz+dkff0gMK8kPmeZEMr8uQ=; b=ikkncOoBpDhQGX4mBO/Z1jqfgYm5aPMzQTapHEL8VYKTf4BH+7k4NAWi35YQ6wJ0EI beRSgUI2MPKNRnwlSf6Qd107HrAJLeaxDv4/htGZWxdKW5E2ZDWGK4kViuGhYRZPI3m8 PoiIThsFwo7b9f0y8/z/p5S1StFc4j4ipGI+Os9VTCw5MOVsXgiE18ake0MqJrK59+c/ glxH20nkB3Knz8/hWrZX+oVaisJVY2TvtNblqPt2E0hTdaPQueypEC/E8XJSS6Hg5y3N lXhpGI80JgIFSxe59X+ZkEFt6E7HVW9TMCKINOZ4rckSkbCa4T1vdWUd4tlzRTegMYP6 VU9w== X-Gm-Message-State: AOJu0YxkiTLXrDvpPU1SSHJTgVlbFeCv1Tj5UfmYJVTuBiEen0IZzY4A RvENRiGamVtWQm1Jo2fufg6x8UnhE5Xs+Z9+Cek= X-Received: by 2002:a7b:cc1a:0:b0:3f9:255e:ee3b with SMTP id f26-20020a7bcc1a000000b003f9255eee3bmr1733567wmh.30.1691765572921; Fri, 11 Aug 2023 07:52:52 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id t15-20020a7bc3cf000000b003fe601a7d46sm8405684wmj.45.2023.08.11.07.52.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 07:52:52 -0700 (PDT) From: "cron2 (Code Review)" X-Google-Original-From: "cron2 (Code Review)" X-Gerrit-PatchSet: 2 Date: Fri, 11 Aug 2023 14:52:51 +0000 To: flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: merged X-Gerrit-Change-Id: I9f9d0f0d5ab03f8cdfd7ba7200f2d56613cc586d X-Gerrit-Change-Number: 320 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: f7c8cc092b8b6f5659cf8abd8d8624fc16f3dda2 In-Reply-To: References: Message-ID: <882978641c96477f108b1c7397b5a36901ea9f5d-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.0 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/320?usp=email ) Change subject: options: Do not hide variables from parent scope Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.48 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.48 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1qUTVb-002ar4-Ib Subject: [Openvpn-devel] [XS] Change in openvpn[master]: options: Do not hide variables from parent scope X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel , plaisthos Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1772669982005465295?= X-GMAIL-MSGID: =?utf-8?q?1773944810028582932?= cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/320?usp=email ) Change subject: options: Do not hide variables from parent scope ...................................................................... options: Do not hide variables from parent scope msglevel hides the function parameter of the same name, which could lead to confusion. Use a unique name. Change-Id: I9f9d0f0d5ab03f8cdfd7ba7200f2d56613cc586d Signed-off-by: Frank Lichtenheld Acked-by: Lev Stipakov Message-Id: URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26902.html Signed-off-by: Gert Doering --- M src/openvpn/options.c 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 90d85be..d168163 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -9476,24 +9476,24 @@ else { int i; - int msglevel = msglevel_fc; + int msglevel_unknown = msglevel_fc; /* Check if an option is in --ignore-unknown-option and * set warning level to non fatal */ for (i = 0; options->ignore_unknown_option && options->ignore_unknown_option[i]; i++) { if (streq(p[0], options->ignore_unknown_option[i])) { - msglevel = M_WARN; + msglevel_unknown = M_WARN; break; } } if (file) { - msg(msglevel, "Unrecognized option or missing or extra parameter(s) in %s:%d: %s (%s)", file, line, p[0], PACKAGE_VERSION); + msg(msglevel_unknown, "Unrecognized option or missing or extra parameter(s) in %s:%d: %s (%s)", file, line, p[0], PACKAGE_VERSION); } else { - msg(msglevel, "Unrecognized option or missing or extra parameter(s): --%s (%s)", p[0], PACKAGE_VERSION); + msg(msglevel_unknown, "Unrecognized option or missing or extra parameter(s): --%s (%s)", p[0], PACKAGE_VERSION); } } err: