From ffd15463b2f377cf4b2177cfd76ce4e77461ba68 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Tue, 18 Feb 2020 10:12:23 -0500 Subject: [PATCH] misc: fix coverity warnings Type: fix Ticket: VPP-1837 Signed-off-by: Dave Barach Change-Id: I402b1b06db736b2a7a242ce70ffd409c7c0a4fc2 --- src/plugins/gtpu/gtpu.c | 2 +- src/plugins/igmp/igmp_proxy.c | 2 +- src/vnet/bonding/cli.c | 4 ++-- src/vnet/bonding/node.c | 4 ++-- src/vnet/geneve/geneve.c | 2 +- src/vnet/l2/l2_api.c | 2 +- src/vnet/lisp-gpe/lisp_gpe_adjacency.c | 2 +- src/vnet/srmpls/sr_mpls_policy.c | 2 +- src/vnet/vxlan-gbp/vxlan_gbp.c | 2 +- src/vnet/vxlan-gpe/vxlan_gpe.c | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/plugins/gtpu/gtpu.c b/src/plugins/gtpu/gtpu.c index b0d7839f519..0abac0053db 100644 --- a/src/plugins/gtpu/gtpu.c +++ b/src/plugins/gtpu/gtpu.c @@ -341,7 +341,7 @@ mcast_shared_get (ip46_address_t * ip) { ASSERT (ip46_address_is_multicast (ip)); uword *p = hash_get_mem (gtpu_main.mcast_shared, ip); - ASSERT (p); + ALWAYS_ASSERT (p); return (mcast_shared_t) { .as_u64 = *p}; diff --git a/src/plugins/igmp/igmp_proxy.c b/src/plugins/igmp/igmp_proxy.c index c2f3e06fb1f..dc2b4c13791 100644 --- a/src/plugins/igmp/igmp_proxy.c +++ b/src/plugins/igmp/igmp_proxy.c @@ -326,7 +326,7 @@ igmp_proxy_device_merge_group (igmp_proxy_device_t * proxy_device, igmp_src_t *src; proxy_config = igmp_config_lookup (proxy_device->upstream_if); - ASSERT (proxy_config); + ALWAYS_ASSERT (proxy_config); proxy_group = igmp_group_lookup (proxy_config, group->key); if (!proxy_group) diff --git a/src/vnet/bonding/cli.c b/src/vnet/bonding/cli.c index e6d8f1c2bc8..66aaa2e3816 100644 --- a/src/vnet/bonding/cli.c +++ b/src/vnet/bonding/cli.c @@ -78,8 +78,8 @@ bond_slave_sort (void *a1, void *a2) slave_if_t *sif2 = bond_get_slave_by_sw_if_index (*s2); bond_if_t *bif; - ASSERT (sif1); - ASSERT (sif2); + ALWAYS_ASSERT (sif1); + ALWAYS_ASSERT (sif2); /* * sort entries according to preference rules: * 1. biggest weight diff --git a/src/vnet/bonding/node.c b/src/vnet/bonding/node.c index 49c1f28ed06..a606d20f19c 100644 --- a/src/vnet/bonding/node.c +++ b/src/vnet/bonding/node.c @@ -152,11 +152,11 @@ bond_update_next (vlib_main_t * vm, vlib_node_runtime_t * node, *last_slave_sw_if_index = slave_sw_if_index; sif = bond_get_slave_by_sw_if_index (slave_sw_if_index); - ASSERT (sif); + ALWAYS_ASSERT (sif); bif = bond_get_master_by_dev_instance (sif->bif_dev_instance); - ASSERT (bif); + ALWAYS_ASSERT (bif); ASSERT (vec_len (bif->slaves)); if (PREDICT_FALSE (bif->admin_up == 0)) diff --git a/src/vnet/geneve/geneve.c b/src/vnet/geneve/geneve.c index a54a5383c46..501ab7f9845 100644 --- a/src/vnet/geneve/geneve.c +++ b/src/vnet/geneve/geneve.c @@ -335,7 +335,7 @@ mcast_shared_get (ip46_address_t * ip) { ASSERT (ip46_address_is_multicast (ip)); uword *p = hash_get_mem (geneve_main.mcast_shared, ip); - ASSERT (p); + ALWAYS_ASSERT (p); return (mcast_shared_t) { .as_u64 = *p}; diff --git a/src/vnet/l2/l2_api.c b/src/vnet/l2/l2_api.c index fa852742f9f..e73d420914f 100644 --- a/src/vnet/l2/l2_api.c +++ b/src/vnet/l2/l2_api.c @@ -1102,7 +1102,7 @@ l2_arp_term_process (vlib_main_t * vm, vlib_node_runtime_t * rt, ({ vl_api_registration_t *vl_reg; vl_reg = vl_api_client_index_to_registration (reg->client_index); - ASSERT (vl_reg != NULL); + ALWAYS_ASSERT (vl_reg != NULL); if (reg && vl_api_can_send_msg (vl_reg)) { diff --git a/src/vnet/lisp-gpe/lisp_gpe_adjacency.c b/src/vnet/lisp-gpe/lisp_gpe_adjacency.c index d9c22a4bbbb..ffd21a8c13e 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_adjacency.c +++ b/src/vnet/lisp-gpe/lisp_gpe_adjacency.c @@ -264,7 +264,7 @@ lisp_gpe_increment_stats_counters (lisp_cp_main_t * lcm, key.tunnel_index = ladj->tunnel_index; uword *p = hash_get_mem (lgm->lisp_stats_index_by_key, &key); - ASSERT (p); + ALWAYS_ASSERT (p); /* compute payload length starting after GPE */ u32 bytes = b->current_length - (lisp_data - b->data - b->current_data); diff --git a/src/vnet/srmpls/sr_mpls_policy.c b/src/vnet/srmpls/sr_mpls_policy.c index 4fb80e12225..ceff11cbac8 100755 --- a/src/vnet/srmpls/sr_mpls_policy.c +++ b/src/vnet/srmpls/sr_mpls_policy.c @@ -700,7 +700,7 @@ sr_mpls_policy_assign_endpoint_color (mpls_label_t bsid, /* CID 180995 This should never be NULL unless the two hash tables * get out of sync */ - ASSERT (old_value != NULL); + ALWAYS_ASSERT (old_value != NULL); fib_prefix_t pfx = { 0 }; pfx.fp_proto = FIB_PROTOCOL_MPLS; diff --git a/src/vnet/vxlan-gbp/vxlan_gbp.c b/src/vnet/vxlan-gbp/vxlan_gbp.c index 9a8158e9ab0..d17a2c82b02 100644 --- a/src/vnet/vxlan-gbp/vxlan_gbp.c +++ b/src/vnet/vxlan-gbp/vxlan_gbp.c @@ -317,7 +317,7 @@ mcast_shared_get (ip46_address_t * ip) { ASSERT (ip46_address_is_multicast (ip)); uword *p = hash_get_mem (vxlan_gbp_main.mcast_shared, ip); - ASSERT (p); + ALWAYS_ASSERT (p); mcast_shared_t ret = {.as_u64 = *p }; return ret; } diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.c b/src/vnet/vxlan-gpe/vxlan_gpe.c index e5ff4f74295..07b7ac96542 100644 --- a/src/vnet/vxlan-gpe/vxlan_gpe.c +++ b/src/vnet/vxlan-gpe/vxlan_gpe.c @@ -428,7 +428,7 @@ mcast_shared_get (ip46_address_t * ip) { ASSERT (ip46_address_is_multicast (ip)); uword *p = hash_get_mem (vxlan_gpe_main.mcast_shared, ip); - ASSERT (p); + ALWAYS_ASSERT (p); return (mcast_shared_t) { .as_u64 = *p}; -- 2.16.6