Skip to content

Commit 2b4e465

Browse files
sashacmcsashacmc
authored
Rename (de/en)code to (de)serialize (#424)
1 parent aa7e7bc commit 2b4e465

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+201
-198
lines changed

‎docs/api.rst

+26-26
Original file line numberDiff line numberDiff line change
@@ -292,32 +292,32 @@ Primitives
292292
.. autocfunction:: primitives.h::z_value_payload
293293
.. autocfunction:: primitives.h::z_slice_data
294294
.. autocfunction:: primitives.h::z_slice_len
295-
.. autocfunction:: primitives.h::z_bytes_decode_into_int8
296-
.. autocfunction:: primitives.h::z_bytes_decode_into_int16
297-
.. autocfunction:: primitives.h::z_bytes_decode_into_int32
298-
.. autocfunction:: primitives.h::z_bytes_decode_into_int64
299-
.. autocfunction:: primitives.h::z_bytes_decode_into_uint8
300-
.. autocfunction:: primitives.h::z_bytes_decode_into_uint16
301-
.. autocfunction:: primitives.h::z_bytes_decode_into_uint32
302-
.. autocfunction:: primitives.h::z_bytes_decode_into_uint64
303-
.. autocfunction:: primitives.h::z_bytes_decode_into_float
304-
.. autocfunction:: primitives.h::z_bytes_decode_into_double
305-
.. autocfunction:: primitives.h::z_bytes_decode_into_slice
306-
.. autocfunction:: primitives.h::z_bytes_decode_into_string
307-
.. autocfunction:: primitives.h::z_bytes_encode_from_int8
308-
.. autocfunction:: primitives.h::z_bytes_encode_from_int16
309-
.. autocfunction:: primitives.h::z_bytes_encode_from_int32
310-
.. autocfunction:: primitives.h::z_bytes_encode_from_int64
311-
.. autocfunction:: primitives.h::z_bytes_encode_from_uint8
312-
.. autocfunction:: primitives.h::z_bytes_encode_from_uint16
313-
.. autocfunction:: primitives.h::z_bytes_encode_from_uint32
314-
.. autocfunction:: primitives.h::z_bytes_encode_from_uint64
315-
.. autocfunction:: primitives.h::z_bytes_encode_from_float
316-
.. autocfunction:: primitives.h::z_bytes_encode_from_double
317-
.. autocfunction:: primitives.h::z_bytes_encode_from_slice
318-
.. autocfunction:: primitives.h::z_bytes_encode_from_slice_copy
319-
.. autocfunction:: primitives.h::z_bytes_encode_from_string
320-
.. autocfunction:: primitives.h::z_bytes_encode_from_string_copy
295+
.. autocfunction:: primitives.h::z_bytes_deserialize_into_int8
296+
.. autocfunction:: primitives.h::z_bytes_deserialize_into_int16
297+
.. autocfunction:: primitives.h::z_bytes_deserialize_into_int32
298+
.. autocfunction:: primitives.h::z_bytes_deserialize_into_int64
299+
.. autocfunction:: primitives.h::z_bytes_deserialize_into_uint8
300+
.. autocfunction:: primitives.h::z_bytes_deserialize_into_uint16
301+
.. autocfunction:: primitives.h::z_bytes_deserialize_into_uint32
302+
.. autocfunction:: primitives.h::z_bytes_deserialize_into_uint64
303+
.. autocfunction:: primitives.h::z_bytes_deserialize_into_float
304+
.. autocfunction:: primitives.h::z_bytes_deserialize_into_double
305+
.. autocfunction:: primitives.h::z_bytes_deserialize_into_slice
306+
.. autocfunction:: primitives.h::z_bytes_deserialize_into_string
307+
.. autocfunction:: primitives.h::z_bytes_serialize_from_int8
308+
.. autocfunction:: primitives.h::z_bytes_serialize_from_int16
309+
.. autocfunction:: primitives.h::z_bytes_serialize_from_int32
310+
.. autocfunction:: primitives.h::z_bytes_serialize_from_int64
311+
.. autocfunction:: primitives.h::z_bytes_serialize_from_uint8
312+
.. autocfunction:: primitives.h::z_bytes_serialize_from_uint16
313+
.. autocfunction:: primitives.h::z_bytes_serialize_from_uint32
314+
.. autocfunction:: primitives.h::z_bytes_serialize_from_uint64
315+
.. autocfunction:: primitives.h::z_bytes_serialize_from_float
316+
.. autocfunction:: primitives.h::z_bytes_serialize_from_double
317+
.. autocfunction:: primitives.h::z_bytes_serialize_from_slice
318+
.. autocfunction:: primitives.h::z_bytes_serialize_from_slice_copy
319+
.. autocfunction:: primitives.h::z_bytes_serialize_from_string
320+
.. autocfunction:: primitives.h::z_bytes_serialize_from_string_copy
321321
.. autocfunction:: primitives.h::z_timestamp_check
322322
.. autocfunction:: primitives.h::z_query_target_default
323323
.. autocfunction:: primitives.h::z_query_consolidation_auto

‎examples/arduino/z_get.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void reply_handler(const z_loaned_reply_t *oreply, void *ctx) {
4949
z_owned_string_t keystr;
5050
z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
5151
z_owned_string_t replystr;
52-
z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
52+
z_bytes_deserialize_into_string(z_sample_payload(sample), &replystr);
5353

5454
Serial.print(" >> [Get listener] Received (");
5555
Serial.print(z_string_data(z_string_loan(&keystr)));
@@ -118,7 +118,7 @@ void loop() {
118118
// Value encoding
119119
z_owned_bytes_t payload;
120120
if (strcmp(VALUE, "") != 0) {
121-
z_bytes_encode_from_string(&payload, VALUE);
121+
z_bytes_serialize_from_string(&payload, VALUE);
122122
opts.payload = &payload;
123123
}
124124
z_owned_closure_reply_t callback;

‎examples/arduino/z_queryable.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void query_handler(const z_loaned_query_t *query, void *arg) {
4444

4545
// Process value
4646
z_owned_string_t payload_string;
47-
z_bytes_decode_into_string(z_value_payload(z_query_value(query)), &payload_string);
47+
z_bytes_deserialize_into_string(z_value_payload(z_query_value(query)), &payload_string);
4848
if (z_string_len(z_string_loan(&payload_string)) > 1) {
4949
Serial.print(" with value '");
5050
Serial.print(z_string_data(z_string_loan(&payload_string)));
@@ -57,7 +57,7 @@ void query_handler(const z_loaned_query_t *query, void *arg) {
5757

5858
// Reply value encoding
5959
z_owned_bytes_t reply_payload;
60-
z_bytes_encode_from_string(&reply_payload, VALUE);
60+
z_bytes_serialize_from_string(&reply_payload, VALUE);
6161

6262
z_query_reply(query, z_view_keyexpr_loan(&ke), z_bytes_move(&reply_payload), NULL);
6363

‎examples/arduino/z_sub.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void data_handler(const z_loaned_sample_t *sample, void *arg) {
3838
z_owned_string_t keystr;
3939
z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
4040
z_owned_string_t value;
41-
z_bytes_decode_into_string(z_sample_payload(sample), &value);
41+
z_bytes_deserialize_into_string(z_sample_payload(sample), &value);
4242

4343
Serial.print(" >> [Subscription listener] Received (");
4444
Serial.print(z_string_data(z_string_loan(&keystr)));

‎examples/espidf/z_get.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void reply_handler(const z_loaned_reply_t *oreply, void *ctx) {
109109
z_owned_string_t keystr;
110110
z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
111111
z_owned_string_t replystr;
112-
z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
112+
z_bytes_deserialize_into_string(z_sample_payload(sample), &replystr);
113113

114114
printf(" >> Received ('%s': '%s')\n", z_string_data(z_loan(keystr)), z_string_data(z_loan(replystr)));
115115
z_drop(z_move(keystr));
@@ -165,7 +165,7 @@ void app_main() {
165165
// Value encoding
166166
z_owned_bytes_t payload;
167167
if (strcmp(VALUE, "") != 0) {
168-
z_bytes_encode_from_string(&payload, VALUE);
168+
z_bytes_serialize_from_string(&payload, VALUE);
169169
opts.payload = &payload;
170170
}
171171
z_owned_closure_reply_t callback;

‎examples/espidf/z_queryable.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
111111
z_loan(params)->val);
112112
// Process value
113113
z_owned_string_t payload_string;
114-
z_bytes_decode_into_string(z_value_payload(z_query_value(query)), &payload_string);
114+
z_bytes_deserialize_into_string(z_value_payload(z_query_value(query)), &payload_string);
115115
if (z_string_len(z_loan(payload_string)) > 1) {
116116
printf(" with value '%s'\n", z_string_data(z_loan(payload_string)));
117117
}
@@ -122,7 +122,7 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
122122

123123
// Reply value encoding
124124
z_owned_bytes_t reply_payload;
125-
z_bytes_encode_from_string(&reply_payload, VALUE);
125+
z_bytes_serialize_from_string(&reply_payload, VALUE);
126126

127127
z_query_reply(query, z_loan(ke), z_move(reply_payload), NULL);
128128
z_drop(z_move(keystr));

‎examples/espidf/z_sub.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void data_handler(const z_loaned_sample_t* sample, void* arg) {
104104
z_owned_string_t keystr;
105105
z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
106106
z_owned_string_t value;
107-
z_bytes_decode_into_string(z_sample_payload(sample), &value);
107+
z_bytes_deserialize_into_string(z_sample_payload(sample), &value);
108108
printf(" >> [Subscriber handler] Received ('%s': '%s')\n", z_string_data(z_string_loan(&keystr)),
109109
z_string_data(z_string_loan(&value)));
110110
z_string_drop(z_string_move(&keystr));

‎examples/freertos_plus_tcp/z_get.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void reply_handler(const z_loaned_reply_t *reply, void *ctx) {
4343
z_owned_string_t keystr;
4444
z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
4545
z_owned_string_t replystr;
46-
z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
46+
z_bytes_deserialize_into_string(z_sample_payload(sample), &replystr);
4747

4848
printf(">> Received ('%s': '%s')\n", z_string_data(z_loan(keystr)), z_string_data(z_loan(replystr)));
4949
z_drop(z_move(keystr));
@@ -89,7 +89,7 @@ void app_main(void) {
8989
// Value encoding
9090
z_owned_bytes_t payload;
9191
if (strcmp(VALUE, "") != 0) {
92-
z_bytes_encode_from_string(&payload, VALUE);
92+
z_bytes_serialize_from_string(&payload, VALUE);
9393
opts.payload = &payload;
9494
}
9595
z_owned_closure_reply_t callback;

‎examples/freertos_plus_tcp/z_queryable.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
3939
z_loan(params)->val);
4040
// Process value
4141
z_owned_string_t payload_string;
42-
z_bytes_decode_into_string(z_value_payload(z_query_value(query)), &payload_string);
42+
z_bytes_deserialize_into_string(z_value_payload(z_query_value(query)), &payload_string);
4343
if (z_string_len(z_loan(payload_string)) > 1) {
4444
printf(" with value '%s'\n", z_string_data(z_loan(payload_string)));
4545
}
@@ -49,7 +49,7 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
4949
z_query_reply_options_default(&options);
5050
// Reply value encoding
5151
z_owned_bytes_t reply_payload;
52-
z_bytes_encode_from_string(&reply_payload, VALUE);
52+
z_bytes_serialize_from_string(&reply_payload, VALUE);
5353

5454
z_query_reply(query, z_query_keyexpr(query), z_move(reply_payload), &options);
5555
z_drop(z_move(keystr));

‎examples/freertos_plus_tcp/z_sub.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void data_handler(const z_loaned_sample_t *sample, void *ctx) {
3333
z_owned_string_t keystr;
3434
z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
3535
z_owned_string_t value;
36-
z_bytes_decode_into_string(z_sample_payload(sample), &value);
36+
z_bytes_deserialize_into_string(z_sample_payload(sample), &value);
3737
printf(">> [Subscriber] Received ('%s': '%s')\n", z_string_data(z_loan(keystr)), z_string_data(z_loan(value)));
3838
z_drop(z_move(keystr));
3939
z_drop(z_move(value));

‎examples/freertos_plus_tcp/z_sub_st.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void data_handler(const z_loaned_sample_t *sample, void *ctx) {
3636
z_owned_string_t keystr;
3737
z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
3838
z_owned_string_t value;
39-
z_bytes_decode_into_string(z_sample_payload(sample), &value);
39+
z_bytes_deserialize_into_string(z_sample_payload(sample), &value);
4040
printf(">> [Subscriber] Received ('%s': '%s')\n", z_string_data(z_loan(keystr)), z_string_data(z_loan(value)));
4141
z_drop(z_move(keystr));
4242
z_drop(z_move(value));

‎examples/mbed/z_get.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void reply_handler(const z_loaned_reply_t *oreply, void *ctx) {
3939
z_owned_string_t keystr;
4040
z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
4141
z_owned_string_t replystr;
42-
z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
42+
z_bytes_deserialize_into_string(z_sample_payload(sample), &replystr);
4343

4444
printf(" >> Received ('%s': '%s')\n", z_string_data(z_string_loan(&keystr)),
4545
z_string_data(z_string_loan(&replystr)));
@@ -86,7 +86,7 @@ int main(int argc, char **argv) {
8686
// Value encoding
8787
z_owned_bytes_t payload;
8888
if (strcmp(VALUE, "") != 0) {
89-
z_bytes_encode_from_string(&payload, VALUE);
89+
z_bytes_serialize_from_string(&payload, VALUE);
9090
opts.payload = &payload;
9191
}
9292
z_owned_closure_reply_t callback;

‎examples/mbed/z_queryable.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ void query_handler(const z_loaned_query_t *query, void *ctx) {
4141
(int)z_view_string_loan(&pred)->len, z_view_string_loan(&pred)->val);
4242
// Process value
4343
z_owned_string_t payload_string;
44-
z_bytes_decode_into_string(z_value_payload(z_query_value(query)), &payload_string);
44+
z_bytes_deserialize_into_string(z_value_payload(z_query_value(query)), &payload_string);
4545
if (z_string_len(z_string_loan(&payload_string)) > 1) {
4646
printf(" with value '%s'\n", z_string_data(z_string_loan(&payload_string)));
4747
}
4848
z_string_drop(z_string_move(&payload_string));
4949

5050
// Reply value encoding
5151
z_owned_bytes_t reply_payload;
52-
z_bytes_encode_from_string(&reply_payload, VALUE);
52+
z_bytes_serialize_from_string(&reply_payload, VALUE);
5353

5454
z_query_reply(query, z_query_keyexpr(query), z_bytes_move(&reply_payload), NULL);
5555
z_string_drop(z_string_move(&keystr));

‎examples/mbed/z_sub.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void data_handler(const z_loaned_sample_t *sample, void *arg) {
3434
z_owned_string_t keystr;
3535
z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
3636
z_owned_string_t value;
37-
z_bytes_decode_into_string(z_sample_payload(sample), &value);
37+
z_bytes_deserialize_into_string(z_sample_payload(sample), &value);
3838
printf(" >> [Subscriber handler] Received ('%s': '%s')\n", z_string_data(z_string_loan(&keystr)),
3939
z_string_data(z_string_loan(&value)));
4040
z_string_drop(z_string_move(&keystr));

‎examples/unix/c11/z_get.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void reply_handler(const z_loaned_reply_t *reply, void *ctx) {
3636
z_owned_string_t keystr;
3737
z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
3838
z_owned_string_t replystr;
39-
z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
39+
z_bytes_deserialize_into_string(z_sample_payload(sample), &replystr);
4040

4141
printf(">> Received ('%s': '%s')\n", z_string_data(z_loan(keystr)), z_string_data(z_loan(replystr)));
4242
z_drop(z_move(keystr));
@@ -123,7 +123,7 @@ int main(int argc, char **argv) {
123123
// Value encoding
124124
z_owned_bytes_t payload;
125125
if (value != NULL) {
126-
z_bytes_encode_from_string(&payload, value);
126+
z_bytes_serialize_from_string(&payload, value);
127127
opts.payload = &payload;
128128
}
129129

‎examples/unix/c11/z_get_attachment.c

+10-9
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ _Bool create_attachment_iter(z_owned_bytes_t *kv_pair, void *context, size_t *cu
6363
if (kvs->current_idx >= kvs->len) {
6464
return false;
6565
} else {
66-
z_bytes_encode_from_string(&k, kvs->data[kvs->current_idx].key);
67-
z_bytes_encode_from_string(&v, kvs->data[kvs->current_idx].value);
68-
zp_bytes_encode_from_pair(kv_pair, z_move(k), z_move(v), curr_idx);
66+
z_bytes_serialize_from_string(&k, kvs->data[kvs->current_idx].key);
67+
z_bytes_serialize_from_string(&v, kvs->data[kvs->current_idx].value);
68+
zp_bytes_serialize_from_pair(kv_pair, z_move(k), z_move(v), curr_idx);
6969
kvs->current_idx++;
7070
return true;
7171
}
@@ -74,9 +74,10 @@ _Bool create_attachment_iter(z_owned_bytes_t *kv_pair, void *context, size_t *cu
7474
void parse_attachment(kv_pairs_rx_t *kvp, const z_loaned_bytes_t *attachment) {
7575
size_t curr_idx = 0;
7676
z_owned_bytes_t first, second;
77-
while ((kvp->current_idx < kvp->len) && (zp_bytes_decode_into_pair(attachment, &first, &second, &curr_idx) == 0)) {
78-
z_bytes_decode_into_string(z_loan(first), &kvp->data[kvp->current_idx].key);
79-
z_bytes_decode_into_string(z_loan(second), &kvp->data[kvp->current_idx].value);
77+
while ((kvp->current_idx < kvp->len) &&
78+
(zp_bytes_deserialize_into_pair(attachment, &first, &second, &curr_idx) == 0)) {
79+
z_bytes_deserialize_into_string(z_loan(first), &kvp->data[kvp->current_idx].key);
80+
z_bytes_deserialize_into_string(z_loan(second), &kvp->data[kvp->current_idx].value);
8081
z_bytes_drop(&first);
8182
z_bytes_drop(&second);
8283
kvp->current_idx++;
@@ -113,7 +114,7 @@ void reply_handler(const z_loaned_reply_t *reply, void *ctx) {
113114
z_owned_string_t keystr;
114115
z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
115116
z_owned_string_t replystr;
116-
z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
117+
z_bytes_deserialize_into_string(z_sample_payload(sample), &replystr);
117118

118119
printf(">> Received ('%s': '%s')\n", z_string_data(z_loan(keystr)), z_string_data(z_loan(replystr)));
119120

@@ -210,7 +211,7 @@ int main(int argc, char **argv) {
210211
// Value encoding
211212
z_owned_bytes_t payload;
212213
if (value != NULL) {
213-
z_bytes_encode_from_string(&payload, value);
214+
z_bytes_serialize_from_string(&payload, value);
214215
opts.payload = &payload;
215216
}
216217

@@ -219,7 +220,7 @@ int main(int argc, char **argv) {
219220
kvs[0] = (kv_pair_t){.key = "test_key", .value = "test_value"};
220221
kv_pairs_tx_t ctx = (kv_pairs_tx_t){.data = kvs, .current_idx = 0, .len = 1};
221222
z_owned_bytes_t attachment;
222-
zp_bytes_encode_from_iter(&attachment, create_attachment_iter, (void *)&ctx, kv_pairs_size(&ctx));
223+
zp_bytes_serialize_from_iter(&attachment, create_attachment_iter, (void *)&ctx, kv_pairs_size(&ctx));
223224
opts.attachment = z_move(attachment);
224225

225226
z_owned_closure_reply_t callback;

‎examples/unix/c11/z_get_channel.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ int main(int argc, char **argv) {
9393
// Value encoding
9494
z_owned_bytes_t payload;
9595
if (value != NULL) {
96-
z_bytes_encode_from_string(&payload, value);
96+
z_bytes_serialize_from_string(&payload, value);
9797
opts.payload = &payload;
9898
}
9999
z_owned_reply_ring_channel_t channel;
@@ -111,7 +111,7 @@ int main(int argc, char **argv) {
111111
z_owned_string_t keystr;
112112
z_keyexpr_to_string(z_sample_keyexpr(sample), &keystr);
113113
z_owned_string_t replystr;
114-
z_bytes_decode_into_string(z_sample_payload(sample), &replystr);
114+
z_bytes_deserialize_into_string(z_sample_payload(sample), &replystr);
115115

116116
printf(">> Received ('%s': '%s')\n", z_string_data(z_loan(keystr)), z_string_data(z_loan(replystr)));
117117
z_drop(z_move(keystr));

‎examples/unix/c11/z_pong.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
void callback(const z_loaned_sample_t* sample, void* context) {
2020
const z_loaned_publisher_t* pub = z_loan(*(z_owned_publisher_t*)context);
2121
z_owned_slice_t value;
22-
z_bytes_decode_into_slice(z_sample_payload(sample), &value);
22+
z_bytes_deserialize_into_slice(z_sample_payload(sample), &value);
2323
z_publisher_put(pub, z_slice_data(z_loan(value)), z_slice_len(z_loan(value)), NULL);
2424
z_drop(z_move(value));
2525
}

‎examples/unix/c11/z_pub_attachment.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ _Bool create_attachment_iter(z_owned_bytes_t *kv_pair, void *context, size_t *cu
5353
if (kvs->current_idx >= kvs->len) {
5454
return false;
5555
} else {
56-
z_bytes_encode_from_string(&k, kvs->data[kvs->current_idx].key);
57-
z_bytes_encode_from_string(&v, kvs->data[kvs->current_idx].value);
58-
zp_bytes_encode_from_pair(kv_pair, z_move(k), z_move(v), curr_idx);
56+
z_bytes_serialize_from_string(&k, kvs->data[kvs->current_idx].key);
57+
z_bytes_serialize_from_string(&v, kvs->data[kvs->current_idx].value);
58+
zp_bytes_serialize_from_pair(kv_pair, z_move(k), z_move(v), curr_idx);
5959
kvs->current_idx++;
6060
return true;
6161
}
@@ -163,7 +163,7 @@ int main(int argc, char **argv) {
163163
sprintf(buf_ind, "%d", idx);
164164
kvs[1] = (kv_pair_t){.key = "index", .value = buf_ind};
165165
kv_pairs_t ctx = (kv_pairs_t){.data = kvs, .current_idx = 0, .len = 2};
166-
zp_bytes_encode_from_iter(&attachment, create_attachment_iter, (void *)&ctx, kv_pairs_size(&ctx));
166+
zp_bytes_serialize_from_iter(&attachment, create_attachment_iter, (void *)&ctx, kv_pairs_size(&ctx));
167167
options.attachment = z_move(attachment);
168168

169169
sprintf(buf, "[%4d] %s", idx, value);

‎examples/unix/c11/z_pull.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ int main(int argc, char **argv) {
9191
z_owned_string_t keystr;
9292
z_keyexpr_to_string(z_sample_keyexpr(z_loan(sample)), &keystr);
9393
z_owned_string_t value;
94-
z_bytes_decode_into_string(z_sample_payload(z_loan(sample)), &value);
94+
z_bytes_deserialize_into_string(z_sample_payload(z_loan(sample)), &value);
9595
printf(">> [Subscriber] Pulled ('%s': '%s')\n", z_string_data(z_loan(keystr)),
9696
z_string_data(z_loan(value)));
9797
z_drop(z_move(keystr));

0 commit comments

Comments
 (0)