diff options
Diffstat (limited to 'src/svm/svmdb.c')
-rw-r--r-- | src/svm/svmdb.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/svm/svmdb.c b/src/svm/svmdb.c index 2c3d351f0c7..3c69dbf45ba 100644 --- a/src/svm/svmdb.c +++ b/src/svm/svmdb.c @@ -281,7 +281,7 @@ local_unset_variable_nolock (svmdb_client_t * client, if (vec_len (oldvalue->notifications)) notify_value (oldvalue, SVMDB_ACTION_UNSET); /* zero length value means unset */ - _vec_len (oldvalue->value) = 0; + vec_set_len (oldvalue->value, 0); } client->shm->namespaces[namespace] = h; } @@ -317,7 +317,7 @@ local_set_variable_nolock (svmdb_client_t * client, oldvalue = pool_elt_at_index (client->shm->values, hp->value[0]); vec_alloc (oldvalue->value, vec_len (val) * elsize); clib_memcpy (oldvalue->value, val, vec_len (val) * elsize); - _vec_len (oldvalue->value) = vec_len (val); + vec_set_len (oldvalue->value, vec_len (val)); notify_value (oldvalue, SVMDB_ACTION_SET); } else @@ -328,7 +328,7 @@ local_set_variable_nolock (svmdb_client_t * client, newvalue->elsize = elsize; vec_alloc (newvalue->value, vec_len (val) * elsize); clib_memcpy (newvalue->value, val, vec_len (val) * elsize); - _vec_len (newvalue->value) = vec_len (val); + vec_set_len (newvalue->value, vec_len (val)); name = format (0, "%s%c", var, 0); hash_set_mem (h, name, newvalue - shm->values); } @@ -414,7 +414,6 @@ svmdb_local_dump_strings (svmdb_client_t * client) h = client->shm->namespaces[SVMDB_NAMESPACE_STRING]; - /* *INDENT-OFF* */ hash_foreach_mem(key, value, h, ({ svmdb_value_t *v = pool_elt_at_index (shm->values, value); @@ -422,7 +421,6 @@ svmdb_local_dump_strings (svmdb_client_t * client) fformat(stdout, "%s: %s\n", key, vec_len(v->value) ? v->value : (u8 *)"(nil)"); })); - /* *INDENT-ON* */ region_unlock (client->db_rp); } @@ -433,7 +431,7 @@ svmdb_local_serialize_strings (svmdb_client_t * client, char *filename) u8 *key; u32 value; svmdb_shm_hdr_t *shm = client->shm; - serialize_main_t _sm, *sm = &_sm; + serialize_main_t _sm = { 0 }, *sm = &_sm; clib_error_t *error = 0; u8 *sanitized_name = 0; int fd = 0; @@ -463,7 +461,6 @@ svmdb_local_serialize_strings (svmdb_client_t * client, char *filename) serialize_likely_small_unsigned_integer (sm, hash_elts (h)); - /* *INDENT-OFF* */ hash_foreach_mem(key, value, h, ({ svmdb_value_t *v = pool_elt_at_index (shm->values, value); @@ -475,7 +472,6 @@ svmdb_local_serialize_strings (svmdb_client_t * client, char *filename) serialize_cstring (sm, (char *)v->value); } })); - /* *INDENT-ON* */ region_unlock (client->db_rp); serialize_close (sm); @@ -495,7 +491,7 @@ out: int svmdb_local_unserialize_strings (svmdb_client_t * client, char *filename) { - serialize_main_t _sm, *sm = &_sm; + serialize_main_t _sm = { 0 }, *sm = &_sm; void *oldheap; clib_error_t *error = 0; u8 *key, *value; @@ -589,7 +585,7 @@ svmdb_local_get_vec_variable (svmdb_client_t * client, char *var, u32 elsize) /* Make a copy in process-local memory */ vec_alloc (copy, vec_len (rv) * elsize); clib_memcpy (copy, rv, vec_len (rv) * elsize); - _vec_len (copy) = vec_len (rv); + vec_set_len (copy, vec_len (rv)); region_unlock (client->db_rp); return (copy); } @@ -610,7 +606,6 @@ svmdb_local_dump_vecs (svmdb_client_t * client) h = client->shm->namespaces[SVMDB_NAMESPACE_VEC]; - /* *INDENT-OFF* */ hash_foreach_mem(key, value, h, ({ svmdb_value_t *v = pool_elt_at_index (shm->values, value); @@ -618,7 +613,6 @@ svmdb_local_dump_vecs (svmdb_client_t * client) format_hex_bytes, v->value, vec_len(v->value)*v->elsize, ((f64 *)(v->value))[0]); })); - /* *INDENT-ON* */ region_unlock (client->db_rp); } @@ -653,7 +647,7 @@ svmdb_local_find_or_add_vec_variable (svmdb_client_t * client, clib_memset (newvalue, 0, sizeof (*newvalue)); newvalue->elsize = 1; vec_alloc (newvalue->value, nbytes); - _vec_len (newvalue->value) = nbytes; + vec_set_len (newvalue->value, nbytes); name = format (0, "%s%c", var, 0); hash_set_mem (h, name, newvalue - shm->values); shm->namespaces[SVMDB_NAMESPACE_VEC] = h; |