]> git.puffer.fish Git - mirror/frr.git/commitdiff
bgpd: fix failing to compile on 32 bit systems 1594/head
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 4 Jan 2018 10:45:28 +0000 (05:45 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 4 Jan 2018 10:45:28 +0000 (05:45 -0500)
-Werror=sign-compare is failing with signed/unsigned usage
in the conditional expression.

Fixes: #1593
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
bgpd/bgp_route.c

index 64391e9d458038f8aad676a4f7b107e68adf338e..81b605ad79f38addf7caa9ab5863afee0675cb48 100644 (file)
@@ -5068,9 +5068,10 @@ DEFPY(bgp_network,
        }
 
        return bgp_static_set(vty, no, address_str ? addr_prefix_str:prefix_str,
-                            AFI_IP, bgp_node_safi(vty),
-                            map_name, backdoor?1:0,
-                            label_index ? label_index:BGP_INVALID_LABEL_INDEX);
+                             AFI_IP, bgp_node_safi(vty),
+                             map_name, backdoor?1:0,
+                             label_index ?
+                             (uint32_t)label_index : BGP_INVALID_LABEL_INDEX);
 }
 
 DEFPY(ipv6_bgp_network,
@@ -5086,8 +5087,9 @@ DEFPY(ipv6_bgp_network,
        "Label index value\n")
 {
        return bgp_static_set(vty, no, prefix_str, AFI_IP6,
-                            bgp_node_safi(vty), map_name, 0,
-                            label_index ? label_index:BGP_INVALID_LABEL_INDEX);
+                             bgp_node_safi(vty), map_name, 0,
+                             label_index ?
+                             (uint32_t)label_index : BGP_INVALID_LABEL_INDEX);
 }
 
 /* Aggreagete address: