Rename z_str_data to z_string_data

examples/arduino/z_get.ino

@@ -52,9 +52,9 @@ void reply_handler(const z_loaned_reply_t *oreply, void *ctx) {
         z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
 
         Serial.print(" >> [Get listener] Received (");
-        Serial.print(z_str_data(z_string_loan(&keystr)));
+        Serial.print(z_string_data(z_string_loan(&keystr)));
         Serial.print(", ");
-        Serial.print(z_str_data(z_string_loan(&replystr)));
+        Serial.print(z_string_data(z_string_loan(&replystr)));
         Serial.println(")");
 
         z_string_drop(z_string_move(&keystr));

examples/arduino/z_pull.ino

@@ -44,7 +44,7 @@
 //     std::string val((const char *)sample->payload.start, sample->payload.len);
 
 //     Serial.print(" >> [Subscription listener] Received (");
-//     Serial.print(z_str_data(z_string_loan(&keystr)));
+//     Serial.print(z_string_data(z_string_loan(&keystr)));
 //     Serial.print(", ");
 //     Serial.print(val.c_str());
 //     Serial.println(")");

examples/arduino/z_queryable.ino

@@ -39,7 +39,7 @@ void query_handler(const z_loaned_query_t *query, void *arg) {
     z_owned_string_t keystr;
     z_keyexpr_to_string(z_query_keyexpr(query), &keystr);
     Serial.print(" >> [Queryable handler] Received Query '");
-    Serial.print(z_str_data(z_string_loan(&keystr)));
+    Serial.print(z_string_data(z_string_loan(&keystr)));
     Serial.println("'");
 
     // Process value
@@ -48,7 +48,7 @@ void query_handler(const z_loaned_query_t *query, void *arg) {
         z_owned_string_t payload_string;
         z_bytes_decode_into_string(payload, &payload_string);
         Serial.print("     with value '");
-        Serial.print(z_str_data(z_string_loan(&payload_string)));
+        Serial.print(z_string_data(z_string_loan(&payload_string)));
         Serial.println("'");
         z_string_drop(z_string_move(&payload_string));
     }

examples/arduino/z_sub.ino

@@ -40,7 +40,7 @@ void data_handler(const z_loaned_sample_t *sample, void *arg) {
     std::string val((const char *)z_sample_payload(sample)->start, z_sample_payload(sample)->len);
 
     Serial.print(" >> [Subscription listener] Received (");
-    Serial.print(z_str_data(z_string_loan(&keystr)));
+    Serial.print(z_string_data(z_string_loan(&keystr)));
     Serial.print(", ");
     Serial.print(val.c_str());
     Serial.println(")");

examples/espidf/z_get.c

@@ -111,7 +111,7 @@ void reply_handler(const z_loaned_reply_t *oreply, void *ctx) {
         z_owned_string_t replystr;
         z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
 
-        printf(" >> Received ('%s': '%s')\n", z_str_data(z_loan(keystr)), z_str_data(z_loan(replystr)));
+        printf(" >> Received ('%s': '%s')\n", z_string_data(z_loan(keystr)), z_string_data(z_loan(replystr)));
         z_drop(z_move(keystr));
         z_drop(z_move(replystr));
     } else {

examples/espidf/z_pull.c

@@ -104,7 +104,7 @@ void wifi_init_sta(void) {
 // void data_handler(const z_loaned_sample_t* sample, void* arg) {
 //     z_owned_string_t keystr;
 //     z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
-//     printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_str_data(z_loan(keystr)),
+//     printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_string_data(z_loan(keystr)),
 //     (int)sample->payload.len,
 //            sample->payload.start);
 //     z_drop(z_move(keystr));

examples/espidf/z_queryable.c

@@ -107,14 +107,14 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
     z_keyexpr_to_string(z_query_keyexpr(query), &keystr);
     z_view_string_t params;
     z_query_parameters(query, &params);
-    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_str_data(z_loan(keystr)), (int)z_loan(params)->len,
+    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_string_data(z_loan(keystr)), (int)z_loan(params)->len,
            z_loan(params)->val);
     // Process value
     const z_loaned_bytes_t *payload = z_value_payload(z_query_value(query));
     if (z_bytes_len(payload) > 0) {
         z_owned_string_t payload_string;
         z_bytes_decode_into_string(payload, &payload_string);
-        printf("     with value '%s'\n", z_str_data(z_loan(payload_string)));
+        printf("     with value '%s'\n", z_string_data(z_loan(payload_string)));
         z_drop(z_move(payload_string));
     }
     z_view_keyexpr_t ke;

examples/espidf/z_sub.c

@@ -104,8 +104,8 @@ void data_handler(const z_loaned_sample_t* sample, void* arg) {
     z_owned_string_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_data(z_string_loan(&keystr)), (int)payload->len,
-           payload->start);
+    printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_string_data(z_string_loan(&keystr)),
+           (int)payload->len, payload->start);
     z_string_drop(z_string_move(&keystr));
 }
 

examples/freertos_plus_tcp/z_get.c

@@ -45,7 +45,7 @@ void reply_handler(const z_loaned_reply_t *reply, void *ctx) {
         z_owned_string_t replystr;
         z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
 
-        printf(">> Received ('%s': '%s')\n", z_str_data(z_loan(keystr)), z_str_data(z_loan(replystr)));
+        printf(">> Received ('%s': '%s')\n", z_string_data(z_loan(keystr)), z_string_data(z_loan(replystr)));
         z_drop(z_move(keystr));
         z_drop(z_move(replystr));
     } else {

examples/freertos_plus_tcp/z_pull.c

@@ -33,7 +33,7 @@
 //     (void)(ctx);
 //     z_owned_string_t keystr;
 //     z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
-//     printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_str_data(z_loan(keystr)), (int)sample->payload.len,
+//     printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_string_data(z_loan(keystr)), (int)sample->payload.len,
 //            sample->payload.start);
 //     z_drop(z_move(keystr));
 // }

examples/freertos_plus_tcp/z_queryable.c

@@ -35,14 +35,14 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
     z_keyexpr_to_string(z_query_keyexpr(query), &keystr);
     z_view_string_t params;
     z_query_parameters(query, &params);
-    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_str_data(z_loan(keystr)), (int)z_loan(params)->len,
+    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_string_data(z_loan(keystr)), (int)z_loan(params)->len,
            z_loan(params)->val);
     // Process value
     const z_loaned_bytes_t *payload = z_value_payload(z_query_value(query));
     if (z_bytes_len(payload) > 0) {
         z_owned_string_t payload_string;
         z_bytes_decode_into_string(payload, &payload_string);
-        printf("     with value '%s'\n", z_str_data(z_loan(payload_string)));
+        printf("     with value '%s'\n", z_string_data(z_loan(payload_string)));
         z_drop(z_move(payload_string));
     }
     z_query_reply_options_t options;

examples/freertos_plus_tcp/z_sub.c

@@ -33,7 +33,8 @@ void data_handler(const z_loaned_sample_t *sample, void *ctx) {
     z_owned_string_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_data(z_loan(keystr)), (int)payload->len, payload->start);
+    printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_string_data(z_loan(keystr)), (int)payload->len,
+           payload->start);
     z_drop(z_move(keystr));
 }
 

