Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: typos of attachment #478

Merged
merged 1 commit into from
Jul 15, 2024
Merged

fix: typos of attachment #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/z_put.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int main(int argc, char **argv) {

z_put_options_t options;
z_put_options_default(&options);
options.attachment = &attachment; // attachement is going to be consumed by z_put, so no need to drop it manually
options.attachment = &attachment; // attachment is going to be consumed by z_put, so no need to drop it manually

int res = z_put(z_loan(s), z_loan(ke), z_move(payload), &options);
if (res < 0) {
Expand Down
2 changes: 1 addition & 1 deletion include/zenoh_commons.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2735,7 +2735,7 @@ bool z_ring_handler_sample_try_recv(const struct z_loaned_ring_handler_sample_t
/**
* Returns sample attachment.
*
* Returns `NULL`, if sample does not contain any attachement.
* Returns `NULL`, if sample does not contain any attachment.
*/
ZENOHC_API
const struct z_loaned_bytes_t *z_sample_attachment(const struct z_loaned_sample_t *this_);
Expand Down
2 changes: 1 addition & 1 deletion src/commons.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ pub extern "C" fn z_sample_timestamp(this: &z_loaned_sample_t) -> Option<&z_time

/// Returns sample attachment.
///
/// Returns `NULL`, if sample does not contain any attachement.
/// Returns `NULL`, if sample does not contain any attachment.
#[no_mangle]
pub extern "C" fn z_sample_attachment(this: &z_loaned_sample_t) -> *const z_loaned_bytes_t {
match this.transmute_ref().attachment() {
Expand Down
20 changes: 10 additions & 10 deletions tests/z_int_pub_sub_attachment_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ const char *const K_VAR = "k_var";
const char *const K_CONST = "k_const";
const char *const V_CONST = "v const";

typedef struct attachement_context_t {
typedef struct attachment_context_t {
const char *keys[2];
const char *values[2];
size_t num_items;
size_t iteration_index;
} attachement_context_t;
} attachment_context_t;

bool create_attachement_it(z_owned_bytes_t *kv_pair, void *context) {
attachement_context_t *ctx = (attachement_context_t *)(context);
bool create_attachment_it(z_owned_bytes_t *kv_pair, void *context) {
attachment_context_t *ctx = (attachment_context_t *)(context);
z_owned_bytes_t k, v;
if (ctx->iteration_index >= ctx->num_items) {
return false;
Expand All @@ -53,8 +53,8 @@ bool create_attachement_it(z_owned_bytes_t *kv_pair, void *context) {
return true;
};

z_error_t check_attachement(const z_loaned_bytes_t *attachement, const attachement_context_t *ctx) {
z_bytes_iterator_t iter = z_bytes_get_iterator(attachement);
z_error_t check_attachment(const z_loaned_bytes_t *attachment, const attachment_context_t *ctx) {
z_bytes_iterator_t iter = z_bytes_get_iterator(attachment);
for (size_t i = 0; i < ctx->num_items; i++) {
z_owned_bytes_t kv, k, v;
if (!z_bytes_iterator_next(&iter, &kv)) {
Expand Down Expand Up @@ -109,11 +109,11 @@ int run_publisher() {
z_publisher_put_options_default(&options);

for (int i = 0; i < values_count; ++i) {
attachement_context_t out_attachment_context = (attachement_context_t){
attachment_context_t out_attachment_context = (attachment_context_t){
.keys = {K_CONST, K_VAR}, .values = {V_CONST, values[i]}, .num_items = 2, .iteration_index = 0};

z_owned_bytes_t attachment;
z_bytes_serialize_from_iter(&attachment, create_attachement_it, (void *)&out_attachment_context);
z_bytes_serialize_from_iter(&attachment, create_attachment_it, (void *)&out_attachment_context);

options.attachment = &attachment;

Expand Down Expand Up @@ -152,9 +152,9 @@ void data_handler(const z_loaned_sample_t *sample, void *arg) {
exit(-1);
}

attachement_context_t in_attachment_context = (attachement_context_t){
attachment_context_t in_attachment_context = (attachment_context_t){
.keys = {K_CONST, K_VAR}, .values = {V_CONST, values[val_num]}, .num_items = 2, .iteration_index = 0};
if (check_attachement(attachment, &in_attachment_context) != 0) {
if (check_attachment(attachment, &in_attachment_context) != 0) {
perror("Failed to validate attachment");
exit(-1);
}
Expand Down
32 changes: 16 additions & 16 deletions tests/z_int_queryable_attachment_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ const char *const K_VAR = "k_var";
const char *const K_CONST = "k_const";
const char *const V_CONST = "v const";

typedef struct attachement_context_t {
typedef struct attachment_context_t {
const char *keys[2];
const char *values[2];
size_t num_items;
size_t iteration_index;
} attachement_context_t;
} attachment_context_t;

bool create_attachement_it(z_owned_bytes_t *kv_pair, void *context) {
attachement_context_t *ctx = (attachement_context_t *)(context);
bool create_attachment_it(z_owned_bytes_t *kv_pair, void *context) {
attachment_context_t *ctx = (attachment_context_t *)(context);
z_owned_bytes_t k, v;
if (ctx->iteration_index >= ctx->num_items) {
return false;
Expand All @@ -51,8 +51,8 @@ bool create_attachement_it(z_owned_bytes_t *kv_pair, void *context) {
return true;
};

z_error_t check_attachement(const z_loaned_bytes_t *attachement, const attachement_context_t *ctx) {
z_bytes_iterator_t iter = z_bytes_get_iterator(attachement);
z_error_t check_attachment(const z_loaned_bytes_t *attachment, const attachment_context_t *ctx) {
z_bytes_iterator_t iter = z_bytes_get_iterator(attachment);
for (size_t i = 0; i < ctx->num_items; i++) {
z_owned_bytes_t kv, k, v;
if (!z_bytes_iterator_next(&iter, &kv)) {
Expand Down Expand Up @@ -96,9 +96,9 @@ void query_handler(const z_loaned_query_t *query, void *context) {
exit(-1);
}

attachement_context_t in_attachment_context = (attachement_context_t){
attachment_context_t in_attachment_context = (attachment_context_t){
.keys = {K_CONST, K_VAR}, .values = {V_CONST, values[value_num]}, .num_items = 2, .iteration_index = 0};
if (check_attachement(attachment, &in_attachment_context) != 0) {
if (check_attachment(attachment, &in_attachment_context) != 0) {
perror("Failed to validate attachment");
exit(-1);
}
Expand All @@ -107,9 +107,9 @@ void query_handler(const z_loaned_query_t *query, void *context) {
z_query_reply_options_default(&options);

z_owned_bytes_t reply_attachment;
attachement_context_t out_attachment_context =
(attachement_context_t){.keys = {K_CONST}, .values = {V_CONST}, .num_items = 1, .iteration_index = 0};
z_bytes_serialize_from_iter(&reply_attachment, create_attachement_it, (void *)&out_attachment_context);
attachment_context_t out_attachment_context =
(attachment_context_t){.keys = {K_CONST}, .values = {V_CONST}, .num_items = 1, .iteration_index = 0};
z_bytes_serialize_from_iter(&reply_attachment, create_attachment_it, (void *)&out_attachment_context);

options.attachment = &reply_attachment;

Expand Down Expand Up @@ -172,15 +172,15 @@ int run_get() {
z_get_options_default(&opts);

for (int val_num = 0; val_num < values_count; ++val_num) {
attachement_context_t out_attachment_context = (attachement_context_t){
attachment_context_t out_attachment_context = (attachment_context_t){
.keys = {K_CONST, K_VAR}, .values = {V_CONST, values[val_num]}, .num_items = 2, .iteration_index = 0};

z_owned_fifo_handler_reply_t handler;
z_owned_closure_reply_t closure;
z_fifo_channel_reply_new(&closure, &handler, 16);

z_owned_bytes_t attachment;
z_bytes_serialize_from_iter(&attachment, create_attachement_it, (void *)&out_attachment_context);
z_bytes_serialize_from_iter(&attachment, create_attachment_it, (void *)&out_attachment_context);

opts.attachment = &attachment;
z_get(z_loan(s), z_loan(ke), "", z_move(closure), &opts);
Expand All @@ -202,9 +202,9 @@ int run_get() {
perror("Missing attachment!");
exit(-1);
}
attachement_context_t in_attachment_context =
(attachement_context_t){.keys = {K_CONST}, .values = {V_CONST}, .num_items = 1, .iteration_index = 0};
if (check_attachement(received_attachment, &in_attachment_context) != 0) {
attachment_context_t in_attachment_context =
(attachment_context_t){.keys = {K_CONST}, .values = {V_CONST}, .num_items = 1, .iteration_index = 0};
if (check_attachment(received_attachment, &in_attachment_context) != 0) {
perror("Failed to validate attachment");
exit(-1);
}
Expand Down