aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2020-04-02 10:44:09 -0400
committerFlorin Coras <florin.coras@gmail.com>2020-04-02 16:08:13 +0000
commitc35f3e835b4078fedabc1ff5013bc4727f533e16 (patch)
treeb2b74b07ffe8aceef372b50fd099ef6fb3a240e6
parent999840cf805f26a490e8e6b8acc1fe7a7c21a181 (diff)
misc: fix static analysis warnings
One actual bugfix. Type: fix Ticket: VPP-1837 Signed-off-by: Dave Barach <dave@barachs.net> Change-Id: Icef25167f97a70cc795c0a481174de319ed79ad5
-rw-r--r--src/svm/svm.c6
-rw-r--r--src/vat/api_format.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/svm/svm.c b/src/svm/svm.c
index c702625db7e..6249a342be2 100644
--- a/src/svm/svm.c
+++ b/src/svm/svm.c
@@ -107,7 +107,7 @@ region_lock (svm_region_t * rp, int tag)
rp->mutex_owner_pid = getpid ();
rp->mutex_owner_tag = tag;
#endif
- ASSERT (nheld < MAXLOCK);
+ ASSERT (nheld < MAXLOCK); //NOSONAR
/*
* Keep score of held mutexes so we can try to exit
* cleanly if the world comes to an end at the worst possible
@@ -746,7 +746,7 @@ svm_map_region (svm_map_region_args_t * a)
return ((void *) rp);
}
- return 0; /* NOTREACHED */
+ return 0; /* NOTREACHED *///NOSONAR
}
static void
@@ -755,7 +755,7 @@ svm_mutex_cleanup (void)
int i;
for (i = 0; i < nheld; i++)
{
- pthread_mutex_unlock (mutexes_held[i]);
+ pthread_mutex_unlock (mutexes_held[i]); //NOSONAR
}
}
diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index 8ab47c9aa00..803daafac19 100644
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -17636,7 +17636,7 @@ vl_api_mpls_fib_path_json_print (vat_json_node_t * node,
clib_memcpy (&ip4, &fp->nh.address.ip4, sizeof (ip4));
vat_json_object_add_ip4 (node, "next_hop", ip4);
}
- else if (fp->proto == FIB_API_PATH_NH_PROTO_IP4)
+ else if (fp->proto == FIB_API_PATH_NH_PROTO_IP6)
{
clib_memcpy (&ip6, &fp->nh.address.ip6, sizeof (ip6));
vat_json_object_add_ip6 (node, "next_hop", ip6);