]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
route: Clarify operator precedence in a & b ? c : d
authorFrank Lichtenheld <frank@lichtenheld.com>
Mon, 11 May 2026 20:06:39 +0000 (22:06 +0200)
committerGert Doering <gert@greenie.muc.de>
Tue, 12 May 2026 13:49:49 +0000 (15:49 +0200)
As suggested by cppcheck.

Change-Id: I5c9b54dca0a14688a3bb7798cb086f5bde7311b8
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1668
Message-Id: <20260511200645.24711-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36880.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
src/openvpn/route.c

index 3b18f7405659259f1075ba3989f5a6d30a3720a5..81ce8674651d06f1e498370d969dab4ca79218fa 100644 (file)
@@ -2884,7 +2884,7 @@ do_route_ipv4_service(const bool add, const struct route_ipv4 *r, const struct t
                             .prefix.ipv4.s_addr = htonl(r->network),
                             .gateway.ipv4.s_addr = htonl(r->gateway),
                             .iface = { .index = if_index, .name = "" },
-                            .metric = (r->flags & RT_METRIC_DEFINED ? r->metric : -1) };
+                            .metric = (r->flags & RT_METRIC_DEFINED) ? r->metric : -1 };
 
     netmask_to_netbits(r->network, r->netmask, &msg.prefix_len);
     if (msg.prefix_len == -1)
@@ -2986,7 +2986,7 @@ do_route_ipv6_service(const bool add, const struct route_ipv6 *r, const struct t
                             .prefix_len = r->netbits,
                             .gateway.ipv6 = r->gateway,
                             .iface = { .index = tt->adapter_index, .name = "" },
-                            .metric = ((r->flags & RT_METRIC_DEFINED) ? r->metric : -1) };
+                            .metric = (r->flags & RT_METRIC_DEFINED) ? r->metric : -1 };
 
     if (r->adapter_index) /* vpn server special route */
     {