Fixes for Zenoh-cpp compatibility (#434)

* fix z_owned_closure_hello_t to accept z_loaned_hello_t

* remove unneeded NULLs

* fix example

* void unused arg

* renamed value -> reply_err;
updated macros for zenoh-cpp;

* format

* alignment test fixes

* fixes

* merge

docs/api.rst

@@ -109,9 +109,9 @@ TODO: owned type description
 
   Represents the encoding of a payload, in a MIME-like format.
 
-.. c:type:: z_owned_value_t
+.. c:type:: z_owned_reply_err_t
 
-  Represents a Zenoh value.
+  Represents a Zenoh reply error value.
 
 .. c:type:: z_owned_sample_t
 
@@ -182,9 +182,9 @@ TODO: loaned type description
 
   Represents the encoding of a payload, in a MIME-like format.
 
-.. c:type:: z_loaned_value_t
+.. c:type:: z_loaned_reply_err_t
 
-  Represents a Zenoh value.
+  Represents a Zenoh reply error.
 
 .. c:type:: z_loaned_sample_t
 
@@ -287,9 +287,11 @@ Primitives
 .. autocfunction:: primitives.h::z_encoding_check
 .. autocfunction:: primitives.h::z_encoding_drop
 .. autocfunction:: primitives.h::z_encoding_loan
+.. autocfunction:: primitives.h::z_encoding_loan_mut
 .. autocfunction:: primitives.h::z_encoding_move
 .. autocfunction:: primitives.h::z_encoding_null
-.. autocfunction:: primitives.h::z_value_payload
+.. autocfunction:: primitives.h::z_reply_err_payload
+.. autocfunction:: primitives.h::z_reply_err_encoding
 .. autocfunction:: primitives.h::z_slice_data
 .. autocfunction:: primitives.h::z_slice_len
 .. autocfunction:: primitives.h::z_bytes_deserialize_into_int8
@@ -326,7 +328,8 @@ Primitives
 .. autocfunction:: primitives.h::z_query_consolidation_monotonic
 .. autocfunction:: primitives.h::z_query_consolidation_none
 .. autocfunction:: primitives.h::z_query_parameters
-.. autocfunction:: primitives.h::z_query_value
+.. autocfunction:: primitives.h::z_query_payload
+.. autocfunction:: primitives.h::z_query_encoding
 .. autocfunction:: primitives.h::z_query_attachment
 .. autocfunction:: primitives.h::z_query_keyexpr
 .. autocfunction:: primitives.h::z_closure_sample

examples/arduino/z_queryable.ino

@@ -44,7 +44,7 @@ void query_handler(const z_loaned_query_t *query, void *arg) {
 
     // Process value
     z_owned_string_t payload_string;
-    z_bytes_deserialize_into_string(z_value_payload(z_query_value(query)), &payload_string);
+    z_bytes_deserialize_into_string(z_query_payload(query), &payload_string);
     if (z_string_len(z_string_loan(&payload_string)) > 1) {
         Serial.print("     with value '");
         Serial.print(z_string_data(z_string_loan(&payload_string)));

examples/espidf/z_queryable.c

@@ -111,7 +111,7 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
            z_loan(params)->val);
     // Process value
     z_owned_string_t payload_string;
-    z_bytes_deserialize_into_string(z_value_payload(z_query_value(query)), &payload_string);
+    z_bytes_deserialize_into_string(z_query_payload(query), &payload_string);
     if (z_string_len(z_loan(payload_string)) > 1) {
         printf("     with value '%s'\n", z_string_data(z_loan(payload_string)));
     }

examples/freertos_plus_tcp/z_queryable.c

@@ -39,7 +39,7 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
            z_loan(params)->val);
     // Process value
     z_owned_string_t payload_string;
-    z_bytes_deserialize_into_string(z_value_payload(z_query_value(query)), &payload_string);
+    z_bytes_deserialize_into_string(z_query_payload(query), &payload_string);
     if (z_string_len(z_loan(payload_string)) > 1) {
         printf("     with value '%s'\n", z_string_data(z_loan(payload_string)));
     }

examples/mbed/z_queryable.cpp

@@ -41,7 +41,7 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
            (int)z_view_string_loan(&pred)->len, z_view_string_loan(&pred)->val);
     // Process value
     z_owned_string_t payload_string;
