From eaa84401f012b721252948b1f3ef696a8543ebd2 Mon Sep 17 00:00:00 2001 From: Luca Cominardi Date: Fri, 5 Jul 2024 17:43:03 +0200 Subject: [PATCH 1/2] replier_id is marked as unstable --- Cargo.toml | 2 +- include/zenoh_commons.h | 11 ++++++----- src/get.rs | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f56d5ae3d..b059225af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,7 +68,7 @@ fs_extra = "1.3.0" [lib] path="src/lib.rs" -name = "zenohc" +name = "zenohcd" crate-type = ["cdylib", "staticlib"] doctest = false diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h index b53986cf1..ac46140b4 100644 --- a/include/zenoh_commons.h +++ b/include/zenoh_commons.h @@ -2610,11 +2610,6 @@ ZENOHC_API void z_reply_null(struct z_owned_reply_t *this_); * Returns `NULL` if reply does not contain a sample (i. e. if `z_reply_is_ok` returns ``false``). */ ZENOHC_API const struct z_loaned_sample_t *z_reply_ok(const struct z_loaned_reply_t *this_); -/** - * Gets the id of the zenoh instance that answered this Reply. - * Returns `true` if id is present - */ -ZENOHC_API bool z_reply_replier_id(const struct z_loaned_reply_t *this_, struct z_id_t *out_id); /** * Constructs send and recieve ends of the ring channel */ @@ -3671,6 +3666,7 @@ z_error_t z_view_string_wrap(struct z_view_string_t *this_, * The string has static storage (i.e. valid until the end of the program). * @param whatami: A whatami bitmask of zenoh entity kind. * @param str_out: An uninitialized memory location where strring will be constructed. + * @param len: Maximum number of bytes that can be written to the `buf`. * * @return 0 if successful, negative error values if whatami contains an invalid bitmask. */ @@ -3927,6 +3923,11 @@ z_error_t zcu_publisher_matching_listener_undeclare(struct zcu_owned_matching_li * Returns the default value of #zcu_reply_keyexpr_t. */ ZENOHC_API enum zcu_reply_keyexpr_t zcu_reply_keyexpr_default(void); +/** + * Gets the id of the zenoh instance that answered this Reply. + * Returns `true` if id is present + */ +ZENOHC_API bool zcu_reply_replier_id(const struct z_loaned_reply_t *this_, struct z_id_t *out_id); /** * Constructs and declares a publication cache. * diff --git a/src/get.rs b/src/get.rs index c28d25232..c6081b688 100644 --- a/src/get.rs +++ b/src/get.rs @@ -159,7 +159,7 @@ pub unsafe extern "C" fn z_reply_err(this: &z_loaned_reply_t) -> *const z_loaned /// Returns `true` if id is present #[no_mangle] #[allow(clippy::missing_safety_doc)] -pub unsafe extern "C" fn z_reply_replier_id( +pub unsafe extern "C" fn zcu_reply_replier_id( this: &z_loaned_reply_t, out_id: &mut MaybeUninit, ) -> bool { From 3662ab187715185ba1d629f05175583e919abf10 Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Fri, 5 Jul 2024 18:26:10 +0200 Subject: [PATCH 2/2] carto.toml release libname restored --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b059225af..f56d5ae3d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,7 +68,7 @@ fs_extra = "1.3.0" [lib] path="src/lib.rs" -name = "zenohcd" +name = "zenohc" crate-type = ["cdylib", "staticlib"] doctest = false