Fix c99 examples

examples/espidf/z_sub.c

@@ -103,8 +103,9 @@ void wifi_init_sta(void) {
 void data_handler(const z_loaned_sample_t* sample, void* arg) {
     z_owned_str_t keystr;
     z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
-    printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_str_loan(&keystr), (int)sample->payload.len,
-           sample->payload.start);
+    const z_loaned_payload_t* payload = z_sample_payload(sample);
+    printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_str_data(z_str_loan(&keystr)), (int)payload->len,
+           payload->start);
     z_str_drop(z_str_move(&keystr));
 }
 

examples/mbed/z_get.cpp

@@ -39,7 +39,7 @@ void reply_handler(z_owned_reply_t *oreply, void *ctx) {
         z_owned_str_t keystr;
         z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
         const z_loaned_bytes_t *payload = z_sample_payload(sample);
-        printf(" >> Received ('%s': '%.*s')\n", z_str_loan(&keystr), (int)payload->len, payload->start);
+        printf(" >> Received ('%s': '%.*s')\n", z_str_data(z_str_loan(&keystr)), (int)payload->len, payload->start);
         z_str_drop(z_str_move(&keystr));
     } else {
         printf(" >> Received an error\n");

examples/mbed/z_pull.cpp

@@ -34,7 +34,7 @@
 // void data_handler(const z_loaned_sample_t *sample, void *arg) {
 //     z_owned_str_t keystr;
 //     z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
-//     printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_str_loan(&keystr), (int)sample->payload.len,
+//     printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_str_data(z_str_loan(&keystr)), (int)sample->payload.len,
 //            sample->payload.start);
 //     z_str_drop(z_str_move(&keystr));
 // }

examples/mbed/z_queryable.cpp

@@ -35,8 +35,10 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
     (void)(ctx);
     z_owned_str_t keystr;
     z_keyexpr_to_string(z_query_keyexpr(query), &keystr);
-    z_bytes_t pred = z_query_parameters(query);
-    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_str_loan(&keystr), (int)pred.len, pred.start);
+    z_view_str_t pred;
+    z_query_parameters(query, &pred);
+    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_str_data(z_str_loan(&keystr)),
+           (int)z_view_str_loan(&pred)->len, z_view_str_loan(&pred)->val);
     z_query_reply(query, z_keyexpr(KEYEXPR), (const unsigned char *)VALUE, strlen(VALUE), NULL);
     z_str_drop(z_str_move(&keystr));
 }

examples/mbed/z_sub.cpp

@@ -34,7 +34,7 @@ void data_handler(const z_loaned_sample_t *sample, void *arg) {
     z_owned_str_t keystr;
     z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
     const z_loaned_bytes_t *payload = z_sample_payload(sample);
-    printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_str_loan(&keystr), (int)payload->len,
+    printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_str_data(z_str_loan(&keystr)), (int)payload->len,
            payload->start);
     z_str_drop(z_str_move(&keystr));
 }

examples/unix/c99/z_get.c