examples/freertos_plus_tcp/z_sub_st.c

@@ -36,7 +36,8 @@ void data_handler(const z_loaned_sample_t *sample, void *ctx) {
     z_owned_string_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_data(z_loan(keystr)), (int)payload->len, payload->start);
+    printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_string_data(z_loan(keystr)), (int)payload->len,
+           payload->start);
     z_drop(z_move(keystr));
     z_drop(z_move(keystr));
     msg_nb++;

examples/mbed/z_get.cpp

@@ -41,7 +41,8 @@ void reply_handler(const z_loaned_reply_t *oreply, void *ctx) {
         z_owned_string_t replystr;
         z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
 
-        printf(" >> Received ('%s': '%s')\n", z_str_data(z_string_loan(&keystr)), z_str_data(z_string_loan(&replystr)));
+        printf(" >> Received ('%s': '%s')\n", z_string_data(z_string_loan(&keystr)),
+               z_string_data(z_string_loan(&replystr)));
         z_string_drop(z_string_move(&keystr));
         z_string_drop(z_string_move(&replystr));
     } else {

examples/mbed/z_pull.cpp

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

examples/mbed/z_queryable.cpp

@@ -37,14 +37,14 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
     z_keyexpr_to_string(z_query_keyexpr(query), &keystr);
     z_view_string_t pred;
     z_query_parameters(query, &pred);
-    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_str_data(z_string_loan(&keystr)),
+    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_string_data(z_string_loan(&keystr)),
            (int)z_view_string_loan(&pred)->len, z_view_string_loan(&pred)->val);
     // Process value
     const z_loaned_bytes_t *payload = z_value_payload(z_query_value(query));
     if (z_bytes_len(payload) > 0) {
         z_owned_string_t payload_string;
         z_bytes_decode_into_string(payload, &payload_string);
-        printf("     with value '%s'\n", z_str_data(z_string_loan(&payload_string)));
+        printf("     with value '%s'\n", z_string_data(z_string_loan(&payload_string)));
         z_string_drop(z_string_move(&payload_string));
     }
     // Reply value encoding

examples/mbed/z_sub.cpp

