diff options
Diffstat (limited to 'src/vpp-api')
| -rw-r--r-- | src/vpp-api/client/client.c | 8 | ||||
| -rw-r--r-- | src/vpp-api/client/stat_client.c | 2 | ||||
| -rw-r--r-- | src/vpp-api/client/test.c | 2 | ||||
| -rw-r--r-- | src/vpp-api/vapi/vapi.c | 15 |
4 files changed, 14 insertions, 13 deletions
diff --git a/src/vpp-api/client/client.c b/src/vpp-api/client/client.c index a57db289250..6a12c4ab963 100644 --- a/src/vpp-api/client/client.c +++ b/src/vpp-api/client/client.c @@ -115,7 +115,7 @@ static void init (void) { vac_main_t *pm = &vac_main; - memset(pm, 0, sizeof(*pm)); + clib_memset(pm, 0, sizeof(*pm)); pthread_mutex_init(&pm->queue_lock, NULL); pthread_cond_init(&pm->suspend_cv, NULL); pthread_cond_init(&pm->resume_cv, NULL); @@ -137,7 +137,7 @@ cleanup (void) pthread_cond_destroy(&pm->timeout_cv); pthread_cond_destroy(&pm->timeout_cancel_cv); pthread_cond_destroy(&pm->terminate_cv); - memset(pm, 0, sizeof(*pm)); + clib_memset(pm, 0, sizeof(*pm)); } /* @@ -215,7 +215,7 @@ vac_rx_thread_fn (void *arg) case VL_API_MEMCLNT_KEEPALIVE: mp = (void *)msg; rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); + clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = ntohs(VL_API_MEMCLNT_KEEPALIVE_REPLY); rmp->context = mp->context; shmem_hdr = am->shmem_hdr; @@ -472,7 +472,7 @@ vac_read (char **p, int *l, u16 timeout) /* Handle an alive-check ping from vpp. */ mp = (void *)msg; rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); + clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = ntohs(VL_API_MEMCLNT_KEEPALIVE_REPLY); rmp->context = mp->context; shmem_hdr = am->shmem_hdr; diff --git a/src/vpp-api/client/stat_client.c b/src/vpp-api/client/stat_client.c index 0042a2be4e4..5e10e18c43e 100644 --- a/src/vpp-api/client/stat_client.c +++ b/src/vpp-api/client/stat_client.c @@ -89,7 +89,7 @@ stat_segment_connect (char *socket_name) int mfd = -1; int sock; - memset (sm, 0, sizeof (*sm)); + clib_memset (sm, 0, sizeof (*sm)); if ((sock = socket (AF_UNIX, SOCK_SEQPACKET, 0)) < 0) { perror ("Couldn't open socket"); diff --git a/src/vpp-api/client/test.c b/src/vpp-api/client/test.c index 8061fe58fb6..da2211b6459 100644 --- a/src/vpp-api/client/test.c +++ b/src/vpp-api/client/test.c @@ -55,7 +55,7 @@ volatile u16 result_msg_id; #define M_NOALLOC(T,t) \ do { \ result_ready = 0; \ - memset (mp, 0, sizeof (*mp)); \ + clib_memset (mp, 0, sizeof (*mp)); \ mp->_vl_msg_id = ntohs (VL_API_##T); \ mp->client_index = am->my_client_index; \ } while(0); diff --git a/src/vpp-api/vapi/vapi.c b/src/vpp-api/vapi/vapi.c index 70382d17bbb..031c421d355 100644 --- a/src/vpp-api/vapi/vapi.c +++ b/src/vpp-api/vapi/vapi.c @@ -262,8 +262,9 @@ vapi_ctx_alloc (vapi_ctx_t * result) { goto fail; } - memset (ctx->vapi_msg_id_t_to_vl_msg_id, ~0, - __vapi_metadata.count * sizeof (*ctx->vapi_msg_id_t_to_vl_msg_id)); + clib_memset (ctx->vapi_msg_id_t_to_vl_msg_id, ~0, + __vapi_metadata.count * + sizeof (*ctx->vapi_msg_id_t_to_vl_msg_id)); ctx->event_cbs = calloc (__vapi_metadata.count, sizeof (*ctx->event_cbs)); if (!ctx->event_cbs) { @@ -318,7 +319,7 @@ vapi_connect (vapi_ctx_t ctx, const char *name, return VAPI_ENOMEM; } ctx->requests = tmp; - memset (ctx->requests, 0, size); + clib_memset (ctx->requests, 0, size); /* coverity[MISSING_LOCK] - 177211 requests_mutex is not needed here */ ctx->requests_start = ctx->requests_count = 0; if (chroot_prefix) @@ -651,8 +652,8 @@ vapi_dispatch_response (vapi_ctx_t ctx, vapi_msg_id_t id, requests_start].callback_ctx, VAPI_ENORESP, true, NULL); - memset (&ctx->requests[ctx->requests_start], 0, - sizeof (ctx->requests[ctx->requests_start])); + clib_memset (&ctx->requests[ctx->requests_start], 0, + sizeof (ctx->requests[ctx->requests_start])); ++ctx->requests_start; --ctx->requests_count; if (ctx->requests_start == ctx->requests_size) @@ -693,8 +694,8 @@ vapi_dispatch_response (vapi_ctx_t ctx, vapi_msg_id_t id, } if (is_last) { - memset (&ctx->requests[ctx->requests_start], 0, - sizeof (ctx->requests[ctx->requests_start])); + clib_memset (&ctx->requests[ctx->requests_start], 0, + sizeof (ctx->requests[ctx->requests_start])); ++ctx->requests_start; --ctx->requests_count; if (ctx->requests_start == ctx->requests_size) |