UT: Repaired broken C unit tests (--enable-tests)

Change-Id: I63d720378b92813993525f80fee90fc79df27fba
Signed-off-by: Ole Troan <ot@cisco.com>

3 files changed, 6 insertions, 11 deletions

diff --git a/src/vpp/api/test_client.c b/src/vpp/api/test_client.c
index 844b9702096..52833eb6f86 100644
--- a/src/vpp/api/test_client.c
+++ b/src/vpp/api/test_client.c
@@ -161,10 +161,8 @@ vl_api_sw_interface_details_t_handler (vl_api_sw_interface_details_t * mp)
 static void
 vl_api_sw_interface_set_flags_t_handler (vl_api_sw_interface_set_flags_t * mp)
 {
-  fformat (stdout, "set flags: sw_if_index %d, admin %s link %s\n",
-	   ntohl (mp->sw_if_index),
-	   mp->admin_up_down ? "up" : "down",
-	   mp->link_up_down ? "up" : "down");
+  fformat (stdout, "set flags: sw_if_index %d, admin %s\n",
+	   ntohl (mp->sw_if_index), mp->admin_up_down ? "up" : "down");
 }
 
 static void
@@ -1007,7 +1005,7 @@ dhcpv6_set_vss (test_main_t * tm)
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
   mp->oui = ntohl (6);
-  mp->fib_id = ntohl (60);
+  mp->tbl_id = ntohl (60);
   mp->is_add = 1;
   mp->is_ipv6 = 1;
   vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
@@ -1024,7 +1022,7 @@ dhcpv4_set_vss (test_main_t * tm)
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
   mp->oui = ntohl (4);
-  mp->fib_id = ntohl (40);
+  mp->tbl_id = ntohl (40);
   mp->is_add = 1;
   mp->is_ipv6 = 0;
   vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
diff --git a/src/vpp/stats/stats.c b/src/vpp/stats/stats.c
index ac364e88efd..6c6809e3b60 100644
--- a/src/vpp/stats/stats.c
+++ b/src/vpp/stats/stats.c
@@ -189,7 +189,7 @@ format_vnet_interface_simple_counters (u8 * s, va_list * args)
   return s;
 }
 
-void
+static void
 dslock (stats_main_t * sm, int release_hint, int tag)
 {
   u32 thread_index;
@@ -222,7 +222,7 @@ stats_dslock_with_hint (int hint, int tag)
   dslock (sm, hint, tag);
 }
 
-void
+static void
 dsunlock (stats_main_t * sm)
 {
   u32 thread_index;
diff --git a/src/vpp/stats/stats.h b/src/vpp/stats/stats.h
index 452e3052a10..4343da3b040 100644
--- a/src/vpp/stats/stats.h
+++ b/src/vpp/stats/stats.h
@@ -186,9 +186,6 @@ typedef struct
 
 extern stats_main_t stats_main;
 
-void dslock (stats_main_t * sm, int release_hint, int tag);
-void dsunlock (stats_main_t * sm);
-
 #endif /* __included_stats_h__ */
 
 /*