diff options
Diffstat (limited to 'vlib-api/vlibmemory')
| -rw-r--r-- | vlib-api/vlibmemory/memory_vlib.c | 4 | ||||
| -rw-r--r-- | vlib-api/vlibmemory/unix_shared_memory_queue.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vlib-api/vlibmemory/memory_vlib.c b/vlib-api/vlibmemory/memory_vlib.c index 8aa0fe4a20d..0cac49d7997 100644 --- a/vlib-api/vlibmemory/memory_vlib.c +++ b/vlib-api/vlibmemory/memory_vlib.c @@ -422,7 +422,7 @@ memclnt_process (vlib_main_t * vm, } headp = (i8 *) (q->data + sizeof(uword)*q->head); - memcpy (&mp, headp, sizeof(uword)); + clib_memcpy (&mp, headp, sizeof(uword)); q->head++; need_broadcast = (q->cursize == q->maxsize/2); @@ -1174,7 +1174,7 @@ void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length) mp = vl_msg_api_alloc_as_if_client (sizeof (*mp) + data_length); memset (mp, 0, sizeof (*mp)); - memcpy (mp->data, data, data_length); + clib_memcpy (mp->data, data, data_length); mp->_vl_msg_id = ntohs (VL_API_RPC_CALL); mp->function = pointer_to_uword(fp); mp->need_barrier_sync = 1; diff --git a/vlib-api/vlibmemory/unix_shared_memory_queue.c b/vlib-api/vlibmemory/unix_shared_memory_queue.c index 62fb240cc6c..b8182658f65 100644 --- a/vlib-api/vlibmemory/unix_shared_memory_queue.c +++ b/vlib-api/vlibmemory/unix_shared_memory_queue.c @@ -134,7 +134,7 @@ int unix_shared_memory_queue_add_nolock (unix_shared_memory_queue_t *q, } tailp = (i8 *)(&q->data[0] + q->elsize*q->tail); - memcpy(tailp, elem, q->elsize); + clib_memcpy(tailp, elem, q->elsize); q->tail++; q->cursize++; @@ -163,7 +163,7 @@ int unix_shared_memory_queue_add_raw (unix_shared_memory_queue_t *q, } tailp = (i8 *)(&q->data[0] + q->elsize*q->tail); - memcpy(tailp, elem, q->elsize); + clib_memcpy(tailp, elem, q->elsize); q->tail++; q->cursize++; @@ -202,7 +202,7 @@ int unix_shared_memory_queue_add (unix_shared_memory_queue_t *q, } tailp = (i8 *)(&q->data[0] + q->elsize*q->tail); - memcpy(tailp, elem, q->elsize); + clib_memcpy(tailp, elem, q->elsize); q->tail++; q->cursize++; @@ -250,7 +250,7 @@ int unix_shared_memory_queue_sub(unix_shared_memory_queue_t *q, } headp = (i8 *)(&q->data[0] + q->elsize*q->head); - memcpy(elem, headp, q->elsize); + clib_memcpy(elem, headp, q->elsize); q->head++; if (q->cursize == q->maxsize) @@ -280,7 +280,7 @@ int unix_shared_memory_queue_sub_raw (unix_shared_memory_queue_t *q, } headp = (i8 *)(&q->data[0] + q->elsize*q->head); - memcpy(elem, headp, q->elsize); + clib_memcpy(elem, headp, q->elsize); q->head++; q->cursize--; |