X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fexamples%2Fsample-plugin%2Fsample%2Fsample_test.c;h=51c2c87cb8d531083019f97ae27b982a685b6f62;hb=59b2565cd91a67ced650739f36129650830211ac;hp=bf7a0590e34f8b410a87b151334f439a21b8d9ef;hpb=7bc770ceb62ede18414b7bb5788692e32477e373;p=vpp.git

diff --git a/src/examples/sample-plugin/sample/sample_test.c b/src/examples/sample-plugin/sample/sample_test.c
index bf7a0590e34..51c2c87cb8d 100644
--- a/src/examples/sample-plugin/sample/sample_test.c
+++ b/src/examples/sample-plugin/sample/sample_test.c
@@ -21,7 +21,6 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 #include <vppinfra/error.h>
 
 #define __plugin_msg_base sample_test_main.msg_id_base
@@ -92,12 +91,11 @@ _(SAMPLE_MACSWAP_ENABLE_DISABLE_REPLY, sample_macswap_enable_disable_reply)
 
 static int api_sample_macswap_enable_disable (vat_main_t * vam)
 {
-    sample_test_main_t * sm = &sample_test_main;
     unformat_input_t * i = vam->input;
-    f64 timeout;
     int enable_disable = 1;
     u32 sw_if_index = ~0;
     vl_api_sample_macswap_enable_disable_t * mp;
+    int ret;
 
     /* Parse args required to build the message */
     while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
@@ -125,7 +123,8 @@ static int api_sample_macswap_enable_disable (vat_main_t * vam)
     S(mp);
 
     /* Wait for a reply... */
-    W;
+    W (ret);
+    return ret;
 }
 
 /* 
@@ -135,7 +134,7 @@ static int api_sample_macswap_enable_disable (vat_main_t * vam)
 #define foreach_vpe_api_msg \
 _(sample_macswap_enable_disable, "<intfc> [disable]")
 
-void vat_api_hookup (vat_main_t *vam)
+static void sample_api_hookup (vat_main_t *vam)
 {
     sample_test_main_t * sm = &sample_test_main;
     /* Hook up handlers for replies from the data plane plug-in */
@@ -172,7 +171,7 @@ clib_error_t * vat_plugin_register (vat_main_t *vam)
   sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
 
   if (sm->msg_id_base != (u16) ~0)
-    vat_api_hookup (vam);
+    sample_api_hookup (vam);
   
   vec_free(name);