Compilation fix

Author: sashacmc

examples/arduino/z_scout.ino

@@ -56,25 +56,27 @@ void fprintwhatami(unsigned int whatami) {
 
 void fprintlocators(const z_str_array_t *locs) {
     Serial.print("[");
-    size_t len = z_str_array_len(locs);
-    for (unsigned int i = 0; i < len; i++) {
-        Serial.print("'");
-        Serial.print(*z_str_array_get(locs, i));
-        Serial.print("'");
-        if (i < len - 1) {
-            Serial.print(", ");
-        }
-    }
+    (void)locs;
+    // TODO(sashacmc): z_str_array_t
+    // size_t len = z_str_array_len(locs);
+    // for (unsigned int i = 0; i < len; i++) {
+    //    Serial.print("'");
+    //    Serial.print(*z_str_array_get(locs, i));
+    //    Serial.print("'");
+    //    if (i < len - 1) {
+    //        Serial.print(", ");
+    //    }
+    //}
     Serial.print("]");
 }
 
-void fprinthello(const z_hello_t hello) {
+void fprinthello(FILE *stream, const z_loaned_hello_t *hello) {
     Serial.print(" >> Hello { zid: ");
-    fprintzid(hello.zid);
+    fprintzid(hello->zid);
     Serial.print(", whatami: ");
-    fprintwhatami(hello.whatami);
+    fprintwhatami(hello->whatami);
     Serial.print(", locators: ");
-    fprintlocators(&hello.locators);
+    fprintlocators(&hello->locators);
     Serial.println(" }");
 }
 

examples/espidf/z_sub.c

@@ -103,7 +103,7 @@ 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);
-    const z_loaned_payload_t* payload = z_sample_payload(sample);
+    const z_loaned_bytes_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/freertos_plus_tcp/z_queryable.c

@@ -71,7 +71,7 @@ void app_main(void) {
 
     z_view_keyexpr_t ke;
     if (z_view_keyexpr_from_string(&ke, KEYEXPR) < 0) {
-        printf("%s is not a valid key expression", keyexpr);
+        printf("%s is not a valid key expression", KEYEXPR);
         return -1;
     }
 

examples/mbed/z_scout.cpp

@@ -53,24 +53,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): z_str_array_t
+    // 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_scout.c

@@ -43,7 +43,7 @@ void fprintwhatami(FILE *stream, unsigned int whatami) {
 void fprintlocators(FILE *stream, const z_str_array_t *locs) {
     fprintf(stream, "[");
     (void)locs;
-    // TODO(sashacmc):
+    // TODO(sashacmc): z_str_array_t
     // for (unsigned int i = 0; i < z_str_array_len(locs); i++) {
     //    fprintf(stream, "\"");
     //    fprintf(stream, "%s", *z_str_array_get(locs, i));

tests/z_api_alignment_test.c

@@ -141,7 +141,7 @@ int main(int argc, char **argv) {
     z_view_keyexpr_from_string(&key_demo_example_a, "demo/example/a");
     z_view_keyexpr_from_string(&key_demo_example_starstar, "demo/example/**");
 
-    _ret_bool = z_keyexpr_includes(z_loan(key_demo_example_starstar), z_loan(key_demo_example_a));
+    _Bool _ret_bool = z_keyexpr_includes(z_loan(key_demo_example_starstar), z_loan(key_demo_example_a));
     assert(_ret_bool);
 #ifdef ZENOH_PICO
     _ret_bool = zp_keyexpr_includes_null_terminated("demo/example/**", "demo/example/a");