From b7b929931a07fbb27b43d5cd105f366c3e29807e Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Wed, 17 Oct 2018 10:38:51 -0400 Subject: c11 safe string handling support Change-Id: Ied34720ca5a6e6e717eea4e86003e854031b6eab Signed-off-by: Dave Barach --- src/plugins/ioam/ip6/ioam_cache.c | 2 +- src/plugins/ioam/ip6/ioam_cache.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/plugins/ioam/ip6') diff --git a/src/plugins/ioam/ip6/ioam_cache.c b/src/plugins/ioam/ip6/ioam_cache.c index e2f878a5f77..fcacae0cf2c 100644 --- a/src/plugins/ioam/ip6/ioam_cache.c +++ b/src/plugins/ioam/ip6/ioam_cache.c @@ -381,7 +381,7 @@ ioam_cache_init (vlib_main_t * vm) name = format (0, "ioam_cache_%08x%c", api_version, 0); - memset (&ioam_cache_main, 0, sizeof (ioam_cache_main)); + clib_memset (&ioam_cache_main, 0, sizeof (ioam_cache_main)); /* Ask for a correctly-sized block of API message decode slots */ em->msg_id_base = vl_msg_api_get_msg_ids ((char *) name, VL_MSG_FIRST_AVAILABLE); diff --git a/src/plugins/ioam/ip6/ioam_cache.h b/src/plugins/ioam/ip6/ioam_cache.h index 3a3cf6a620e..717aaf11b8f 100644 --- a/src/plugins/ioam/ip6/ioam_cache.h +++ b/src/plugins/ioam/ip6/ioam_cache.h @@ -299,7 +299,7 @@ ioam_cache_entry_free (ioam_cache_entry_t * entry) if (entry) { vec_free (entry->ioam_rewrite_string); - memset (entry, 0, sizeof (*entry)); + clib_memset (entry, 0, sizeof (*entry)); pool_put (cm->ioam_rewrite_pool, entry); } } @@ -371,7 +371,7 @@ ioam_cache_add (vlib_buffer_t * b0, ioam_e2e_id_option_t *e2e = 0; pool_get_aligned (cm->ioam_rewrite_pool, entry, CLIB_CACHE_LINE_BYTES); - memset (entry, 0, sizeof (*entry)); + clib_memset (entry, 0, sizeof (*entry)); pool_index = entry - cm->ioam_rewrite_pool; clib_memcpy (entry->dst_address.as_u64, ip0->dst_address.as_u64, @@ -437,7 +437,7 @@ ioam_cache_sr_rewrite_template_create (void) /* This nodes address and the original dest will be * filled when the packet is processed */ vec_add2 (segments, this_seg, 1); - memset (this_seg, 0xfe, sizeof (ip6_address_t)); + clib_memset (this_seg, 0xfe, sizeof (ip6_address_t)); cm->sr_rewrite_template = ip6_sr_compute_rewrite_string_insert (segments); vec_free (segments); } @@ -540,7 +540,7 @@ ioam_cache_ts_table_init (vlib_main_t * vm) { pool_alloc_aligned (cm->ioam_ts_pool[i], MAX_CACHE_TS_ENTRIES, CLIB_CACHE_LINE_BYTES); - memset (&cm->ts_stats[i], 0, sizeof (ioam_cache_ts_pool_stats_t)); + clib_memset (&cm->ts_stats[i], 0, sizeof (ioam_cache_ts_pool_stats_t)); tw_timer_wheel_init_16t_2w_512sl (&cm->timer_wheels[i], expired_cache_ts_timer_callback, IOAM_CACHE_TS_TICK @@ -592,7 +592,7 @@ ioam_cache_ts_entry_free (u32 thread_id, } pool_put (cm->ioam_ts_pool[thread_id], entry); cm->ts_stats[thread_id].inuse--; - memset (entry, 0, sizeof (*entry)); + clib_memset (entry, 0, sizeof (*entry)); } } @@ -654,7 +654,7 @@ ioam_cache_ts_add (ip6_header_t * ip0, pool_get_aligned (cm->ioam_ts_pool[thread_id], entry, CLIB_CACHE_LINE_BYTES); - memset (entry, 0, sizeof (*entry)); + clib_memset (entry, 0, sizeof (*entry)); *pool_index = entry - cm->ioam_ts_pool[thread_id]; clib_memcpy (entry->dst_address.as_u64, ip0->dst_address.as_u64, -- cgit 1.2.3-korg