@@ -36,7 +36,7 @@ void reply_handler(z_owned_reply_t *reply, void *ctx) {
         z_owned_str_t keystr;
         z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
         const z_loaned_bytes_t *payload = z_sample_payload(sample);
-        printf(">> Received ('%s': '%.*s')\n", z_str_loan(&keystr), (int)payload->len, payload->start);
+        printf(">> Received ('%s': '%.*s')\n", z_str_data(z_str_loan(&keystr)), (int)payload->len, payload->start);
         z_str_drop(z_str_move(&keystr));
     } else {
         printf(">> Received an error\n");
@@ -107,8 +107,8 @@ int main(int argc, char **argv) {
         return -1;
     }
 
-    z_keyexpr_t ke = z_keyexpr(keyexpr);
-    if (!z_keyexpr_is_initialized(&ke)) {
+    const z_loaned_keyexpr_t *ke = z_keyexpr(keyexpr);
+    if (!z_keyexpr_is_initialized(ke)) {
         printf("%s is not a valid key expression", keyexpr);
         return -1;
     }

examples/unix/c99/z_ping.c

@@ -31,7 +31,7 @@
 static z_condvar_t cond;
 static z_mutex_t mutex;
 
-void callback(const z_sample_t* sample, void* context) {
+void callback(const z_loaned_sample_t* sample, void* context) {
     (void)sample;
     (void)context;
     z_condvar_signal(&cond);
@@ -80,18 +80,21 @@ int main(int argc, char** argv) {
         return -1;
     }
 
-    z_keyexpr_t ping = z_keyexpr_unchecked("test/ping");
+    // TODO(sashacmc):
+    // z_keyexpr_t ping = z_keyexpr_unchecked("test/ping");
     z_owned_publisher_t pub;
-    if (z_declare_publisher(&pub, z_session_loan(&session), ping, NULL) < 0) {
+    if (z_declare_publisher(&pub, z_session_loan(&session), z_keyexpr("test/ping"), NULL) < 0) {
         printf("Unable to declare publisher for key expression!\n");
         return -1;
     }
 
-    z_keyexpr_t pong = z_keyexpr_unchecked("test/pong");
+    // TODO(sashacmc):
+    // z_keyexpr_t pong = z_keyexpr_unchecked("test/pong");
     z_owned_closure_sample_t respond;
     z_closure_sample(&respond, callback, drop, NULL);
     z_owned_subscriber_t sub;
-    if (z_declare_subscriber(&sub, z_session_loan(&session), pong, z_closure_sample_move(&respond), NULL) < 0) {
+    if (z_declare_subscriber(&sub, z_session_loan(&session), z_keyexpr("test/pong"), z_closure_sample_move(&respond),
+                             NULL) < 0) {
         printf("Unable to declare subscriber for key expression.\n");
         return -1;
     }

examples/unix/c99/z_pong.c

@@ -17,10 +17,10 @@
 #include "zenoh-pico/api/primitives.h"
 
 #if Z_FEATURE_SUBSCRIPTION == 1 && Z_FEATURE_PUBLICATION == 1
-void callback(const z_sample_t* sample, void* context) {
-    z_publisher_t pub = z_publisher_loan((z_owned_publisher_t*)context);
-    z_bytes_t payload = z_sample_payload(sample);
-    z_publisher_put(pub, payload.start, payload.len, NULL);
+void callback(const z_loaned_sample_t* sample, void* context) {
+    const z_loaned_publisher_t* pub = z_publisher_loan((z_owned_publisher_t*)context);
+    const z_loaned_bytes_t* payload = z_sample_payload(sample);
+    z_publisher_put(pub, payload->start, payload->len, NULL);
 }
 void drop(void* context) {
     z_owned_publisher_t* pub = (z_owned_publisher_t*)context;
@@ -50,18 +50,19 @@ int main(int argc, char** argv) {
         return -1;
     }
 
-    z_keyexpr_t pong = z_keyexpr_unchecked("test/pong");
+    // TODO(sashacmc): z_keyexpr_t pong = z_keyexpr_unchecked("test/pong");
     z_owned_publisher_t pub;
-    if (z_declare_publisher(&pub, z_session_loan(&session), pong, NULL) < 0) {
+    if (z_declare_publisher(&pub, z_session_loan(&session), z_keyexpr("test/pong"), NULL) < 0) {
         printf("Unable to declare publisher for key expression!\n");
         return -1;
     }
 
-    z_keyexpr_t ping = z_keyexpr_unchecked("test/ping");
+    // TODO(sashacmc): z_keyexpr_t ping = z_keyexpr_unchecked("test/ping");
     z_owned_closure_sample_t respond;
     z_closure_sample(&respond, callback, drop, (void*)z_publisher_move(&pub));
     z_owned_subscriber_t sub;
-    if (z_declare_subscriber(&sub, z_session_loan(&session), ping, z_closure_sample_move(&respond), NULL) < 0) {
+    if (z_declare_subscriber(&sub, z_session_loan(&session), z_keyexpr("test/ping"), z_closure_sample_move(&respond),
+                             NULL) < 0) {
         printf("Unable to declare subscriber for key expression.\n");
         return -1;
     }

examples/unix/c99/z_pull.c

@@ -24,7 +24,7 @@
 //     (void)(ctx);
 //     z_owned_str_t keystr;
 //     z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
-//     printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_str_loan(&keystr), (int)sample->payload.len,
+//     printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_str_data(z_str_loan(&keystr)), (int)sample->payload.len,
 //            sample->payload.start);
 //     z_str_drop(z_str_move(&keystr));
 // }

examples/unix/c99/z_queryable.c

@@ -26,8 +26,10 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
     (void)(ctx);
     z_owned_str_t keystr;
     z_keyexpr_to_string(z_query_keyexpr(query), &keystr);
-    z_bytes_t pred = z_query_parameters(query);
-    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_str_loan(&keystr), (int)pred.len, pred.start);
+    z_view_str_t pred;
+    z_query_parameters(query, &pred);
+    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_str_data(z_str_loan(&keystr)),
+           (int)z_view_str_loan(&pred)->len, z_view_str_loan(&pred)->val);
     z_query_reply_options_t options;
     z_query_reply_options_default(&options);
     options.encoding = z_encoding(Z_ENCODING_PREFIX_TEXT_PLAIN, NULL);
@@ -94,8 +96,8 @@ int main(int argc, char **argv) {
         return -1;
     }
 
-    z_keyexpr_t ke = z_keyexpr(keyexpr);
-    if (!z_keyexpr_is_initialized(&ke)) {
+    const z_loaned_keyexpr_t *ke = z_keyexpr(keyexpr);
+    if (!z_keyexpr_is_initialized(ke)) {
         printf("%s is not a valid key expression", keyexpr);
         return -1;
     }

examples/unix/c99/z_scout.c

@@ -42,24 +42,26 @@ void fprintwhatami(FILE *stream, unsigned int whatami) {
 
 void fprintlocators(FILE *stream, const z_str_array_t *locs) {
     fprintf(stream, "[");
-    for (unsigned int i = 0; i < z_str_array_len(locs); i++) {
-        fprintf(stream, "\"");
-        fprintf(stream, "%s", *z_str_array_get(locs, i));
-        fprintf(stream, "\"");
-        if (i < z_str_array_len(locs) - 1) {
-            fprintf(stream, ", ");
-        }
-    }
+    (void)locs;
+    // TODO(sashacmc):
+    // for (unsigned int i = 0; i < z_str_array_len(locs); i++) {
+    //    fprintf(stream, "\"");
+    //    fprintf(stream, "%s", *z_str_array_get(locs, i));
+    //    fprintf(stream, "\"");
+    //    if (i < z_str_array_len(locs) - 1) {
+    //        fprintf(stream, ", ");
+    //    }
+    //}
     fprintf(stream, "]");
 }
 
-void fprinthello(FILE *stream, const z_hello_t hello) {
+void fprinthello(FILE *stream, const z_loaned_hello_t *hello) {
     fprintf(stream, "Hello { zid: ");
-    fprintzid(stream, hello.zid);
+    fprintzid(stream, hello->zid);
     fprintf(stream, ", whatami: ");
-    fprintwhatami(stream, hello.whatami);
+    fprintwhatami(stream, hello->whatami);
     fprintf(stream, ", locators: ");
-    fprintlocators(stream, &hello.locators);
+    fprintlocators(stream, &hello->locators);
     fprintf(stream, " }");
 }
 

examples/unix/c99/z_sub.c

@@ -25,7 +25,7 @@ void data_handler(const z_loaned_sample_t *sample, void *arg) {
     z_owned_str_t keystr;
     z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
     const z_loaned_bytes_t *payload = z_sample_payload(sample);
-    printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_str_loan(&keystr), (int)payload->len, payload->start);
+    printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_str_data(z_str_loan(&keystr)), (int)payload->len, payload->start);
     z_str_drop(z_str_move(&keystr));
 }
 

examples/unix/c99/z_sub_st.c

@@ -28,7 +28,7 @@ void data_handler(const z_loaned_sample_t *sample, void *arg) {
     z_owned_str_t keystr;
     z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
     const z_loaned_bytes_t *payload = z_sample_payload(sample);
-    printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_str_loan(&keystr), (int)payload->len, payload->start);
+    printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_str_data(z_str_loan(&keystr)), (int)payload->len, payload->start);
     z_str_drop(z_str_move(&keystr));
     msg_nb++;
 }