Browse code
route: avoid definition of unused variables in certain configurations
Although this patch adds more ifdefs, this is an easy
fix towards a no-warning-build process.
A proper cleanup should be carried out later on route.c.
Signed-off-by: Antonio Quartulli <antonio@openvpn.net>
Reviewed-by: Steffan Karger <steffan.karger@fox-it.com>
Acked-by: David Sommerseth <davids@openvpn.net>
Message-Id: <20170816125504.21181-1-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15272.html
Signed-off-by: David Sommerseth <davids@openvpn.net>
Antonio Quartulli authored on 2017/08/16 21:55:04Showing 1 changed files
| ... | ... |
@@ -1530,7 +1530,9 @@ add_route(struct route_ipv4 *r, |
| 1530 | 1530 |
struct gc_arena gc; |
| 1531 | 1531 |
struct argv argv = argv_new(); |
| 1532 | 1532 |
const char *network; |
| 1533 |
+#if !defined(ENABLE_IPROUTE) && !defined(TARGET_AIX) |
|
| 1533 | 1534 |
const char *netmask; |
| 1535 |
+#endif |
|
| 1534 | 1536 |
const char *gateway; |
| 1535 | 1537 |
bool status = false; |
| 1536 | 1538 |
int is_local_route; |
| ... | ... |
@@ -1543,7 +1545,9 @@ add_route(struct route_ipv4 *r, |
| 1543 | 1543 |
gc_init(&gc); |
| 1544 | 1544 |
|
| 1545 | 1545 |
network = print_in_addr_t(r->network, 0, &gc); |
| 1546 |
+#if !defined(ENABLE_IPROUTE) && !defined(TARGET_AIX) |
|
| 1546 | 1547 |
netmask = print_in_addr_t(r->netmask, 0, &gc); |
| 1548 |
+#endif |
|
| 1547 | 1549 |
gateway = print_in_addr_t(r->gateway, 0, &gc); |
| 1548 | 1550 |
|
| 1549 | 1551 |
is_local_route = local_route(r->network, r->netmask, r->gateway, rgi); |
| ... | ... |
@@ -2132,8 +2136,12 @@ delete_route(struct route_ipv4 *r, |
| 2132 | 2132 |
struct gc_arena gc; |
| 2133 | 2133 |
struct argv argv = argv_new(); |
| 2134 | 2134 |
const char *network; |
| 2135 |
+#if !defined(ENABLE_IPROUTE) && !defined(TARGET_AIX) |
|
| 2135 | 2136 |
const char *netmask; |
| 2137 |
+#endif |
|
| 2138 |
+#if !defined(TARGET_LINUX) && !defined(TARGET_ANDROID) |
|
| 2136 | 2139 |
const char *gateway; |
| 2140 |
+#endif |
|
| 2137 | 2141 |
int is_local_route; |
| 2138 | 2142 |
|
| 2139 | 2143 |
if ((r->flags & (RT_DEFINED|RT_ADDED)) != (RT_DEFINED|RT_ADDED)) |
| ... | ... |
@@ -2144,8 +2152,12 @@ delete_route(struct route_ipv4 *r, |
| 2144 | 2144 |
gc_init(&gc); |
| 2145 | 2145 |
|
| 2146 | 2146 |
network = print_in_addr_t(r->network, 0, &gc); |
| 2147 |
+#if !defined(ENABLE_IPROUTE) && !defined(TARGET_AIX) |
|
| 2147 | 2148 |
netmask = print_in_addr_t(r->netmask, 0, &gc); |
| 2149 |
+#endif |
|
| 2150 |
+#if !defined(TARGET_LINUX) && !defined(TARGET_ANDROID) |
|
| 2148 | 2151 |
gateway = print_in_addr_t(r->gateway, 0, &gc); |
| 2152 |
+#endif |
|
| 2149 | 2153 |
|
| 2150 | 2154 |
is_local_route = local_route(r->network, r->netmask, r->gateway, rgi); |
| 2151 | 2155 |
if (is_local_route == LR_ERROR) |