summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2018-04-06 09:18:11 -0700
committerNeale Ranns <nranns@cisco.com>2018-04-12 06:53:38 -0400
commit756cd9441752fc8f84104c9ee19099506ba89f85 (patch)
treeda9afcf137e7cb540713d39a3c5df2b0fdd8ead2 /src/plugins
parent58c711a196d9b178bfe6190964a7df92145cf949 (diff)
Fixes for 'make UNATTENDED=yes CC=clang CXX=clang verify'
Change-Id: I994649761fe2e66e12ae0e49a84fb1d0a966ddfb Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/acl/acl.c1
-rw-r--r--src/plugins/ioam/analyse/ip6/node.c4
-rw-r--r--src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c8
-rw-r--r--src/plugins/lb/lb.c4
-rw-r--r--src/plugins/lb/lb.h2
5 files changed, 9 insertions, 10 deletions
diff --git a/src/plugins/acl/acl.c b/src/plugins/acl/acl.c
index 7d3a8527eac..d95e798eb75 100644
--- a/src/plugins/acl/acl.c
+++ b/src/plugins/acl/acl.c
@@ -1347,7 +1347,6 @@ acl_interface_set_inout_acl_list (acl_main_t * am, u32 sw_if_index,
lc_index =
acl_plugin_get_lookup_context_index (am->interface_acl_user_id,
sw_if_index, is_input);
- ASSERT (lc_index >= 0);
(*pinout_lc_index_by_sw_if_index)[sw_if_index] = lc_index;
}
acl_plugin_set_acl_vec_for_context (lc_index, vec_acl_list_index);
diff --git a/src/plugins/ioam/analyse/ip6/node.c b/src/plugins/ioam/analyse/ip6/node.c
index 6db6355e9f0..902fb9b09ce 100644
--- a/src/plugins/ioam/analyse/ip6/node.c
+++ b/src/plugins/ioam/analyse/ip6/node.c
@@ -424,7 +424,7 @@ ip6_ioam_analyse_register_hbh_handler (u8 option,
{
ip6_ioam_analyser_main_t *am = &ioam_analyser_main;
- ASSERT (option < ARRAY_LEN (am->analyse_hbh_handler));
+ ASSERT ((u32) option < ARRAY_LEN (am->analyse_hbh_handler));
/* Already registered */
if (am->analyse_hbh_handler[option])
@@ -440,7 +440,7 @@ ip6_ioam_analyse_unregister_hbh_handler (u8 option)
{
ip6_ioam_analyser_main_t *am = &ioam_analyser_main;
- ASSERT (option < ARRAY_LEN (am->analyse_hbh_handler));
+ ASSERT ((u32) option < ARRAY_LEN (am->analyse_hbh_handler));
/* Not registered */
if (!am->analyse_hbh_handler[option])
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c
index f3d03b674cc..e758b522ba0 100644
--- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c
@@ -89,7 +89,7 @@ vxlan_gpe_ioam_add_register_option (u8 option,
{
vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
- ASSERT (option < ARRAY_LEN (hm->add_options));
+ ASSERT ((u32) option < ARRAY_LEN (hm->add_options));
/* Already registered */
if (hm->add_options[option])
@@ -106,7 +106,7 @@ vxlan_gpe_add_unregister_option (u8 option)
{
vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
- ASSERT (option < ARRAY_LEN (hm->add_options));
+ ASSERT ((u32) option < ARRAY_LEN (hm->add_options));
/* Not registered */
if (!hm->add_options[option])
@@ -128,7 +128,7 @@ vxlan_gpe_ioam_register_option (u8 option,
{
vxlan_gpe_ioam_main_t *im = &vxlan_gpe_ioam_main;
- ASSERT (option < ARRAY_LEN (im->options));
+ ASSERT ((u32) option < ARRAY_LEN (im->options));
/* Already registered */
if (im->options[option])
@@ -145,7 +145,7 @@ vxlan_gpe_ioam_unregister_option (u8 option)
{
vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
- ASSERT (option < ARRAY_LEN (hm->options));
+ ASSERT ((u32) option < ARRAY_LEN (hm->options));
/* Not registered */
if (!hm->options[option])
diff --git a/src/plugins/lb/lb.c b/src/plugins/lb/lb.c
index 06953a45aaa..090d190e08b 100644
--- a/src/plugins/lb/lb.c
+++ b/src/plugins/lb/lb.c
@@ -625,7 +625,7 @@ static void lb_vip_add_adjacency(lb_main_t *lbm, lb_vip_t *vip)
proto = DPO_PROTO_IP6;
}
- if(lb_vip_is_gre4(vip))
+ if (lb_vip_is_gre4(vip))
dpo_type = lbm->dpo_gre4_type;
else if (lb_vip_is_gre6(vip))
dpo_type = lbm->dpo_gre6_type;
@@ -813,7 +813,7 @@ lb_as_stack (lb_as_t *as)
lb_vip_t *vip = &lbm->vips[as->vip_index];
dpo_type_t dpo_type = 0;
- if(lb_vip_is_gre4(vip))
+ if (lb_vip_is_gre4(vip))
dpo_type = lbm->dpo_gre4_type;
else if (lb_vip_is_gre6(vip))
dpo_type = lbm->dpo_gre6_type;
diff --git a/src/plugins/lb/lb.h b/src/plugins/lb/lb.h
index 8db0394075c..61d17d713a5 100644
--- a/src/plugins/lb/lb.h
+++ b/src/plugins/lb/lb.h
@@ -235,7 +235,7 @@ typedef struct {
|| (vip)->type == LB_VIP_TYPE_IP4_GRE4)
#define lb_vip_is_gre6(vip) ((vip)->type == LB_VIP_TYPE_IP6_GRE6 \
|| (vip)->type == LB_VIP_TYPE_IP4_GRE6)
-#define lb_vip_is_l3dsr(vip) ((vip)->type == LB_VIP_TYPE_IP4_L3DSR)
+#define lb_vip_is_l3dsr(vip) (vip)->type == LB_VIP_TYPE_IP4_L3DSR
#define lb_encap_is_ip4(vip) ((vip)->type == LB_VIP_TYPE_IP6_GRE4 \
|| (vip)->type == LB_VIP_TYPE_IP4_GRE4 \