-    z_bytes_deserialize_into_string(z_value_payload(z_query_value(query)), &payload_string);
+    z_bytes_deserialize_into_string(z_query_payload(query), &payload_string);
     if (z_string_len(z_string_loan(&payload_string)) > 1) {
         printf("     with value '%s'\n", z_string_data(z_string_loan(&payload_string)));
     }

examples/unix/c11/z_queryable.c

@@ -33,7 +33,7 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
            z_loan(params)->val);
     // Process value
     z_owned_string_t payload_string;
-    z_bytes_deserialize_into_string(z_value_payload(z_query_value(query)), &payload_string);
+    z_bytes_deserialize_into_string(z_query_payload(query), &payload_string);
     if (z_string_len(z_loan(payload_string)) > 1) {
         printf("     with value '%s'\n", z_string_data(z_loan(payload_string)));
     }

examples/unix/c11/z_queryable_attachment.c

@@ -111,7 +111,7 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
            z_loan(params)->val);
     // Process value
     z_owned_string_t payload_string;
-    z_bytes_deserialize_into_string(z_value_payload(z_query_value(query)), &payload_string);
+    z_bytes_deserialize_into_string(z_query_payload(query), &payload_string);
     if (z_string_len(z_loan(payload_string)) > 1) {
         printf("   with value '%s'\n", z_string_data(z_loan(payload_string)));
     }

examples/unix/c11/z_queryable_channel.c

@@ -108,7 +108,7 @@ int main(int argc, char **argv) {
                (int)z_loan(params)->len, z_loan(params)->val);
         // Process value
         z_owned_string_t payload_string;
-        z_bytes_deserialize_into_string(z_value_payload(z_query_value(z_loan(query))), &payload_string);
+        z_bytes_deserialize_into_string(z_query_payload(z_loan(query)), &payload_string);
         if (z_string_len(z_loan(payload_string)) > 1) {
             printf("     with value '%s'\n", z_string_data(z_loan(payload_string)));
         }

examples/unix/c99/z_queryable.c

@@ -32,7 +32,7 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
            (int)z_view_string_loan(&params)->len, z_view_string_loan(&params)->val);
     // Process value
     z_owned_string_t payload_string;
-    z_bytes_deserialize_into_string(z_value_payload(z_query_value(query)), &payload_string);
+    z_bytes_deserialize_into_string(z_query_payload(query), &payload_string);
     if (z_string_len(z_string_loan(&payload_string)) > 1) {
         printf("     with value '%s'\n", z_string_data(z_string_loan(&payload_string)));
     }

examples/windows/z_queryable.c

@@ -32,7 +32,7 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
            z_loan(params)->val);
     // Process value
     z_owned_string_t payload_string;
-    z_bytes_deserialize_into_string(z_value_payload(z_query_value(query)), &payload_string);
+    z_bytes_deserialize_into_string(z_query_payload(query), &payload_string);
     if (z_string_len(z_loan(payload_string)) > 1) {
         printf("     with value '%s'\n", z_string_data(z_loan(payload_string)));
     }

examples/zephyr/z_queryable.c

@@ -41,7 +41,7 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
            z_loan(params)->val);
     // Process value
     z_owned_string_t payload_string;
-    z_bytes_deserialize_into_string(z_value_payload(z_query_value(query)), &payload_string);
+    z_bytes_deserialize_into_string(z_query_payload(query), &payload_string);
     if (z_string_len(z_loan(payload_string)) > 1) {
         printf("     with value '%s'\n", z_string_data(z_loan(payload_string)));
     }