cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1619?usp=email )
Change subject: Clarify operator precedence in a & b ? c : d ...................................................................... Clarify operator precedence in a & b ? c : d As suggested by cppcheck. Change-Id: Ia153e0de888c0ee21199b192f3471ce4c08cb5c7 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1619 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg36545.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/error.h M src/openvpn/options.c M src/openvpnserv/common.c 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openvpn/error.h b/src/openvpn/error.h index 1198994..3b742d7 100644 --- a/src/openvpn/error.h +++ b/src/openvpn/error.h @@ -397,7 +397,7 @@ static inline msglvl_t nonfatal(const msglvl_t err) { - return err & M_FATAL ? (err ^ M_FATAL) | M_NONFATAL : err; + return (err & M_FATAL) ? (err ^ M_FATAL) | M_NONFATAL : err; } static inline int diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 713dcf4..b8d0f5a 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -7044,12 +7044,12 @@ if (options->routes->flags & RG_REROUTE_GW) { setenv_int(es, "route_redirect_gateway_ipv4", - options->routes->flags & RG_BLOCK_LOCAL ? 2 : 1); + (options->routes->flags & RG_BLOCK_LOCAL) ? 2 : 1); } if (options->routes_ipv6 && (options->routes_ipv6->flags & RG_REROUTE_GW)) { setenv_int(es, "route_redirect_gateway_ipv6", - options->routes->flags & RG_BLOCK_LOCAL ? 2 : 1); + (options->routes->flags & RG_BLOCK_LOCAL) ? 2 : 1); } #ifdef _WIN32 /* we need this here to handle pushed --redirect-gateway */ diff --git a/src/openvpnserv/common.c b/src/openvpnserv/common.c index f60e2f2..7fc8c14 100644 --- a/src/openvpnserv/common.c +++ b/src/openvpnserv/common.c @@ -276,7 +276,7 @@ const WCHAR *mesg[] = { msg[0], msg[1] }; ReportEvent(hEventSource, - flags & MSG_FLAGS_ERROR ? EVENTLOG_ERROR_TYPE : EVENTLOG_INFORMATION_TYPE, + (flags & MSG_FLAGS_ERROR) ? EVENTLOG_ERROR_TYPE : EVENTLOG_INFORMATION_TYPE, 0, EVT_TEXT_2, NULL, -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1619?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ia153e0de888c0ee21199b192f3471ce4c08cb5c7 Gerrit-Change-Number: 1619 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
