X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fsvm%2Fsvmdb.c;h=2c3d351f0c7d7f69bb35af6302934d528e2e65b0;hb=04943b4c42db300d0d895644f32da79a6d411c51;hp=043b0924d8489f0b00c58574eef598c0d8ac8d09;hpb=d756b35032cdf7fdaaf0d6611388a54d32d72e92;p=vpp.git

diff --git a/src/svm/svmdb.c b/src/svm/svmdb.c
index 043b0924d84..2c3d351f0c7 100644
--- a/src/svm/svmdb.c
+++ b/src/svm/svmdb.c
@@ -35,7 +35,6 @@
 #include <vppinfra/bitmap.h>
 #include <vppinfra/fifo.h>
 #include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
 #include <vppinfra/heap.h>
 #include <vppinfra/pool.h>
 #include <vppinfra/format.h>
@@ -198,7 +197,7 @@ svmdb_local_add_del_notification (svmdb_client_t * client,
   void *oldheap;
   hash_pair_t *hp;
   svmdb_shm_hdr_t *shm;
-  u8 *dummy_value = 0;
+  u8 *placeholder_value = 0;
   svmdb_value_t *value;
   svmdb_notify_t *np;
   int i;
@@ -216,7 +215,7 @@ svmdb_local_add_del_notification (svmdb_client_t * client,
   if (hp == 0)
     {
       local_set_variable_nolock (client, a->nspace, (u8 *) a->var,
-				 dummy_value, a->elsize);
+				 placeholder_value, a->elsize);
       /* might have moved */
       h = shm->namespaces[a->nspace];
       hp = hash_get_pair_mem (h, a->var);
@@ -325,7 +324,7 @@ local_set_variable_nolock (svmdb_client_t * client,
     {
       svmdb_value_t *newvalue;
       pool_get (shm->values, newvalue);
-      memset (newvalue, 0, sizeof (*newvalue));
+      clib_memset (newvalue, 0, sizeof (*newvalue));
       newvalue->elsize = elsize;
       vec_alloc (newvalue->value, vec_len (val) * elsize);
       clib_memcpy (newvalue->value, val, vec_len (val) * elsize);
@@ -456,7 +455,7 @@ svmdb_local_serialize_strings (svmdb_client_t * client, char *filename)
       goto out;
     }
 
-  serialize_open_unix_file_descriptor (sm, fd);
+  serialize_open_clib_file_descriptor (sm, fd);
 
   region_lock (client->db_rp, 20);
 
@@ -512,7 +511,7 @@ svmdb_local_unserialize_strings (svmdb_client_t * client, char *filename)
       goto out;
     }
 
-  unserialize_open_unix_file_descriptor (sm, fd);
+  unserialize_open_clib_file_descriptor (sm, fd);
 
   region_lock (client->db_rp, 21);
   oldheap = svm_push_data_heap (client->db_rp);
@@ -651,7 +650,7 @@ svmdb_local_find_or_add_vec_variable (svmdb_client_t * client,
       h = shm->namespaces[SVMDB_NAMESPACE_VEC];
 
       pool_get (shm->values, newvalue);
-      memset (newvalue, 0, sizeof (*newvalue));
+      clib_memset (newvalue, 0, sizeof (*newvalue));
       newvalue->elsize = 1;
       vec_alloc (newvalue->value, nbytes);
       _vec_len (newvalue->value) = nbytes;