diff options
| -rw-r--r-- | src/svm/svm.c | 6 | ||||
| -rw-r--r-- | src/vat/api_format.c | 2 |
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); |