Merge pull request #648 from ZettaScaleLabs/unify_config_clone

Unify z_config_clone definition
eclipse-zenoh · Sep 11, 2024 · efb5476 · efb5476
2 parents 21aeda9 + c04dd2f
commit efb5476
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/include/zenoh-pico/api/primitives.h b/include/zenoh-pico/api/primitives.h
@@ -300,15 +300,6 @@ void z_config_new(z_owned_config_t *config);
  */
 int8_t z_config_default(z_owned_config_t *config);
 
-/**
- * Clones a zenoh configuration.
- *
- * Parameters:
- *   config: Pointer to uninitialized :c:type:`z_owned_config_t`.
- *   src: Pointer to the :c:type:`z_loaned_config_t` to clone.
- */
-void z_config_clone(z_owned_config_t *config, const z_loaned_config_t *src);
-
 /**
  * Gets the property with the given integer key from the configuration.
  *
@@ -1334,7 +1325,7 @@ int8_t z_closure_zid(z_owned_closure_zid_t *closure, z_id_handler_t call, z_drop
 /**************** Loans ****************/
 _Z_OWNED_FUNCTIONS_DEF(string)
 _Z_OWNED_FUNCTIONS_DEF(keyexpr)
-_Z_OWNED_FUNCTIONS_NO_COPY_DEF(config)
+_Z_OWNED_FUNCTIONS_DEF(config)
 _Z_OWNED_FUNCTIONS_NO_COPY_DEF(session)
 _Z_OWNED_FUNCTIONS_NO_COPY_DEF(subscriber)
 _Z_OWNED_FUNCTIONS_NO_COPY_DEF(publisher)

diff --git a/src/api/api.c b/src/api/api.c
@@ -188,8 +188,6 @@ void z_config_new(z_owned_config_t *config) { config->_val = _z_config_empty();
 
 int8_t z_config_default(z_owned_config_t *config) { return _z_config_default(&config->_val); }
 
-void z_config_clone(z_owned_config_t *config, const z_loaned_config_t *src) { config->_val = _z_config_clone(src); }
-
 const char *zp_config_get(const z_loaned_config_t *config, uint8_t key) { return _z_config_get(config, key); }
 
 int8_t zp_config_insert(z_loaned_config_t *config, uint8_t key, const char *value) {
@@ -746,8 +744,12 @@ void z_closure_zid_call(const z_loaned_closure_zid_t *closure, const z_id_t *id)
 
 _Bool _z_config_check(const _z_config_t *config) { return !_z_str_intmap_is_empty(config); }
 _z_config_t _z_config_null(void) { return _z_str_intmap_make(); }
+int8_t _z_config_copy(_z_config_t *dst, const _z_config_t *src) {
+    *dst = _z_str_intmap_clone(src);
+    return _Z_RES_OK;
+}
 void _z_config_drop(_z_config_t *config) { _z_str_intmap_clear(config); }
-_Z_OWNED_FUNCTIONS_VALUE_NO_COPY_IMPL(_z_config_t, config, _z_config_check, _z_config_null, _z_config_drop)
+_Z_OWNED_FUNCTIONS_VALUE_IMPL(_z_config_t, config, _z_config_check, _z_config_null, _z_config_copy, _z_config_drop)
 
 _Z_OWNED_FUNCTIONS_VALUE_IMPL(_z_string_t, string, _z_string_check, _z_string_null, _z_string_copy, _z_string_clear)