Merge pull request #2 from jean-roland/ft_reply_rc

Switch query callback replies to rc

Author: jean-roland

examples/arduino/z_get.ino

@@ -42,7 +42,7 @@ void reply_dropper(void *ctx) {
     Serial.println(" >> Received query final notification");
 }
 
-void reply_handler(z_owned_reply_t *oreply, void *ctx) {
+void reply_handler(const z_loaned_reply_t *oreply, void *ctx) {
     (void)(ctx);
     if (z_reply_is_ok(oreply)) {
         const z_loaned_sample_t *sample = z_reply_ok(oreply);

examples/espidf/z_get.c

@@ -103,7 +103,7 @@ void wifi_init_sta(void) {
 
 void reply_dropper(void *ctx) { printf(" >> Received query final notification\n"); }
 
-void reply_handler(z_owned_reply_t *oreply, void *ctx) {
+void reply_handler(const z_loaned_reply_t *oreply, void *ctx) {
     if (z_reply_is_ok(oreply)) {
         const z_loaned_sample_t *sample = z_reply_ok(oreply);
         z_owned_str_t keystr;

examples/freertos_plus_tcp/z_get.c

@@ -36,7 +36,7 @@ void reply_dropper(void *ctx) {
     printf(">> Received query final notification\n");
 }
 
-void reply_handler(z_owned_reply_t *reply, void *ctx) {
+void reply_handler(const z_loaned_reply_t *reply, void *ctx) {
     (void)(ctx);
     if (z_reply_is_ok(reply)) {
         const z_loaned_sample_t *sample = z_reply_ok(reply);

examples/mbed/z_get.cpp

@@ -33,7 +33,7 @@
 
 void reply_dropper(void *ctx) { printf(" >> Received query final notification\n"); }
 
-void reply_handler(z_owned_reply_t *oreply, void *ctx) {
+void reply_handler(const z_loaned_reply_t *oreply, void *ctx) {
     if (z_reply_is_ok(oreply)) {
         const z_loaned_sample_t *sample = z_reply_ok(oreply);
         z_owned_str_t keystr;

examples/unix/c11/z_get.c

@@ -37,7 +37,7 @@ int8_t attachment_handler(z_bytes_t key, z_bytes_t att_value, void *ctx) {
 }
 #endif
 
-void reply_handler(z_owned_reply_t *reply, void *ctx) {
+void reply_handler(const z_loaned_reply_t *reply, void *ctx) {
     (void)(ctx);
     if (z_reply_is_ok(reply)) {
         const z_loaned_sample_t *sample = z_reply_ok(reply);

examples/unix/c11/z_get_channel.c

@@ -103,8 +103,8 @@ int main(int argc, char **argv) {
     z_owned_reply_t reply;
     z_null(&reply);
     for (z_call(channel.recv, &reply); z_check(reply); z_call(channel.recv, &reply)) {
-        if (z_reply_is_ok(&reply)) {
-            const z_loaned_sample_t *sample = z_reply_ok(&reply);
+        if (z_reply_is_ok(z_loan(reply))) {
+            const z_loaned_sample_t *sample = z_reply_ok(z_loan(reply));
             z_owned_str_t keystr;
             z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
             printf(">> Received ('%s': '%.*s')\n", z_str_data(z_loan(keystr)), (int)z_sample_payload(sample)->len,

examples/unix/c99/z_get.c

@@ -29,7 +29,7 @@ void reply_dropper(void *ctx) {
     z_condvar_free(&cond);
 }
 
-void reply_handler(z_owned_reply_t *reply, void *ctx) {
+void reply_handler(const z_loaned_reply_t *reply, void *ctx) {
     (void)(ctx);
     if (z_reply_is_ok(reply)) {
         const z_loaned_sample_t *sample = z_reply_ok(reply);

examples/windows/z_get.c

@@ -28,7 +28,7 @@ void reply_dropper(void *ctx) {
     z_condvar_free(&cond);
 }
 
-void reply_handler(z_owned_reply_t *reply, void *ctx) {
+void reply_handler(const z_loaned_reply_t *reply, void *ctx) {
     (void)(ctx);
     if (z_reply_is_ok(reply)) {
         const z_loaned_sample_t *sample = z_reply_ok(reply);

examples/zephyr/z_get.c

@@ -33,7 +33,7 @@
 
 void reply_dropper(void *ctx) { printf(" >> Received query final notification\n"); }
 
-void reply_handler(z_owned_reply_t *oreply, void *ctx) {
+void reply_handler(const z_loaned_reply_t *oreply, void *ctx) {
     if (z_reply_is_ok(oreply)) {
         const z_loaned_sample_t *sample = z_reply_ok(oreply);
         z_owned_str_t keystr;

include/zenoh-pico/api/handlers.h

@@ -33,7 +33,7 @@ z_owned_query_t *_z_query_to_owned_ptr(const z_loaned_query_t *src);
 
 // -- Reply handler
 void _z_owned_reply_move(z_owned_reply_t *dst, z_owned_reply_t *src);
-z_owned_reply_t *_z_reply_clone(const z_owned_reply_t *src);
+z_owned_reply_t *_z_reply_to_owned_ptr(const z_loaned_reply_t *src);
 
 // -- Channel
 #define _Z_CHANNEL_DEFINE(name, send_closure_name, recv_closure_name, send_type, recv_type, collection_type, \
@@ -112,13 +112,13 @@ _Z_CHANNEL_DEFINE(query_fifo_channel, closure_query, closure_owned_query, const
                   _z_owned_query_move, _z_query_to_owned_ptr, z_query_drop)
 
 // z_owned_reply_ring_channel_t
-_Z_CHANNEL_DEFINE(reply_ring_channel, closure_reply, closure_reply, z_owned_reply_t, z_owned_reply_t, _z_ring_mt_t,
-                  _z_ring_mt_new, _z_ring_mt_free, _z_ring_mt_push, _z_ring_mt_pull, _z_ring_mt_try_pull,
-                  _z_owned_reply_move, _z_reply_clone, z_reply_drop)
+_Z_CHANNEL_DEFINE(reply_ring_channel, closure_reply, closure_owned_reply, const z_loaned_reply_t, z_owned_reply_t,
+                  _z_ring_mt_t, _z_ring_mt_new, _z_ring_mt_free, _z_ring_mt_push, _z_ring_mt_pull, _z_ring_mt_try_pull,
+                  _z_owned_reply_move, _z_reply_to_owned_ptr, z_reply_drop)
 
 // z_owned_reply_fifo_channel_t
-_Z_CHANNEL_DEFINE(reply_fifo_channel, closure_reply, closure_reply, z_owned_reply_t, z_owned_reply_t, _z_fifo_mt_t,
-                  _z_fifo_mt_new, _z_fifo_mt_free, _z_fifo_mt_push, _z_fifo_mt_pull, _z_fifo_mt_try_pull,
-                  _z_owned_reply_move, _z_reply_clone, z_reply_drop)
+_Z_CHANNEL_DEFINE(reply_fifo_channel, closure_reply, closure_owned_reply, const z_loaned_reply_t, z_owned_reply_t,
+                  _z_fifo_mt_t, _z_fifo_mt_new, _z_fifo_mt_free, _z_fifo_mt_push, _z_fifo_mt_pull, _z_fifo_mt_try_pull,
+                  _z_owned_reply_move, _z_reply_to_owned_ptr, z_reply_drop)
 
 #endif  // INCLUDE_ZENOH_PICO_API_HANDLERS_H