X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fapi%2Fapi_main.c;h=af31307d229b8840ad3899768b6c75d58c869fab;hb=103ba6ba9ecd1d65bcbd3bb4edc115beb9ee7671;hp=8f33f042c5d90f8d2099bec552bf4e4bfbd8ab23;hpb=88c6e0086b15963b4d1a268e1fe8bbc2bcd9779c;p=vpp.git

diff --git a/src/vpp/api/api_main.c b/src/vpp/api/api_main.c
index 8f33f042c5d..af31307d229 100644
--- a/src/vpp/api/api_main.c
+++ b/src/vpp/api/api_main.c
@@ -59,7 +59,7 @@ api_main_init (vlib_main_t * vm)
   return 0;
 }
 
-VLIB_INIT_FUNCTION (api_main_init);
+VLIB_MAIN_LOOP_ENTER_FUNCTION (api_main_init);
 
 void
 vat_plugin_hash_create (void)
@@ -92,7 +92,7 @@ maybe_register_api_client (vat_main_t * vam)
   *regpp = clib_mem_alloc (sizeof (vl_api_registration_t));
 
   regp = *regpp;
-  memset (regp, 0, sizeof (*regp));
+  clib_memset (regp, 0, sizeof (*regp));
   regp->registration_type = REGISTRATION_TYPE_SHMEM;
   regp->vl_api_registration_pool_index = regpp - am->vl_clients;
   regp->vlib_rp = svm;
@@ -127,7 +127,6 @@ api_command_fn (vlib_main_t * vm,
   u32 arg_len;
   int rv;
   int (*fp) (vat_main_t *);
-  api_main_t *am = &api_main;
 
   maybe_register_api_client (vam);
 
@@ -278,6 +277,7 @@ uword
 unformat_sw_if_index (unformat_input_t * input, va_list * args)
 {
   void *vam_unused = va_arg (*args, void *);
+  (void) (vam_unused);
   u32 *result = va_arg (*args, u32 *);
   vnet_main_t *vnm = vnet_get_main ();
   u32 sw_if_index = ~0;