diff --git a/examples/arduino/z_get.ino b/examples/arduino/z_get.ino index a4a5a9f2d..b14e64165 100644 --- a/examples/arduino/z_get.ino +++ b/examples/arduino/z_get.ino @@ -117,10 +117,8 @@ void loop() { z_get_options_default(&opts); // Value encoding if (strcmp(VALUE, "") != 0) { - z_view_string_t value_str; - z_view_string_wrap(&value_str, VALUE); z_owned_bytes_t payload; - z_bytes_encode_from_string(&payload, z_view_string_loan(&value_str)); + z_bytes_encode_from_string(&payload, VALUE); opts.payload = &payload; } z_owned_closure_reply_t callback; diff --git a/examples/arduino/z_queryable.ino b/examples/arduino/z_queryable.ino index da225a613..1a62641e3 100644 --- a/examples/arduino/z_queryable.ino +++ b/examples/arduino/z_queryable.ino @@ -57,10 +57,8 @@ void query_handler(const z_loaned_query_t *query, void *arg) { z_view_keyexpr_from_string_unchecked(&ke, KEYEXPR); // Reply value encoding - z_view_string_t reply_str; - z_view_string_wrap(&reply_str, VALUE); z_owned_bytes_t reply_payload; - z_bytes_encode_from_string(&reply_payload, z_view_string_loan(&reply_str)); + z_bytes_encode_from_string(&reply_payload, VALUE); z_query_reply(query, z_view_keyexpr_loan(&ke), z_bytes_move(&reply_payload), NULL); diff --git a/examples/espidf/z_get.c b/examples/espidf/z_get.c index 7c53b86b5..2070ed435 100644 --- a/examples/espidf/z_get.c +++ b/examples/espidf/z_get.c @@ -164,10 +164,8 @@ void app_main() { z_get_options_default(&opts); // Value encoding if (strcmp(VALUE, "") != 0) { - z_view_string_t value_str; - z_view_string_wrap(&value_str, VALUE); z_owned_bytes_t payload; - z_bytes_encode_from_string(&payload, z_loan(value_str)); + z_bytes_encode_from_string(&payload, VALUE); opts.payload = &payload; } z_owned_closure_reply_t callback; diff --git a/examples/espidf/z_queryable.c b/examples/espidf/z_queryable.c index d10e25f57..22c673704 100644 --- a/examples/espidf/z_queryable.c +++ b/examples/espidf/z_queryable.c @@ -120,10 +120,8 @@ void query_handler(const z_loaned_query_t *query, void *ctx) { z_view_keyexpr_t ke; z_view_keyexpr_from_string_unchecked(&ke, KEYEXPR); // Reply value encoding - z_view_string_t reply_str; - z_view_string_wrap(&reply_str, VALUE); z_owned_bytes_t reply_payload; - z_bytes_encode_from_string(&reply_payload, z_loan(reply_str)); + z_bytes_encode_from_string(&reply_payload, VALUE); z_query_reply(query, z_loan(ke), z_move(reply_payload), NULL); z_drop(z_move(keystr)); diff --git a/examples/freertos_plus_tcp/z_get.c b/examples/freertos_plus_tcp/z_get.c index d91bb6065..dfb21f218 100644 --- a/examples/freertos_plus_tcp/z_get.c +++ b/examples/freertos_plus_tcp/z_get.c @@ -88,10 +88,8 @@ void app_main(void) { z_get_options_default(&opts); // Value encoding if (strcmp(VALUE, "") != 0) { - z_view_string_t value_str; - z_view_string_wrap(&value_str, VALUE); z_owned_bytes_t payload; - z_bytes_encode_from_string(&payload, z_loan(value_str)); + z_bytes_encode_from_string(&payload, VALUE); opts.payload = &payload; } z_owned_closure_reply_t callback; diff --git a/examples/freertos_plus_tcp/z_queryable.c b/examples/freertos_plus_tcp/z_queryable.c index ca3444034..46b62888f 100644 --- a/examples/freertos_plus_tcp/z_queryable.c +++ b/examples/freertos_plus_tcp/z_queryable.c @@ -48,10 +48,8 @@ void query_handler(const z_loaned_query_t *query, void *ctx) { z_query_reply_options_t options; z_query_reply_options_default(&options); // Reply value encoding - z_view_string_t reply_str; - z_view_string_wrap(&reply_str, VALUE); z_owned_bytes_t reply_payload; - z_bytes_encode_from_string(&reply_payload, z_loan(reply_str)); + z_bytes_encode_from_string(&reply_payload, VALUE); z_query_reply(query, z_query_keyexpr(query), z_move(reply_payload), &options); z_drop(z_move(keystr)); diff --git a/examples/mbed/z_get.cpp b/examples/mbed/z_get.cpp index ec2f2cef5..b0a475773 100644 --- a/examples/mbed/z_get.cpp +++ b/examples/mbed/z_get.cpp @@ -85,10 +85,8 @@ int main(int argc, char **argv) { z_get_options_default(&opts); // Value encoding if (strcmp(VALUE, "") != 0) { - z_view_string_t value_str; - z_view_string_wrap(&value_str, VALUE); z_owned_bytes_t payload; - z_bytes_encode_from_string(&payload, z_view_string_loan(&value_str)); + z_bytes_encode_from_string(&payload, VALUE); opts.payload = &payload; } z_owned_closure_reply_t callback; diff --git a/examples/mbed/z_queryable.cpp b/examples/mbed/z_queryable.cpp index 7be7f79da..3a243e9ca 100644 --- a/examples/mbed/z_queryable.cpp +++ b/examples/mbed/z_queryable.cpp @@ -48,10 +48,8 @@ void query_handler(const z_loaned_query_t *query, void *ctx) { z_string_drop(z_string_move(&payload_string)); } // Reply value encoding - z_view_string_t reply_str; - z_view_string_wrap(&reply_str, VALUE); z_owned_bytes_t reply_payload; - z_bytes_encode_from_string(&reply_payload, z_view_string_loan(&reply_str)); + z_bytes_encode_from_string(&reply_payload, VALUE); z_query_reply(query, z_query_keyexpr(query), z_bytes_move(&reply_payload), NULL); z_string_drop(z_string_move(&keystr)); diff --git a/examples/unix/c11/z_get.c b/examples/unix/c11/z_get.c index 6066ac2e7..eb46202ec 100644 --- a/examples/unix/c11/z_get.c +++ b/examples/unix/c11/z_get.c @@ -136,10 +136,8 @@ int main(int argc, char **argv) { z_get_options_default(&opts); if (value != NULL) { - z_view_string_t value_str; - z_view_string_wrap(&value_str, value); z_owned_bytes_t payload; - z_bytes_encode_from_string(&payload, z_loan(value_str)); + z_bytes_encode_from_string(&payload, value); opts.payload = &payload; } #if Z_FEATURE_ATTACHMENT == 1 diff --git a/examples/unix/c11/z_get_channel.c b/examples/unix/c11/z_get_channel.c index e2eef163c..a6091de93 100644 --- a/examples/unix/c11/z_get_channel.c +++ b/examples/unix/c11/z_get_channel.c @@ -92,10 +92,8 @@ int main(int argc, char **argv) { z_get_options_default(&opts); // Value encoding if (value != NULL) { - z_view_string_t value_str; - z_view_string_wrap(&value_str, value); z_owned_bytes_t payload; - z_bytes_encode_from_string(&payload, z_loan(value_str)); + z_bytes_encode_from_string(&payload, value); opts.payload = &payload; } z_owned_reply_ring_channel_t channel; diff --git a/examples/unix/c11/z_queryable.c b/examples/unix/c11/z_queryable.c index 73ee65683..002059421 100644 --- a/examples/unix/c11/z_queryable.c +++ b/examples/unix/c11/z_queryable.c @@ -71,10 +71,8 @@ void query_handler(const z_loaned_query_t *query, void *ctx) { #endif // Reply value encoding - z_view_string_t reply_str; - z_view_string_wrap(&reply_str, value); z_owned_bytes_t reply_payload; - z_bytes_encode_from_string(&reply_payload, z_loan(reply_str)); + z_bytes_encode_from_string(&reply_payload, value); z_query_reply(query, z_query_keyexpr(query), z_move(reply_payload), &options); z_drop(z_move(keystr)); diff --git a/examples/unix/c11/z_queryable_channel.c b/examples/unix/c11/z_queryable_channel.c index 05091d334..cd69bc8bf 100644 --- a/examples/unix/c11/z_queryable_channel.c +++ b/examples/unix/c11/z_queryable_channel.c @@ -116,10 +116,8 @@ int main(int argc, char **argv) { z_query_reply_options_t options; z_query_reply_options_default(&options); // Reply value encoding - z_view_string_t reply_str; - z_view_string_wrap(&reply_str, value); z_owned_bytes_t reply_payload; - z_bytes_encode_from_string(&reply_payload, z_loan(reply_str)); + z_bytes_encode_from_string(&reply_payload, value); z_query_reply(q, z_query_keyexpr(q), z_move(reply_payload), &options); z_drop(z_move(keystr)); diff --git a/examples/unix/c99/z_get.c b/examples/unix/c99/z_get.c index e11827800..c71f1e099 100644 --- a/examples/unix/c99/z_get.c +++ b/examples/unix/c99/z_get.c @@ -123,10 +123,8 @@ int main(int argc, char **argv) { z_get_options_default(&opts); // Value encoding if (value != NULL) { - z_view_string_t value_str; - z_view_string_wrap(&value_str, value); z_owned_bytes_t payload; - z_bytes_encode_from_string(&payload, z_view_string_loan(&value_str)); + z_bytes_encode_from_string(&payload, value); opts.payload = &payload; } z_owned_closure_reply_t callback; diff --git a/examples/unix/c99/z_queryable.c b/examples/unix/c99/z_queryable.c index 9bdb4a910..910b66cf9 100644 --- a/examples/unix/c99/z_queryable.c +++ b/examples/unix/c99/z_queryable.c @@ -46,10 +46,8 @@ void query_handler(const z_loaned_query_t *query, void *ctx) { z_query_reply_options_default(&options); options.encoding = z_encoding_move(&encoding); // Reply value encoding - z_view_string_t reply_str; - z_view_string_wrap(&reply_str, value); z_owned_bytes_t reply_payload; - z_bytes_encode_from_string(&reply_payload, z_view_string_loan(&reply_str)); + z_bytes_encode_from_string(&reply_payload, value); z_query_reply(query, z_query_keyexpr(query), z_bytes_move(&reply_payload), &options); z_string_drop(z_string_move(&keystr)); diff --git a/examples/windows/z_get.c b/examples/windows/z_get.c index 42fdfea55..8c765c884 100644 --- a/examples/windows/z_get.c +++ b/examples/windows/z_get.c @@ -87,10 +87,8 @@ int main(int argc, char **argv) { z_get_options_default(&opts); // Value encoding if (value != NULL) { - z_view_string_t value_str; - z_view_string_wrap(&value_str, value); z_owned_bytes_t payload; - z_bytes_encode_from_string(&payload, z_loan(value_str)); + z_bytes_encode_from_string(&payload, value); opts.payload = &payload; } z_owned_closure_reply_t callback; diff --git a/examples/windows/z_queryable.c b/examples/windows/z_queryable.c index a6130c3b7..446543033 100644 --- a/examples/windows/z_queryable.c +++ b/examples/windows/z_queryable.c @@ -46,10 +46,8 @@ void query_handler(const z_loaned_query_t *query, void *ctx) { z_query_reply_options_default(&options); options.encoding = z_move(encoding); // Reply value encoding - z_view_string_t reply_str; - z_view_string_wrap(&reply_str, value); z_owned_bytes_t reply_payload; - z_bytes_encode_from_string(&reply_payload, z_loan(reply_str)); + z_bytes_encode_from_string(&reply_payload, value); z_query_reply(query, z_query_keyexpr(query), z_move(reply_payload), &options); diff --git a/examples/zephyr/z_get.c b/examples/zephyr/z_get.c index 397b3d340..f473d1d98 100644 --- a/examples/zephyr/z_get.c +++ b/examples/zephyr/z_get.c @@ -82,10 +82,8 @@ int main(int argc, char **argv) { opts.target = Z_QUERY_TARGET_ALL; // Value encoding if (strcmp(VALUE, "") != 0) { - z_view_string_t value_str; - z_view_string_wrap(&value_str, VALUE); z_owned_bytes_t payload; - z_bytes_encode_from_string(&payload, z_loan(value_str)); + z_bytes_encode_from_string(&payload, VALUE); opts.payload = &payload; } z_owned_closure_reply_t callback; diff --git a/examples/zephyr/z_queryable.c b/examples/zephyr/z_queryable.c index f210cf1b3..e2a494e3a 100644 --- a/examples/zephyr/z_queryable.c +++ b/examples/zephyr/z_queryable.c @@ -48,10 +48,8 @@ void query_handler(const z_loaned_query_t *query, void *ctx) { z_drop(z_move(payload_string)); } // Reply value encoding - z_view_string_t reply_str; - z_view_string_wrap(&reply_str, VALUE); z_owned_bytes_t reply_payload; - z_bytes_encode_from_string(&reply_payload, z_loan(reply_str)); + z_bytes_encode_from_string(&reply_payload, VALUE); z_query_reply(query, z_query_keyexpr(query), z_move(reply_payload), NULL); z_drop(z_move(keystr));