Looks good, makes sense. Test-compiled locally.
Acked-by: Lev Stipakov <lstipa...@gmail.com>
pe 28. heinäk. 2023 klo 16.10 flichtenheld (Code Review)
(ger...@openvpn.net) kirjoitti:
>
> flichtenheld has uploaded this change for review.
>
> View Change
>
> 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 <fr...@lichtenheld.com>
> ---
> M src/openvpn/options.c
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/20/320/1
>
> 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:
>
> To view, visit change 320. To unsubscribe, or for help writing mail filters,
> visit settings.
>
> Gerrit-Project: openvpn
> Gerrit-Branch: master
> Gerrit-Change-Id: I9f9d0f0d5ab03f8cdfd7ba7200f2d56613cc586d
> Gerrit-Change-Number: 320
> Gerrit-PatchSet: 1
> Gerrit-Owner: flichtenheld <fr...@lichtenheld.com>
> Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
> Gerrit-MessageType: newchange
> _______________________________________________
> Openvpn-devel mailing list
> Openvpn-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/openvpn-devel
--
-Lev
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
