aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Lichtenheld2023-07-28 14:50:16 +0200
committerGert Doering2023-08-11 16:48:40 +0200
commit4b4f6ff7f933ddd8e767d2a5add927f435edd50c (patch)
tree7862377dfb5182264f2f3d59c7d31cf4ff067f31
parent64a75e75b8929f1290ba984f60d0c13447a41407 (diff)
downloadopenvpn-4b4f6ff7f933ddd8e767d2a5add927f435edd50c.zip
openvpn-4b4f6ff7f933ddd8e767d2a5add927f435edd50c.tar.gz
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 <frank@lichtenheld.com> Acked-by: Lev Stipakov <lstipakov@gmail.com> Message-Id: <d549c9b5e5d66624ef82f99206898ff8e43a5fb5-HTML@gerrit.openvpn.net> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26902.html Signed-off-by: Gert Doering <gert@greenie.muc.de> (cherry picked from commit f7c8cc092b8b6f5659cf8abd8d8624fc16f3dda2)
-rw-r--r--src/openvpn/options.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index efddc58..2c51efa 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: