From c8c9dc565f257411dd762cf211f0b99e9417ae4c Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Thu, 12 Sep 2024 13:12:32 +0200
Subject: [PATCH 01/10] made closure param mutable

---
 include/zenoh_commons.h                 | 20 ++++++++++----------
 include/zenoh_macros.h                  | 16 ++++++++--------
 src/closures/hello_closure.rs           | 12 ++++++------
 src/closures/matching_status_closure.rs |  2 +-
 src/closures/query_channel.rs           |  2 +-
 src/closures/query_closure.rs           |  8 ++++----
 src/closures/reply_closure.rs           | 10 +++++-----
 src/closures/response_channel.rs        |  2 +-
 src/closures/sample_channel.rs          |  2 +-
 src/closures/sample_closure.rs          | 10 +++++-----
 src/closures/zenohid_closure.rs         |  2 +-
 src/get.rs                              |  4 ++--
 src/queryable.rs                        |  4 ++--
 src/scouting.rs                         |  4 ++--
 src/subscriber.rs                       |  4 ++--
 15 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h
index 22c5b52c3..64f9bf760 100644
--- a/include/zenoh_commons.h
+++ b/include/zenoh_commons.h
@@ -461,7 +461,7 @@ typedef struct z_owned_closure_hello_t {
   /**
    * A closure body.
    */
-  void (*call)(const struct z_loaned_hello_t *hello, void *context);
+  void (*call)(struct z_loaned_hello_t *hello, void *context);
   /**
    * An optional drop function that will be called when the closure is dropped.
    */
@@ -491,7 +491,7 @@ typedef struct z_owned_closure_query_t {
   /**
    * A closure body.
    */
-  void (*call)(const struct z_loaned_query_t *reply, void *context);
+  void (*call)(struct z_loaned_query_t *reply, void *context);
   /**
    * An optional drop function that will be called when the closure is dropped.
    */
@@ -521,7 +521,7 @@ typedef struct z_owned_closure_reply_t {
   /**
    * A closure body.
    */
-  void (*call)(const struct z_loaned_reply_t *reply, void *context);
+  void (*call)(struct z_loaned_reply_t *reply, void *context);
   /**
    * An optional drop function that will be called when the closure is dropped.
    */
@@ -551,7 +551,7 @@ typedef struct z_owned_closure_sample_t {
   /**
    * A closure body.
    */
-  void (*call)(const struct z_loaned_sample_t *sample, void *context);
+  void (*call)(struct z_loaned_sample_t *sample, void *context);
   /**
    * An optional drop function that will be called when the closure is dropped.
    */
@@ -583,7 +583,7 @@ typedef struct z_owned_closure_zid_t {
   /**
    * A callback function.
    */
-  void (*call)(const z_id_t *z_id, void *context);
+  void (*call)(z_id_t *z_id, void *context);
   /**
    * An optional function that will be called upon closure drop.
    */
@@ -1184,7 +1184,7 @@ typedef struct zc_owned_closure_matching_status_t {
   /**
    * A closure body.
    */
-  void (*call)(const struct zc_matching_status_t *matching_status, void *context);
+  void (*call)(struct zc_matching_status_t *matching_status, void *context);
   /**
    * An optional drop function that will be called when the closure is dropped.
    */
@@ -1865,7 +1865,7 @@ ZENOHC_API void z_close_options_default(struct z_close_options_t *this_);
  */
 ZENOHC_API
 void z_closure_hello_call(const struct z_loaned_closure_hello_t *closure,
-                          const struct z_loaned_hello_t *hello);
+                          struct z_loaned_hello_t *hello);
 /**
  * Drops the closure. Droping an uninitialized closure is a no-op.
  */
@@ -1880,7 +1880,7 @@ const struct z_loaned_closure_hello_t *z_closure_hello_loan(const struct z_owned
  */
 ZENOHC_API
 void z_closure_query_call(const struct z_loaned_closure_query_t *closure,
-                          const struct z_loaned_query_t *query);
+                          struct z_loaned_query_t *query);
 /**
  * Drops the closure, resetting it to its gravestone state.
  */
@@ -1895,7 +1895,7 @@ const struct z_loaned_closure_query_t *z_closure_query_loan(const struct z_owned
  */
 ZENOHC_API
 void z_closure_reply_call(const struct z_loaned_closure_reply_t *closure,
-                          const struct z_loaned_reply_t *reply);
+                          struct z_loaned_reply_t *reply);
 /**
  * Drops the closure, resetting it to its gravestone state. Droping an uninitialized closure is a no-op.
  */
@@ -1911,7 +1911,7 @@ const struct z_loaned_closure_reply_t *z_closure_reply_loan(const struct z_owned
  */
 ZENOHC_API
 void z_closure_sample_call(const struct z_loaned_closure_sample_t *closure,
-                           const struct z_loaned_sample_t *sample);
+                           struct z_loaned_sample_t *sample);
 /**
  * Drops the closure. Droping an uninitialized closure is a no-op.
  */
diff --git a/include/zenoh_macros.h b/include/zenoh_macros.h
index f5e49c1b5..ab637e7fb 100644
--- a/include/zenoh_macros.h
+++ b/include/zenoh_macros.h
@@ -658,22 +658,22 @@ inline bool z_internal_check(const z_owned_task_t& this_) { return z_internal_ta
 inline bool z_internal_check(const zc_owned_closure_log_t& this_) { return zc_internal_closure_log_check(&this_); };
 
 
-inline void z_call(const z_loaned_closure_hello_t* closure, const z_loaned_hello_t* hello) {
+inline void z_call(const z_loaned_closure_hello_t* closure, z_loaned_hello_t* hello) {
     z_closure_hello_call(closure, hello);
 };
-inline void z_call(const z_loaned_closure_query_t* closure, const z_loaned_query_t* query) {
+inline void z_call(const z_loaned_closure_query_t* closure, z_loaned_query_t* query) {
     z_closure_query_call(closure, query);
 };
-inline void z_call(const z_loaned_closure_reply_t* closure, const z_loaned_reply_t* reply) {
+inline void z_call(const z_loaned_closure_reply_t* closure, z_loaned_reply_t* reply) {
     z_closure_reply_call(closure, reply);
 };
-inline void z_call(const z_loaned_closure_sample_t* closure, const z_loaned_sample_t* sample) {
+inline void z_call(const z_loaned_closure_sample_t* closure, z_loaned_sample_t* sample) {
     z_closure_sample_call(closure, sample);
 };
 
 extern "C" using z_closure_drop_callback_t = void(void*);
 
-extern "C" using z_closure_hello_callback_t = void(const z_loaned_hello_t*, void*);
+extern "C" using z_closure_hello_callback_t = void(z_loaned_hello_t*, void*);
 inline void z_closure(
     z_owned_closure_hello_t* closure,
     z_closure_hello_callback_t* call,
@@ -683,7 +683,7 @@ inline void z_closure(
     closure->drop = drop;
     closure->call = call;
 };
-extern "C" using z_closure_query_callback_t = void(const z_loaned_query_t*, void*);
+extern "C" using z_closure_query_callback_t = void(z_loaned_query_t*, void*);
 inline void z_closure(
     z_owned_closure_query_t* closure,
     z_closure_query_callback_t* call,
@@ -693,7 +693,7 @@ inline void z_closure(
     closure->drop = drop;
     closure->call = call;
 };
-extern "C" using z_closure_reply_callback_t = void(const z_loaned_reply_t*, void*);
+extern "C" using z_closure_reply_callback_t = void(z_loaned_reply_t*, void*);
 inline void z_closure(
     z_owned_closure_reply_t* closure,
     z_closure_reply_callback_t* call,
@@ -703,7 +703,7 @@ inline void z_closure(
     closure->drop = drop;
     closure->call = call;
 };
-extern "C" using z_closure_sample_callback_t = void(const z_loaned_sample_t*, void*);
+extern "C" using z_closure_sample_callback_t = void(z_loaned_sample_t*, void*);
 inline void z_closure(
     z_owned_closure_sample_t* closure,
     z_closure_sample_callback_t* call,
diff --git a/src/closures/hello_closure.rs b/src/closures/hello_closure.rs
index dcd4c19c8..6439e96d5 100644
--- a/src/closures/hello_closure.rs
+++ b/src/closures/hello_closure.rs
@@ -34,7 +34,7 @@ pub struct z_owned_closure_hello_t {
     /// An optional pointer to a closure state.
     context: *mut c_void,
     /// A closure body.
-    call: Option<extern "C" fn(hello: *const z_loaned_hello_t, context: *mut c_void)>,
+    call: Option<extern "C" fn(hello: &mut z_loaned_hello_t, context: *mut c_void)>,
     /// An optional drop function that will be called when the closure is dropped.
     drop: Option<extern "C" fn(context: *mut c_void)>,
 }
@@ -92,7 +92,7 @@ pub unsafe extern "C" fn z_internal_closure_hello_null(
 #[no_mangle]
 pub extern "C" fn z_closure_hello_call(
     closure: &z_loaned_closure_hello_t,
-    hello: &z_loaned_hello_t,
+    hello: &mut z_loaned_hello_t,
 ) {
     let closure = closure.as_owned_c_type_ref();
     match closure.call {
@@ -108,15 +108,15 @@ pub extern "C" fn z_closure_hello_drop(this_: &mut z_moved_closure_hello_t) {
     let _ = this_.take_rust_type();
 }
 
-impl<F: Fn(&z_loaned_hello_t)> From<F> for z_owned_closure_hello_t {
+impl<F: Fn(&mut z_loaned_hello_t)> From<F> for z_owned_closure_hello_t {
     fn from(f: F) -> Self {
         let this = Box::into_raw(Box::new(f)) as _;
-        extern "C" fn call<F: Fn(&z_loaned_hello_t)>(
-            response: *const z_loaned_hello_t,
+        extern "C" fn call<F: Fn(&mut z_loaned_hello_t)>(
+            response: &mut z_loaned_hello_t,
             this: *mut c_void,
         ) {
             let this = unsafe { &*(this as *const F) };
-            unsafe { this(response.as_ref().unwrap()) }
+            this(response)
         }
         extern "C" fn drop<F>(this: *mut c_void) {
             std::mem::drop(unsafe { Box::from_raw(this as *mut F) })
diff --git a/src/closures/matching_status_closure.rs b/src/closures/matching_status_closure.rs
index c21fc7959..c00267dac 100644
--- a/src/closures/matching_status_closure.rs
+++ b/src/closures/matching_status_closure.rs
@@ -33,7 +33,7 @@ pub struct zc_owned_closure_matching_status_t {
     /// An optional pointer to a closure state.
     context: *mut c_void,
     /// A closure body.
-    call: Option<extern "C" fn(matching_status: &zc_matching_status_t, context: *mut c_void)>,
+    call: Option<extern "C" fn(matching_status: &mut zc_matching_status_t, context: *mut c_void)>,
     /// An optional drop function that will be called when the closure is dropped.
     drop: Option<extern "C" fn(context: *mut c_void)>,
 }
diff --git a/src/closures/query_channel.rs b/src/closures/query_channel.rs
index cc1ff2547..678cf129f 100644
--- a/src/closures/query_channel.rs
+++ b/src/closures/query_channel.rs
@@ -55,7 +55,7 @@ pub extern "C" fn z_internal_fifo_handler_query_check(
     this_.as_rust_type_ref().is_some()
 }
 
-extern "C" fn __z_handler_query_send(query: &z_loaned_query_t, context: *mut c_void) {
+extern "C" fn __z_handler_query_send(query: &mut z_loaned_query_t, context: *mut c_void) {
     unsafe {
         let f = (context as *mut std::sync::Arc<dyn Fn(Query) + Send + Sync>)
             .as_mut()
diff --git a/src/closures/query_closure.rs b/src/closures/query_closure.rs
index 8197774f3..5168ca6f5 100644
--- a/src/closures/query_closure.rs
+++ b/src/closures/query_closure.rs
@@ -33,7 +33,7 @@ pub struct z_owned_closure_query_t {
     /// An optional pointer to a context representing a closure state.
     pub context: *mut c_void,
     /// A closure body.
-    pub call: Option<extern "C" fn(reply: &z_loaned_query_t, context: *mut c_void)>,
+    pub call: Option<extern "C" fn(reply: &mut z_loaned_query_t, context: *mut c_void)>,
     /// An optional drop function that will be called when the closure is dropped.
     pub drop: Option<extern "C" fn(context: *mut c_void)>,
 }
@@ -99,7 +99,7 @@ pub extern "C" fn z_internal_closure_query_check(this_: &z_owned_closure_query_t
 #[no_mangle]
 pub extern "C" fn z_closure_query_call(
     closure: &z_loaned_closure_query_t,
-    query: &z_loaned_query_t,
+    query: &mut z_loaned_query_t,
 ) {
     let closure = closure.as_owned_c_type_ref();
     match closure.call {
@@ -113,10 +113,10 @@ pub extern "C" fn z_closure_query_drop(closure_: &mut z_moved_closure_query_t) {
     let _ = closure_.take_rust_type();
 }
 
-impl<F: Fn(&z_loaned_query_t)> From<F> for z_owned_closure_query_t {
+impl<F: Fn(&mut z_loaned_query_t)> From<F> for z_owned_closure_query_t {
     fn from(f: F) -> Self {
         let this = Box::into_raw(Box::new(f)) as _;
-        extern "C" fn call<F: Fn(&z_loaned_query_t)>(query: &z_loaned_query_t, this: *mut c_void) {
+        extern "C" fn call<F: Fn(&mut z_loaned_query_t)>(query: &mut z_loaned_query_t, this: *mut c_void) {
             let this = unsafe { &*(this as *const F) };
             this(query)
         }
diff --git a/src/closures/reply_closure.rs b/src/closures/reply_closure.rs
index a33692dd0..b40234322 100644
--- a/src/closures/reply_closure.rs
+++ b/src/closures/reply_closure.rs
@@ -33,7 +33,7 @@ pub struct z_owned_closure_reply_t {
     /// An optional pointer to a context representing a closure state.
     pub context: *mut c_void,
     /// A closure body.
-    pub(crate) call: Option<extern "C" fn(reply: &z_loaned_reply_t, context: *mut c_void)>,
+    pub(crate) call: Option<extern "C" fn(reply: &mut z_loaned_reply_t, context: *mut c_void)>,
     /// An optional drop function that will be called when the closure is dropped.
     pub drop: Option<extern "C" fn(context: *mut c_void)>,
 }
@@ -100,7 +100,7 @@ pub extern "C" fn z_internal_closure_reply_check(this_: &z_owned_closure_reply_t
 #[no_mangle]
 pub extern "C" fn z_closure_reply_call(
     closure: &z_loaned_closure_reply_t,
-    reply: &z_loaned_reply_t,
+    reply: &mut z_loaned_reply_t,
 ) {
     let closure = closure.as_owned_c_type_ref();
     match closure.call {
@@ -116,11 +116,11 @@ pub extern "C" fn z_closure_reply_drop(closure_: &mut z_moved_closure_reply_t) {
     let _ = closure_.take_rust_type();
 }
 
-impl<F: Fn(&z_loaned_reply_t)> From<F> for z_owned_closure_reply_t {
+impl<F: Fn(&mut z_loaned_reply_t)> From<F> for z_owned_closure_reply_t {
     fn from(f: F) -> Self {
         let this = Box::into_raw(Box::new(f)) as _;
-        extern "C" fn call<F: Fn(&z_loaned_reply_t)>(
-            response: &z_loaned_reply_t,
+        extern "C" fn call<F: Fn(&mut z_loaned_reply_t)>(
+            response: &mut z_loaned_reply_t,
             this: *mut c_void,
         ) {
             let this = unsafe { &*(this as *const F) };
diff --git a/src/closures/response_channel.rs b/src/closures/response_channel.rs
index fc7092b17..4e61acb94 100644
--- a/src/closures/response_channel.rs
+++ b/src/closures/response_channel.rs
@@ -55,7 +55,7 @@ pub extern "C" fn z_internal_fifo_handler_reply_check(
     this_.as_rust_type_ref().is_some()
 }
 
-extern "C" fn __z_handler_reply_send(reply: &z_loaned_reply_t, context: *mut c_void) {
+extern "C" fn __z_handler_reply_send(reply: &mut z_loaned_reply_t, context: *mut c_void) {
     unsafe {
         let f = (context as *mut std::sync::Arc<dyn Fn(Reply) + Send + Sync>)
             .as_mut()
diff --git a/src/closures/sample_channel.rs b/src/closures/sample_channel.rs
index 7daf956d6..8d57c47bb 100644
--- a/src/closures/sample_channel.rs
+++ b/src/closures/sample_channel.rs
@@ -55,7 +55,7 @@ pub extern "C" fn z_internal_fifo_handler_sample_check(
     this_.as_rust_type_ref().is_some()
 }
 
-extern "C" fn __z_handler_sample_send(sample: &z_loaned_sample_t, context: *mut c_void) {
+extern "C" fn __z_handler_sample_send(sample: &mut z_loaned_sample_t, context: *mut c_void) {
     unsafe {
         let f = (context as *mut std::sync::Arc<dyn Fn(Sample) + Send + Sync>)
             .as_mut()
diff --git a/src/closures/sample_closure.rs b/src/closures/sample_closure.rs
index d2574b764..3186af220 100644
--- a/src/closures/sample_closure.rs
+++ b/src/closures/sample_closure.rs
@@ -33,7 +33,7 @@ pub struct z_owned_closure_sample_t {
     /// An optional pointer to a context representing a closure state.
     pub context: *mut c_void,
     /// A closure body.
-    pub(crate) call: Option<extern "C" fn(sample: &z_loaned_sample_t, context: *mut c_void)>,
+    pub(crate) call: Option<extern "C" fn(sample: &mut z_loaned_sample_t, context: *mut c_void)>,
     /// An optional drop function that will be called when the closure is dropped.
     pub drop: Option<extern "C" fn(context: *mut c_void)>,
 }
@@ -100,7 +100,7 @@ pub extern "C" fn z_internal_closure_sample_check(this_: &z_owned_closure_sample
 #[no_mangle]
 pub extern "C" fn z_closure_sample_call(
     closure: &z_loaned_closure_sample_t,
-    sample: &z_loaned_sample_t,
+    sample: &mut z_loaned_sample_t,
 ) {
     let closure = closure.as_owned_c_type_ref();
     match closure.call {
@@ -115,11 +115,11 @@ pub extern "C" fn z_closure_sample_drop(closure_: &mut z_moved_closure_sample_t)
     let _ = closure_.take_rust_type();
 }
 
-impl<F: Fn(&z_loaned_sample_t)> From<F> for z_owned_closure_sample_t {
+impl<F: Fn(&mut z_loaned_sample_t)> From<F> for z_owned_closure_sample_t {
     fn from(f: F) -> Self {
         let this = Box::into_raw(Box::new(f)) as _;
-        extern "C" fn call<F: Fn(&z_loaned_sample_t)>(
-            sample: &z_loaned_sample_t,
+        extern "C" fn call<F: Fn(&mut z_loaned_sample_t)>(
+            sample: &mut z_loaned_sample_t,
             this: *mut c_void,
         ) {
             let this = unsafe { &*(this as *const F) };
diff --git a/src/closures/zenohid_closure.rs b/src/closures/zenohid_closure.rs
index 062a912fe..035e76c3b 100644
--- a/src/closures/zenohid_closure.rs
+++ b/src/closures/zenohid_closure.rs
@@ -34,7 +34,7 @@ pub struct z_owned_closure_zid_t {
     /// An optional pointer to a closure state.
     context: *mut c_void,
     /// A callback function.
-    call: Option<extern "C" fn(z_id: &z_id_t, context: *mut c_void)>,
+    call: Option<extern "C" fn(z_id: &mut z_id_t, context: *mut c_void)>,
     /// An optional function that will be called upon closure drop.
     drop: Option<extern "C" fn(context: *mut c_void)>,
 }
diff --git a/src/get.rs b/src/get.rs
index da5fc9dc4..9687f942f 100644
--- a/src/get.rs
+++ b/src/get.rs
@@ -266,10 +266,10 @@ pub unsafe extern "C" fn z_get(
         }
     }
     match get
-        .callback(move |response| {
+        .callback(move |mut response| {
             z_closure_reply_call(
                 z_closure_reply_loan(&callback),
-                response.as_loaned_c_type_ref(),
+                response.as_loaned_c_type_mut(),
             )
         })
         .wait()
diff --git a/src/queryable.rs b/src/queryable.rs
index b55b39170..f48486b40 100644
--- a/src/queryable.rs
+++ b/src/queryable.rs
@@ -234,10 +234,10 @@ pub extern "C" fn z_declare_queryable(
         builder = builder.complete(options.complete);
     }
     let queryable = builder
-        .callback(move |query| {
+        .callback(move |mut query| {
             z_closure_query_call(
                 z_closure_query_loan(&callback),
-                query.as_loaned_c_type_ref(),
+                query.as_loaned_c_type_mut(),
             )
         })
         .wait();
diff --git a/src/scouting.rs b/src/scouting.rs
index 9b54ba593..5a46eeae6 100644
--- a/src/scouting.rs
+++ b/src/scouting.rs
@@ -177,8 +177,8 @@ pub extern "C" fn z_scout(
 
     task::block_on(async move {
         let scout = zenoh::scout(what, config)
-            .callback(move |h| {
-                z_closure_hello_call(z_closure_hello_loan(&callback), h.as_loaned_c_type_ref())
+            .callback(move |mut h| {
+                z_closure_hello_call(z_closure_hello_loan(&callback), h.as_loaned_c_type_mut())
             })
             .await
             .unwrap();
diff --git a/src/subscriber.rs b/src/subscriber.rs
index 35e3e4a48..424439d06 100644
--- a/src/subscriber.rs
+++ b/src/subscriber.rs
@@ -83,8 +83,8 @@ pub extern "C" fn z_declare_subscriber(
     let callback = callback.take_rust_type();
     let subscriber = session
         .declare_subscriber(key_expr)
-        .callback(move |sample| {
-            let sample = sample.as_loaned_c_type_ref();
+        .callback(move |mut sample| {
+            let sample = sample.as_loaned_c_type_mut();
             z_closure_sample_call(z_closure_sample_loan(&callback), sample)
         });
     match subscriber.wait() {

From db880762dc4891664b212f669d21b4cef7db07f7 Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Thu, 12 Sep 2024 14:55:13 +0200
Subject: [PATCH 02/10] missed mut added

---
 include/zenoh_commons.h                 | 4 ++--
 src/closures/matching_status_closure.rs | 8 ++++----
 src/closures/zenohid_closure.rs         | 6 +++---
 src/info.rs                             | 8 ++++----
 src/liveliness.rs                       | 8 ++++----
 src/publisher.rs                        | 4 ++--
 src/querying_subscriber.rs              | 4 ++--
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h
index 64f9bf760..73e755e6d 100644
--- a/include/zenoh_commons.h
+++ b/include/zenoh_commons.h
@@ -1928,7 +1928,7 @@ const struct z_loaned_closure_sample_t *z_closure_sample_loan(const struct z_own
 #if defined(UNSTABLE)
 ZENOHC_API
 void z_closure_zid_call(const struct z_loaned_closure_zid_t *closure,
-                        const z_id_t *z_id);
+                        z_id_t *z_id);
 #endif
 /**
  * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
@@ -4797,7 +4797,7 @@ const struct zc_loaned_closure_log_t *zc_closure_log_loan(const struct zc_owned_
 #if defined(UNSTABLE)
 ZENOHC_API
 void zc_closure_matching_status_call(const struct zc_loaned_closure_matching_status_t *closure,
-                                     const struct zc_matching_status_t *mathing_status);
+                                     struct zc_matching_status_t *mathing_status);
 #endif
 /**
  * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
diff --git a/src/closures/matching_status_closure.rs b/src/closures/matching_status_closure.rs
index c00267dac..f46845506 100644
--- a/src/closures/matching_status_closure.rs
+++ b/src/closures/matching_status_closure.rs
@@ -106,7 +106,7 @@ pub extern "C" fn zc_internal_closure_matching_status_check(
 #[no_mangle]
 pub extern "C" fn zc_closure_matching_status_call(
     closure: &zc_loaned_closure_matching_status_t,
-    mathing_status: &zc_matching_status_t,
+    mathing_status: &mut zc_matching_status_t,
 ) {
     let closure = closure.as_owned_c_type_ref();
     match closure.call {
@@ -126,11 +126,11 @@ pub extern "C" fn zc_closure_matching_status_drop(
     let _ = closure_.take_rust_type();
 }
 
-impl<F: Fn(&zc_matching_status_t)> From<F> for zc_owned_closure_matching_status_t {
+impl<F: Fn(&mut zc_matching_status_t)> From<F> for zc_owned_closure_matching_status_t {
     fn from(f: F) -> Self {
         let this = Box::into_raw(Box::new(f)) as _;
-        extern "C" fn call<F: Fn(&zc_matching_status_t)>(
-            response: &zc_matching_status_t,
+        extern "C" fn call<F: Fn(&mut zc_matching_status_t)>(
+            response: &mut zc_matching_status_t,
             this: *mut c_void,
         ) {
             let this = unsafe { &*(this as *const F) };
diff --git a/src/closures/zenohid_closure.rs b/src/closures/zenohid_closure.rs
index 035e76c3b..bb143ae35 100644
--- a/src/closures/zenohid_closure.rs
+++ b/src/closures/zenohid_closure.rs
@@ -105,7 +105,7 @@ pub unsafe extern "C" fn z_internal_closure_zid_null(
 /// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
 /// @brief Calls the closure. Calling an uninitialized closure is a no-op.
 #[no_mangle]
-pub extern "C" fn z_closure_zid_call(closure: &z_loaned_closure_zid_t, z_id: &z_id_t) {
+pub extern "C" fn z_closure_zid_call(closure: &z_loaned_closure_zid_t, z_id: &mut z_id_t) {
     let closure = closure.as_owned_c_type_ref();
     match closure.call {
         Some(call) => call(z_id, closure.context),
@@ -122,10 +122,10 @@ pub extern "C" fn z_closure_zid_drop(closure_: &mut z_moved_closure_zid_t) {
     let _ = closure_.take_rust_type();
 }
 
-impl<F: Fn(&z_id_t)> From<F> for z_owned_closure_zid_t {
+impl<F: Fn(&mut z_id_t)> From<F> for z_owned_closure_zid_t {
     fn from(f: F) -> Self {
         let this = Box::into_raw(Box::new(f)) as _;
-        extern "C" fn call<F: Fn(&z_id_t)>(response: &z_id_t, this: *mut c_void) {
+        extern "C" fn call<F: Fn(&mut z_id_t)>(response: &mut z_id_t, this: *mut c_void) {
             let this = unsafe { &*(this as *const F) };
             this(response)
         }
diff --git a/src/info.rs b/src/info.rs
index 86ae8b478..23f884584 100644
--- a/src/info.rs
+++ b/src/info.rs
@@ -66,8 +66,8 @@ pub unsafe extern "C" fn z_info_peers_zid(
 ) -> result::z_result_t {
     let session = session.as_rust_type_ref();
     let callback = callback.take_rust_type();
-    for id in session.info().peers_zid().wait() {
-        z_closure_zid_call(z_closure_zid_loan(&callback), id.as_ctype_ref());
+    for mut id in session.info().peers_zid().wait() {
+        z_closure_zid_call(z_closure_zid_loan(&callback), id.as_ctype_mut());
     }
     result::Z_OK
 }
@@ -87,8 +87,8 @@ pub unsafe extern "C" fn z_info_routers_zid(
 ) -> result::z_result_t {
     let session = session.as_rust_type_ref();
     let callback = callback.take_rust_type();
-    for id in session.info().routers_zid().wait() {
-        z_closure_zid_call(z_closure_zid_loan(&callback), id.as_ctype_ref());
+    for mut id in session.info().routers_zid().wait() {
+        z_closure_zid_call(z_closure_zid_loan(&callback), id.as_ctype_mut());
     }
     result::Z_OK
 }
diff --git a/src/liveliness.rs b/src/liveliness.rs
index f03afdaa6..4d37ef7ef 100644
--- a/src/liveliness.rs
+++ b/src/liveliness.rs
@@ -174,8 +174,8 @@ pub extern "C" fn zc_liveliness_declare_subscriber(
         .liveliness()
         .declare_subscriber(key_expr)
         .history(options.is_some_and(|o| o.history))
-        .callback(move |sample| {
-            let sample = sample.as_loaned_c_type_ref();
+        .callback(move |mut sample| {
+            let sample = sample.as_loaned_c_type_mut();
             z_closure_sample_call(z_closure_sample_loan(&callback), sample)
         })
         .wait()
@@ -226,10 +226,10 @@ pub extern "C" fn zc_liveliness_get(
     let key_expr = key_expr.as_rust_type_ref();
     let callback = callback.take_rust_type();
     let liveliness: Liveliness<'static> = session.liveliness();
-    let mut builder = liveliness.get(key_expr).callback(move |response| {
+    let mut builder = liveliness.get(key_expr).callback(move |mut response| {
         z_closure_reply_call(
             z_closure_reply_loan(&callback),
-            response.as_loaned_c_type_ref(),
+            response.as_loaned_c_type_mut(),
         )
     });
     if let Some(options) = options {
diff --git a/src/publisher.rs b/src/publisher.rs
index 424e043ba..5cb379efb 100644
--- a/src/publisher.rs
+++ b/src/publisher.rs
@@ -362,10 +362,10 @@ pub extern "C" fn zc_publisher_matching_listener_declare(
     let listener = publisher
         .matching_listener()
         .callback_mut(move |matching_status| {
-            let status = zc_matching_status_t {
+            let mut status = zc_matching_status_t {
                 matching: matching_status.matching_subscribers(),
             };
-            zc_closure_matching_status_call(zc_closure_matching_status_loan(&callback), &status);
+            zc_closure_matching_status_call(zc_closure_matching_status_loan(&callback), &mut status);
         })
         .wait();
     match listener {
diff --git a/src/querying_subscriber.rs b/src/querying_subscriber.rs
index ed0dfafab..58420954d 100644
--- a/src/querying_subscriber.rs
+++ b/src/querying_subscriber.rs
@@ -131,8 +131,8 @@ pub unsafe extern "C" fn ze_declare_querying_subscriber(
             sub = sub.query_timeout(std::time::Duration::from_millis(options.query_timeout_ms));
         }
     }
-    let sub = sub.callback(move |sample| {
-        let sample = sample.as_loaned_c_type_ref();
+    let sub = sub.callback(move |mut sample| {
+        let sample = sample.as_loaned_c_type_mut();
         z_closure_sample_call(z_closure_sample_loan(&callback), sample);
     });
     match sub.wait() {

From 1288b6eaa5489603b43bda84778e4faffbf898f4 Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Thu, 12 Sep 2024 15:39:08 +0200
Subject: [PATCH 03/10] cargo fmt

---
 src/closures/query_closure.rs | 5 ++++-
 src/publisher.rs              | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/closures/query_closure.rs b/src/closures/query_closure.rs
index 5168ca6f5..73288cefb 100644
--- a/src/closures/query_closure.rs
+++ b/src/closures/query_closure.rs
@@ -116,7 +116,10 @@ pub extern "C" fn z_closure_query_drop(closure_: &mut z_moved_closure_query_t) {
 impl<F: Fn(&mut z_loaned_query_t)> From<F> for z_owned_closure_query_t {
     fn from(f: F) -> Self {
         let this = Box::into_raw(Box::new(f)) as _;
-        extern "C" fn call<F: Fn(&mut z_loaned_query_t)>(query: &mut z_loaned_query_t, this: *mut c_void) {
+        extern "C" fn call<F: Fn(&mut z_loaned_query_t)>(
+            query: &mut z_loaned_query_t,
+            this: *mut c_void,
+        ) {
             let this = unsafe { &*(this as *const F) };
             this(query)
         }
diff --git a/src/publisher.rs b/src/publisher.rs
index 5cb379efb..dba64efdc 100644
--- a/src/publisher.rs
+++ b/src/publisher.rs
@@ -365,7 +365,10 @@ pub extern "C" fn zc_publisher_matching_listener_declare(
             let mut status = zc_matching_status_t {
                 matching: matching_status.matching_subscribers(),
             };
-            zc_closure_matching_status_call(zc_closure_matching_status_loan(&callback), &mut status);
+            zc_closure_matching_status_call(
+                zc_closure_matching_status_loan(&callback),
+                &mut status,
+            );
         })
         .wait();
     match listener {

From 8a38c578058814023dc404bf3156127fac700376 Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Thu, 12 Sep 2024 15:58:42 +0200
Subject: [PATCH 04/10] z_id_t is copy type, pass it by const ref

---
 include/zenoh_commons.h         | 4 ++--
 src/closures/zenohid_closure.rs | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h
index 80a2fb2ad..72e1e68ff 100644
--- a/include/zenoh_commons.h
+++ b/include/zenoh_commons.h
@@ -583,7 +583,7 @@ typedef struct z_owned_closure_zid_t {
   /**
    * A callback function.
    */
-  void (*call)(z_id_t *z_id, void *context);
+  void (*call)(const z_id_t *z_id, void *context);
   /**
    * An optional function that will be called upon closure drop.
    */
@@ -1927,7 +1927,7 @@ const struct z_loaned_closure_sample_t *z_closure_sample_loan(const struct z_own
 #if defined(UNSTABLE)
 ZENOHC_API
 void z_closure_zid_call(const struct z_loaned_closure_zid_t *closure,
-                        z_id_t *z_id);
+                        const z_id_t *z_id);
 #endif
 /**
  * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
diff --git a/src/closures/zenohid_closure.rs b/src/closures/zenohid_closure.rs
index bb143ae35..062a912fe 100644
--- a/src/closures/zenohid_closure.rs
+++ b/src/closures/zenohid_closure.rs
@@ -34,7 +34,7 @@ pub struct z_owned_closure_zid_t {
     /// An optional pointer to a closure state.
     context: *mut c_void,
     /// A callback function.
-    call: Option<extern "C" fn(z_id: &mut z_id_t, context: *mut c_void)>,
+    call: Option<extern "C" fn(z_id: &z_id_t, context: *mut c_void)>,
     /// An optional function that will be called upon closure drop.
     drop: Option<extern "C" fn(context: *mut c_void)>,
 }
@@ -105,7 +105,7 @@ pub unsafe extern "C" fn z_internal_closure_zid_null(
 /// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
 /// @brief Calls the closure. Calling an uninitialized closure is a no-op.
 #[no_mangle]
-pub extern "C" fn z_closure_zid_call(closure: &z_loaned_closure_zid_t, z_id: &mut z_id_t) {
+pub extern "C" fn z_closure_zid_call(closure: &z_loaned_closure_zid_t, z_id: &z_id_t) {
     let closure = closure.as_owned_c_type_ref();
     match closure.call {
         Some(call) => call(z_id, closure.context),
@@ -122,10 +122,10 @@ pub extern "C" fn z_closure_zid_drop(closure_: &mut z_moved_closure_zid_t) {
     let _ = closure_.take_rust_type();
 }
 
-impl<F: Fn(&mut z_id_t)> From<F> for z_owned_closure_zid_t {
+impl<F: Fn(&z_id_t)> From<F> for z_owned_closure_zid_t {
     fn from(f: F) -> Self {
         let this = Box::into_raw(Box::new(f)) as _;
-        extern "C" fn call<F: Fn(&mut z_id_t)>(response: &mut z_id_t, this: *mut c_void) {
+        extern "C" fn call<F: Fn(&z_id_t)>(response: &z_id_t, this: *mut c_void) {
             let this = unsafe { &*(this as *const F) };
             this(response)
         }

From 42e52b43b47ef670bfef0daf55c0ee840cb079fc Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Thu, 12 Sep 2024 16:14:42 +0200
Subject: [PATCH 05/10] tests, examples updated, matching_status const restored

---
 Cargo.toml                              |  2 +-
 examples/z_ping.c                       |  2 +-
 examples/z_ping_shm.c                   |  2 +-
 examples/z_pong.c                       |  2 +-
 examples/z_queryable.c                  |  2 +-
 examples/z_scout.c                      |  2 +-
 examples/z_sub.c                        |  2 +-
 examples/z_sub_attachment.c             |  2 +-
 examples/z_sub_thr.c                    |  2 +-
 include/zenoh_commons.h                 |  4 ++--
 src/closures/matching_status_closure.rs | 10 +++++-----
 tests/z_api_alignment_test.c            |  8 ++++----
 tests/z_api_double_drop_test.c          |  4 ++--
 tests/z_api_drop_options.c              |  2 +-
 tests/z_api_keyexpr_drop_test.c         |  2 +-
 tests/z_int_pub_sub_attachment_test.c   |  2 +-
 tests/z_int_pub_sub_test.c              |  2 +-
 tests/z_int_queryable_attachment_test.c |  2 +-
 tests/z_int_queryable_test.c            |  2 +-
 tests/z_leak_pub_sub_test.c             |  2 +-
 tests/z_leak_queryable_get_test.c       |  2 +-
 21 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index cb302083b..1f86b4cbd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,7 +69,7 @@ phf = { version = "0.11.2", features = ["macros"] }
 
 [lib]
 path = "src/lib.rs"
-name = "zenohc"
+name = "zenohcd"
 crate-type = ["cdylib", "staticlib"]
 doctest = false
 
diff --git a/examples/z_ping.c b/examples/z_ping.c
index 72d983236..4879f41fc 100644
--- a/examples/z_ping.c
+++ b/examples/z_ping.c
@@ -21,7 +21,7 @@
 z_owned_condvar_t cond;
 z_owned_mutex_t mutex;
 
-void callback(const z_loaned_sample_t* sample, void* context) { z_condvar_signal(z_loan(cond)); }
+void callback(z_loaned_sample_t* sample, void* context) { z_condvar_signal(z_loan(cond)); }
 void drop(void* context) { z_drop(z_move(cond)); }
 
 struct args_t {
diff --git a/examples/z_ping_shm.c b/examples/z_ping_shm.c
index 10482a6c2..b9d01c414 100644
--- a/examples/z_ping_shm.c
+++ b/examples/z_ping_shm.c
@@ -20,7 +20,7 @@
 z_owned_condvar_t cond;
 z_owned_mutex_t mutex;
 
-void callback(const z_loaned_sample_t* sample, void* context) { z_condvar_signal(z_loan(cond)); }
+void callback(z_loaned_sample_t* sample, void* context) { z_condvar_signal(z_loan(cond)); }
 void drop(void* context) { z_drop(z_move(cond)); }
 
 struct args_t {
diff --git a/examples/z_pong.c b/examples/z_pong.c
index d7eda1bb9..98056dd8b 100644
--- a/examples/z_pong.c
+++ b/examples/z_pong.c
@@ -6,7 +6,7 @@
 
 void parse_args(int argc, char** argv, z_owned_config_t* config);
 
-void callback(const z_loaned_sample_t* sample, void* context) {
+void callback(z_loaned_sample_t* sample, void* context) {
     const z_loaned_publisher_t* pub = z_loan(*(z_owned_publisher_t*)context);
     z_owned_bytes_t payload;
     z_bytes_clone(&payload, z_sample_payload(sample));
diff --git a/examples/z_queryable.c b/examples/z_queryable.c
index 45e073069..91168a5f9 100644
--- a/examples/z_queryable.c
+++ b/examples/z_queryable.c
@@ -30,7 +30,7 @@ char *value;
 
 struct args_t parse_args(int argc, char **argv, z_owned_config_t *config);
 
-void query_handler(const z_loaned_query_t *query, void *context) {
+void query_handler(z_loaned_query_t *query, void *context) {
     z_view_string_t key_string;
     z_keyexpr_as_view_string(z_query_keyexpr(query), &key_string);
 
diff --git a/examples/z_scout.c b/examples/z_scout.c
index c0f3c02d1..dae7bbc47 100644
--- a/examples/z_scout.c
+++ b/examples/z_scout.c
@@ -72,7 +72,7 @@ void fprinthello(FILE *stream, const z_loaned_hello_t *hello) {
     fprintf(stream, " }");
 }
 
-void callback(const z_loaned_hello_t *hello, void *context) {
+void callback(z_loaned_hello_t *hello, void *context) {
     fprinthello(stdout, hello);
     fprintf(stdout, "\n");
     (*(int *)context)++;
diff --git a/examples/z_sub.c b/examples/z_sub.c
index ebb4e6a6b..5faa675a6 100644
--- a/examples/z_sub.c
+++ b/examples/z_sub.c
@@ -25,7 +25,7 @@ struct args_t parse_args(int argc, char **argv, z_owned_config_t *config);
 
 const char *kind_to_str(z_sample_kind_t kind);
 
-void data_handler(const z_loaned_sample_t *sample, void *arg) {
+void data_handler(z_loaned_sample_t *sample, void *arg) {
     z_view_string_t key_string;
     z_keyexpr_as_view_string(z_sample_keyexpr(sample), &key_string);
 
diff --git a/examples/z_sub_attachment.c b/examples/z_sub_attachment.c
index 43a67b303..312870e1e 100644
--- a/examples/z_sub_attachment.c
+++ b/examples/z_sub_attachment.c
@@ -25,7 +25,7 @@ struct args_t {
 struct args_t parse_args(int argc, char** argv, z_owned_config_t* config);
 const char* kind_to_str(z_sample_kind_t kind);
 
-void data_handler(const z_loaned_sample_t* sample, void* arg) {
+void data_handler(z_loaned_sample_t* sample, void* arg) {
     z_view_string_t key_string;
     z_keyexpr_as_view_string(z_sample_keyexpr(sample), &key_string);
 
diff --git a/examples/z_sub_thr.c b/examples/z_sub_thr.c
index 1a8d8e3f5..bb608dc1a 100644
--- a/examples/z_sub_thr.c
+++ b/examples/z_sub_thr.c
@@ -36,7 +36,7 @@ z_stats_t *z_stats_make() {
     return stats;
 }
 
-void on_sample(const z_loaned_sample_t *sample, void *context) {
+void on_sample(z_loaned_sample_t *sample, void *context) {
     z_stats_t *stats = (z_stats_t *)context;
     if (stats->count == 0) {
         stats->start = z_clock_now();
diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h
index 72e1e68ff..bc049c36d 100644
--- a/include/zenoh_commons.h
+++ b/include/zenoh_commons.h
@@ -1184,7 +1184,7 @@ typedef struct zc_owned_closure_matching_status_t {
   /**
    * A closure body.
    */
-  void (*call)(struct zc_matching_status_t *matching_status, void *context);
+  void (*call)(const struct zc_matching_status_t *matching_status, void *context);
   /**
    * An optional drop function that will be called when the closure is dropped.
    */
@@ -4800,7 +4800,7 @@ const struct zc_loaned_closure_log_t *zc_closure_log_loan(const struct zc_owned_
 #if defined(UNSTABLE)
 ZENOHC_API
 void zc_closure_matching_status_call(const struct zc_loaned_closure_matching_status_t *closure,
-                                     struct zc_matching_status_t *mathing_status);
+                                     const struct zc_matching_status_t *mathing_status);
 #endif
 /**
  * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
diff --git a/src/closures/matching_status_closure.rs b/src/closures/matching_status_closure.rs
index f46845506..c21fc7959 100644
--- a/src/closures/matching_status_closure.rs
+++ b/src/closures/matching_status_closure.rs
@@ -33,7 +33,7 @@ pub struct zc_owned_closure_matching_status_t {
     /// An optional pointer to a closure state.
     context: *mut c_void,
     /// A closure body.
-    call: Option<extern "C" fn(matching_status: &mut zc_matching_status_t, context: *mut c_void)>,
+    call: Option<extern "C" fn(matching_status: &zc_matching_status_t, context: *mut c_void)>,
     /// An optional drop function that will be called when the closure is dropped.
     drop: Option<extern "C" fn(context: *mut c_void)>,
 }
@@ -106,7 +106,7 @@ pub extern "C" fn zc_internal_closure_matching_status_check(
 #[no_mangle]
 pub extern "C" fn zc_closure_matching_status_call(
     closure: &zc_loaned_closure_matching_status_t,
-    mathing_status: &mut zc_matching_status_t,
+    mathing_status: &zc_matching_status_t,
 ) {
     let closure = closure.as_owned_c_type_ref();
     match closure.call {
@@ -126,11 +126,11 @@ pub extern "C" fn zc_closure_matching_status_drop(
     let _ = closure_.take_rust_type();
 }
 
-impl<F: Fn(&mut zc_matching_status_t)> From<F> for zc_owned_closure_matching_status_t {
+impl<F: Fn(&zc_matching_status_t)> From<F> for zc_owned_closure_matching_status_t {
     fn from(f: F) -> Self {
         let this = Box::into_raw(Box::new(f)) as _;
-        extern "C" fn call<F: Fn(&mut zc_matching_status_t)>(
-            response: &mut zc_matching_status_t,
+        extern "C" fn call<F: Fn(&zc_matching_status_t)>(
+            response: &zc_matching_status_t,
             this: *mut c_void,
         ) {
             let this = unsafe { &*(this as *const F) };
diff --git a/tests/z_api_alignment_test.c b/tests/z_api_alignment_test.c
index a8ce64e89..58f243b9a 100644
--- a/tests/z_api_alignment_test.c
+++ b/tests/z_api_alignment_test.c
@@ -36,14 +36,14 @@ void zid_handler(const z_id_t *id, void *arg) {
 #endif
 
 volatile unsigned int hellos = 0;
-void hello_handler(const z_loaned_hello_t *hello, void *arg) {
+void hello_handler(z_loaned_hello_t *hello, void *arg) {
     (void)(arg);
     (void)(hello);
     hellos++;
 }
 
 volatile unsigned int queries = 0;
-void query_handler(const z_loaned_query_t *query, void *arg) {
+void query_handler(z_loaned_query_t *query, void *arg) {
     queries++;
 
     const z_loaned_keyexpr_t *query_ke = z_query_keyexpr(query);
@@ -71,7 +71,7 @@ void query_handler(const z_loaned_query_t *query, void *arg) {
 }
 
 volatile unsigned int replies = 0;
-void reply_handler(const z_loaned_reply_t *reply, void *arg) {
+void reply_handler(z_loaned_reply_t *reply, void *arg) {
     replies++;
 
     if (z_reply_is_ok(reply)) {
@@ -91,7 +91,7 @@ void reply_handler(const z_loaned_reply_t *reply, void *arg) {
 }
 
 volatile unsigned int datas = 0;
-void data_handler(const z_loaned_sample_t *sample, void *arg) {
+void data_handler(z_loaned_sample_t *sample, void *arg) {
     datas++;
 
     z_view_string_t k_str;
diff --git a/tests/z_api_double_drop_test.c b/tests/z_api_double_drop_test.c
index 2323ceca2..cf1da7f60 100644
--- a/tests/z_api_double_drop_test.c
+++ b/tests/z_api_double_drop_test.c
@@ -75,7 +75,7 @@ void test_config() {
     assert(!z_internal_check(config));
 }
 
-void data_handler(const z_loaned_sample_t *sample, void *arg) {}
+void data_handler(z_loaned_sample_t *sample, void *arg) {}
 
 void test_subscriber() {
     z_owned_config_t config;
@@ -97,7 +97,7 @@ void test_subscriber() {
     z_close(z_move(s), NULL);
 }
 
-void query_handler(const z_loaned_query_t *query, void *context) {}
+void query_handler(z_loaned_query_t *query, void *context) {}
 
 void test_queryable() {
     z_owned_config_t config;
diff --git a/tests/z_api_drop_options.c b/tests/z_api_drop_options.c
index c886f4cc9..369f683bd 100644
--- a/tests/z_api_drop_options.c
+++ b/tests/z_api_drop_options.c
@@ -18,7 +18,7 @@
 #undef NDEBUG
 #include <assert.h>
 
-void cb(const struct z_loaned_reply_t *reply, void *context) {}
+void cb(struct z_loaned_reply_t *reply, void *context) {}
 void drop(void *context) {}
 
 void put() {
diff --git a/tests/z_api_keyexpr_drop_test.c b/tests/z_api_keyexpr_drop_test.c
index 0dbc05618..f10544c98 100644
--- a/tests/z_api_keyexpr_drop_test.c
+++ b/tests/z_api_keyexpr_drop_test.c
@@ -43,7 +43,7 @@ void test_publisher() {
     z_close(z_move(s), NULL);
 }
 
-void data_handler(const z_loaned_sample_t *sample, void *arg) {}
+void data_handler(z_loaned_sample_t *sample, void *arg) {}
 
 void test_subscriber() {
     z_owned_config_t config;
diff --git a/tests/z_int_pub_sub_attachment_test.c b/tests/z_int_pub_sub_attachment_test.c
index 21d9fe9f3..fbaa5b1c1 100644
--- a/tests/z_int_pub_sub_attachment_test.c
+++ b/tests/z_int_pub_sub_attachment_test.c
@@ -131,7 +131,7 @@ int run_publisher() {
     return 0;
 }
 
-void data_handler(const z_loaned_sample_t *sample, void *arg) {
+void data_handler(z_loaned_sample_t *sample, void *arg) {
     static int val_num = 0;
     z_view_string_t keystr;
     z_keyexpr_as_view_string(z_sample_keyexpr(sample), &keystr);
diff --git a/tests/z_int_pub_sub_test.c b/tests/z_int_pub_sub_test.c
index d5bc39500..27f697c17 100644
--- a/tests/z_int_pub_sub_test.c
+++ b/tests/z_int_pub_sub_test.c
@@ -80,7 +80,7 @@ int run_publisher() {
     return 0;
 }
 
-void data_handler(const z_loaned_sample_t *sample, void *arg) {
+void data_handler(z_loaned_sample_t *sample, void *arg) {
     static int val_num = 0;
     z_view_string_t keystr;
     z_keyexpr_as_view_string(z_sample_keyexpr(sample), &keystr);
diff --git a/tests/z_int_queryable_attachment_test.c b/tests/z_int_queryable_attachment_test.c
index 375391d1b..8f04db4be 100644
--- a/tests/z_int_queryable_attachment_test.c
+++ b/tests/z_int_queryable_attachment_test.c
@@ -86,7 +86,7 @@ z_result_t check_attachment(const z_loaned_bytes_t *attachment, kv_it *it) {
     return 0;
 };
 
-void query_handler(const z_loaned_query_t *query, void *context) {
+void query_handler(z_loaned_query_t *query, void *context) {
     static int value_num = 0;
 
     z_view_string_t params;
diff --git a/tests/z_int_queryable_test.c b/tests/z_int_queryable_test.c
index 27d9308cf..567f8824c 100644
--- a/tests/z_int_queryable_test.c
+++ b/tests/z_int_queryable_test.c
@@ -30,7 +30,7 @@ const uint64_t TEST_SN = 24;
 const uint64_t TEST_TS = 401706000;
 const uint8_t TEST_ID = 123;
 
-void query_handler(const z_loaned_query_t *query, void *context) {
+void query_handler(z_loaned_query_t *query, void *context) {
     static int value_num = 0;
 
     z_view_string_t params;
diff --git a/tests/z_leak_pub_sub_test.c b/tests/z_leak_pub_sub_test.c
index ae9bf54c4..22b32e505 100644
--- a/tests/z_leak_pub_sub_test.c
+++ b/tests/z_leak_pub_sub_test.c
@@ -24,7 +24,7 @@
 const char *PUB_KEY_EXPR = "test/valgrind/data";
 const char *SUB_KEY_EXPR = "test/valgrind/**";
 
-void data_handler(const z_loaned_sample_t *sample, void *context) {
+void data_handler(z_loaned_sample_t *sample, void *context) {
     (void)context;
     z_view_string_t key_string;
     z_keyexpr_as_view_string(z_sample_keyexpr(sample), &key_string);
diff --git a/tests/z_leak_queryable_get_test.c b/tests/z_leak_queryable_get_test.c
index af1960f7a..343beaed8 100644
--- a/tests/z_leak_queryable_get_test.c
+++ b/tests/z_leak_queryable_get_test.c
@@ -24,7 +24,7 @@
 const char *GET_KEY_EXPR = "test/valgrind/data";
 const char *QUERYABLE_KEY_EXPR = "test/valgrind/**";
 
-void query_handler(const z_loaned_query_t *query, void *context) {
+void query_handler(z_loaned_query_t *query, void *context) {
     (void)context;
     z_view_string_t key_string;
     z_keyexpr_as_view_string(z_query_keyexpr(query), &key_string);

From 8002fd27be0f04dd94db962a3d6805ff8c3e0a13 Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Thu, 12 Sep 2024 16:22:59 +0200
Subject: [PATCH 06/10] clippy fix

---
 src/publisher.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/publisher.rs b/src/publisher.rs
index 09f9142ae..5c3123b9e 100644
--- a/src/publisher.rs
+++ b/src/publisher.rs
@@ -362,12 +362,12 @@ pub extern "C" fn zc_publisher_matching_listener_declare(
     let listener = publisher
         .matching_listener()
         .callback_mut(move |matching_status| {
-            let mut status = zc_matching_status_t {
+            let status = zc_matching_status_t {
                 matching: matching_status.matching_subscribers(),
             };
             zc_closure_matching_status_call(
                 zc_closure_matching_status_loan(&callback),
-                &mut status,
+                &status,
             );
         })
         .wait();

From 6fd7ad87c8613812483dd604a180c38648a8d7e0 Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Thu, 12 Sep 2024 16:42:32 +0200
Subject: [PATCH 07/10] cargo fmt

---
 src/publisher.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/publisher.rs b/src/publisher.rs
index 5c3123b9e..45988959b 100644
--- a/src/publisher.rs
+++ b/src/publisher.rs
@@ -365,10 +365,7 @@ pub extern "C" fn zc_publisher_matching_listener_declare(
             let status = zc_matching_status_t {
                 matching: matching_status.matching_subscribers(),
             };
-            zc_closure_matching_status_call(
-                zc_closure_matching_status_loan(&callback),
-                &status,
-            );
+            zc_closure_matching_status_call(zc_closure_matching_status_loan(&callback), &status);
         })
         .wait();
     match listener {

From 73d0b4b5ac2457db6572b5cc9541d60f47fe538e Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Thu, 12 Sep 2024 17:17:09 +0200
Subject: [PATCH 08/10] build fixes

---
 tests/z_api_liveliness.c               | 2 +-
 tests/z_int_pub_cache_query_sub_test.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/z_api_liveliness.c b/tests/z_api_liveliness.c
index 7fe13dc6c..c7465132a 100644
--- a/tests/z_api_liveliness.c
+++ b/tests/z_api_liveliness.c
@@ -30,7 +30,7 @@ typedef struct context_t {
 const char* token1_expr = "zenoh/liveliness/test/1";
 const char* token2_expr = "zenoh/liveliness/test/2";
 
-void on_receive(const z_loaned_sample_t* s, void* context) {
+void on_receive(z_loaned_sample_t* s, void* context) {
     context_t* c = (context_t*)context;
     const z_loaned_keyexpr_t* k = z_sample_keyexpr(s);
     z_view_string_t ks;
diff --git a/tests/z_int_pub_cache_query_sub_test.c b/tests/z_int_pub_cache_query_sub_test.c
index ea2babd1f..695b939cd 100644
--- a/tests/z_int_pub_cache_query_sub_test.c
+++ b/tests/z_int_pub_cache_query_sub_test.c
@@ -91,7 +91,7 @@ int run_publisher() {
     return 0;
 }
 
-void data_handler(const z_loaned_sample_t *sample, void *arg) {
+void data_handler(z_loaned_sample_t *sample, void *arg) {
     static int val_num = 0;
     z_view_string_t keystr;
     z_keyexpr_as_view_string(z_sample_keyexpr(sample), &keystr);

From 5395e7a386fc60c6983cbbfc0ce193dd42582f10 Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Thu, 12 Sep 2024 17:28:55 +0200
Subject: [PATCH 09/10] cargo toml restored

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1f86b4cbd..cb302083b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,7 +69,7 @@ phf = { version = "0.11.2", features = ["macros"] }
 
 [lib]
 path = "src/lib.rs"
-name = "zenohcd"
+name = "zenohc"
 crate-type = ["cdylib", "staticlib"]
 doctest = false
 

From e517fd3c17e1966b5530e2932b365c5018053f6f Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Thu, 12 Sep 2024 17:58:03 +0200
Subject: [PATCH 10/10] build fix

---
 examples/z_query_sub.c      | 2 +-
 examples/z_queryable_shm.c  | 2 +-
 examples/z_sub_liveliness.c | 2 +-
 examples/z_sub_shm.c        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/z_query_sub.c b/examples/z_query_sub.c
index 96ac2049f..eddde1b16 100644
--- a/examples/z_query_sub.c
+++ b/examples/z_query_sub.c
@@ -25,7 +25,7 @@ struct args_t parse_args(int argc, char** argv, z_owned_config_t* config);
 
 const char* kind_to_str(z_sample_kind_t kind);
 
-void data_handler(const z_loaned_sample_t* sample, void* arg) {
+void data_handler(z_loaned_sample_t* sample, void* arg) {
     z_view_string_t key_string;
     z_keyexpr_as_view_string(z_sample_keyexpr(sample), &key_string);
     z_owned_string_t payload_string;
diff --git a/examples/z_queryable_shm.c b/examples/z_queryable_shm.c
index b70b9a843..0ec351b8c 100644
--- a/examples/z_queryable_shm.c
+++ b/examples/z_queryable_shm.c
@@ -20,7 +20,7 @@ const char *keyexpr = "demo/example/zenoh-c-queryable";
 const char *value = "Queryable from C SHM!";
 z_view_keyexpr_t ke;
 
-void query_handler(const z_loaned_query_t *query, void *context) {
+void query_handler(z_loaned_query_t *query, void *context) {
     z_loaned_shm_provider_t *provider = (z_loaned_shm_provider_t *)context;
 
     z_view_string_t key_string;
diff --git a/examples/z_sub_liveliness.c b/examples/z_sub_liveliness.c
index b67a2d8b9..73b01582d 100644
--- a/examples/z_sub_liveliness.c
+++ b/examples/z_sub_liveliness.c
@@ -23,7 +23,7 @@ struct args_t {
 };
 struct args_t parse_args(int argc, char** argv, z_owned_config_t* config);
 
-void data_handler(const z_loaned_sample_t* sample, void* arg) {
+void data_handler(z_loaned_sample_t* sample, void* arg) {
     z_view_string_t key_string;
     z_keyexpr_as_view_string(z_sample_keyexpr(sample), &key_string);
     switch (z_sample_kind(sample)) {
diff --git a/examples/z_sub_shm.c b/examples/z_sub_shm.c
index f6a6fad7e..ce5f5b29a 100644
--- a/examples/z_sub_shm.c
+++ b/examples/z_sub_shm.c
@@ -17,7 +17,7 @@
 
 const char *kind_to_str(z_sample_kind_t kind);
 
-void data_handler(const z_loaned_sample_t *sample, void *arg) {
+void data_handler(z_loaned_sample_t *sample, void *arg) {
     z_view_string_t key_string;
     z_keyexpr_as_view_string(z_sample_keyexpr(sample), &key_string);