@@ -34,8 +34,8 @@ void data_handler(const z_loaned_sample_t *sample, void *arg) {
     z_owned_string_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_data(z_string_loan(&keystr)), (int)payload->len,
-           payload->start);
+    printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_string_data(z_string_loan(&keystr)),
+           (int)payload->len, payload->start);
     z_string_drop(z_string_move(&keystr));
 }
 

examples/unix/c11/z_get.c

@@ -46,7 +46,7 @@ void reply_handler(const z_loaned_reply_t *reply, void *ctx) {
         z_owned_string_t replystr;
         z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
 
-        printf(">> Received ('%s': '%s')\n", z_str_data(z_loan(keystr)), z_str_data(z_loan(replystr)));
+        printf(">> Received ('%s': '%s')\n", z_string_data(z_loan(keystr)), z_string_data(z_loan(replystr)));
 #if Z_FEATURE_ATTACHMENT == 1
         if (z_attachment_check(&sample.attachment)) {
             printf("Attachement found\n");

examples/unix/c11/z_get_channel.c

@@ -115,7 +115,7 @@ int main(int argc, char **argv) {
             z_owned_string_t replystr;
             z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
 
-            printf(">> Received ('%s': '%s')\n", z_str_data(z_loan(keystr)), z_str_data(z_loan(replystr)));
+            printf(">> Received ('%s': '%s')\n", z_string_data(z_loan(keystr)), z_string_data(z_loan(replystr)));
             z_drop(z_move(keystr));
             z_drop(z_move(replystr));
         } else {

examples/unix/c11/z_pull.c

@@ -90,7 +90,7 @@ int main(int argc, char **argv) {
         for (z_call(channel.try_recv, &sample); z_check(sample); z_call(channel.try_recv, &sample)) {
             z_owned_string_t keystr;
             z_keyexpr_to_string(z_sample_keyexpr(z_loan(sample)), &keystr);
-            printf(">> [Subscriber] Pulled ('%s': '%.*s')\n", z_str_data(z_loan(keystr)),
+            printf(">> [Subscriber] Pulled ('%s': '%.*s')\n", z_string_data(z_loan(keystr)),
                    (int)z_sample_payload(z_loan(sample))->len, z_sample_payload(z_loan(sample))->start);
             z_drop(z_move(keystr));
             z_drop(z_move(sample));

examples/unix/c11/z_queryable.c

@@ -37,14 +37,14 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
     z_keyexpr_to_string(z_query_keyexpr(query), &keystr);
     z_view_string_t params;
     z_query_parameters(query, &params);
-    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_str_data(z_loan(keystr)), (int)z_loan(params)->len,
+    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_string_data(z_loan(keystr)), (int)z_loan(params)->len,
            z_loan(params)->val);
     // Process value
     const z_loaned_bytes_t *payload = z_value_payload(z_query_value(query));
     if (z_bytes_len(payload) > 0) {
         z_owned_string_t payload_string;
         z_bytes_decode_into_string(payload, &payload_string);
-        printf("     with value '%s'\n", z_str_data(z_loan(payload_string)));
+        printf("     with value '%s'\n", z_string_data(z_loan(payload_string)));
         z_drop(z_move(payload_string));
     }
 #if Z_FEATURE_ATTACHMENT == 1

examples/unix/c11/z_queryable_channel.c

@@ -104,13 +104,13 @@ int main(int argc, char **argv) {
         z_keyexpr_to_string(z_query_keyexpr(q), &keystr);
         z_view_string_t params;
         z_query_parameters(q, &params);
-        printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_str_data(z_loan(keystr)),
+        printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_string_data(z_loan(keystr)),
                (int)z_loan(params)->len, z_loan(params)->val);
         const z_loaned_bytes_t *payload = z_value_payload(z_query_value(z_loan(query)));
         if (z_bytes_len(payload) > 0) {
             z_owned_string_t payload_string;
             z_bytes_decode_into_string(payload, &payload_string);
-            printf("     with value '%s'\n", z_str_data(z_loan(payload_string)));
+            printf("     with value '%s'\n", z_string_data(z_loan(payload_string)));
             z_drop(z_move(payload_string));
         }
         z_query_reply_options_t options;

examples/unix/c11/z_sub.c

@@ -37,7 +37,8 @@ void data_handler(const z_loaned_sample_t *sample, void *ctx) {
     z_owned_string_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_data(z_loan(keystr)), (int)payload->len, payload->start);
+    printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_string_data(z_loan(keystr)), (int)payload->len,
+           payload->start);
 #if Z_FEATURE_ATTACHMENT == 1
     z_attachment_t attachment = z_sample_attachment(sample);
     if (z_attachment_check(&attachment)) {

examples/unix/c11/z_sub_channel.c

@@ -80,7 +80,7 @@ int main(int argc, char **argv) {
     for (z_call(channel.recv, &sample); z_check(sample); z_call(channel.recv, &sample)) {
         z_owned_string_t keystr;
         z_keyexpr_to_string(z_sample_keyexpr(z_loan(sample)), &keystr);
-        printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_str_data(z_loan(keystr)),
+        printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_string_data(z_loan(keystr)),
                (int)z_sample_payload(z_loan(sample))->len, z_sample_payload(z_loan(sample))->start);
         z_drop(z_move(keystr));
         z_drop(z_move(sample));

examples/unix/c11/z_sub_st.c

@@ -28,7 +28,8 @@ void data_handler(const z_loaned_sample_t *sample, void *ctx) {
     z_owned_string_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_data(z_loan(keystr)), (int)payload->len, payload->start);
+    printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_string_data(z_loan(keystr)), (int)payload->len,
+           payload->start);
     z_drop(z_move(keystr));
     msg_nb++;
 }

examples/unix/c99/z_get.c

@@ -38,7 +38,8 @@ void reply_handler(const z_loaned_reply_t *reply, void *ctx) {
         z_owned_string_t replystr;
         z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
 
-        printf(">> Received ('%s': '%s')\n", z_str_data(z_string_loan(&keystr)), z_str_data(z_string_loan(&replystr)));
+        printf(">> Received ('%s': '%s')\n", z_string_data(z_string_loan(&keystr)),
+               z_string_data(z_string_loan(&replystr)));
         z_string_drop(z_string_move(&keystr));
         z_string_drop(z_string_move(&replystr));
     } else {

examples/unix/c99/z_pull.c

@@ -24,7 +24,8 @@
 //     (void)(ctx);
 //     z_owned_string_t keystr;
 //     z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
-//     printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_str_data(z_string_loan(&keystr)), (int)sample->payload.len,
+//     printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_string_data(z_string_loan(&keystr)),
+//     (int)sample->payload.len,
 //            sample->payload.start);
 //     z_string_drop(z_string_move(&keystr));
 // }

examples/unix/c99/z_queryable.c

@@ -28,14 +28,14 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
     z_keyexpr_to_string(z_query_keyexpr(query), &keystr);
     z_view_string_t params;
     z_query_parameters(query, &params);
-    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_str_data(z_string_loan(&keystr)),
+    printf(" >> [Queryable handler] Received Query '%s%.*s'\n", z_string_data(z_string_loan(&keystr)),
            (int)z_view_string_loan(&params)->len, z_view_string_loan(&params)->val);
     // Process value
     const z_loaned_bytes_t *payload = z_value_payload(z_query_value(query));
     if (z_bytes_len(payload) > 0) {
         z_owned_string_t payload_string;
         z_bytes_decode_into_string(payload, &payload_string);
-        printf("     with value '%s'\n", z_str_data(z_string_loan(&payload_string)));
+        printf("     with value '%s'\n", z_string_data(z_string_loan(&payload_string)));
         z_string_drop(z_string_move(&payload_string));
     }
     z_query_reply_options_t options;

examples/unix/c99/z_sub.c

@@ -25,7 +25,7 @@ void data_handler(const z_loaned_sample_t *sample, void *arg) {
     z_owned_string_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_data(z_string_loan(&keystr)), (int)payload->len,
+    printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_string_data(z_string_loan(&keystr)), (int)payload->len,
            payload->start);
     z_string_drop(z_string_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_string_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_data(z_string_loan(&keystr)), (int)payload->len,
+    printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_string_data(z_string_loan(&keystr)), (int)payload->len,
            payload->start);
     z_string_drop(z_string_move(&keystr));
     msg_nb++;

examples/windows/z_get.c

@@ -37,7 +37,7 @@ void reply_handler(const z_loaned_reply_t *reply, void *ctx) {
         z_owned_string_t replystr;
         z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
 
-        printf(">> Received ('%s': '%s')\n", z_str_data(z_loan(keystr)), z_str_data(z_loan(replystr)));
+        printf(">> Received ('%s': '%s')\n", z_string_data(z_loan(keystr)), z_string_data(z_loan(replystr)));
         z_drop(z_move(keystr));
         z_drop(z_move(replystr));
     } else {

examples/windows/z_pull.c

@@ -23,7 +23,7 @@
 //     (void)(ctx);
 //     z_owned_string_t keystr;
 //     z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
-//     printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_str_data(z_loan(keystr)), (int)sample->payload.len,
+//     printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_string_data(z_loan(keystr)), (int)sample->payload.len,
 //            sample->payload.start);
 //     z_drop(z_move(keystr));
 // }