From 4b4f6ff7f933ddd8e767d2a5add927f435edd50c Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Fri, 28 Jul 2023 14:50:16 +0200 Subject: [PATCH] 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 (cherry picked from commit f7c8cc092b8b6f5659cf8abd8d8624fc16f3dda2) --- src/openvpn/options.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index efddc58907f..2c51efa6bc3 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -9478,24 +9478,24 @@ add_option(struct options *options, 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: