Skip to content

Commit

Permalink
Update examples, fix querying_subscriber initialization
Browse files Browse the repository at this point in the history
  • Loading branch information
sashacmc committed Nov 17, 2023
1 parent 9741a34 commit 651484f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions examples/z_pub_cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ int main(int argc, char **argv) {
z_put(z_loan(s), z_keyexpr(keyexpr), (const uint8_t *)buf, strlen(buf), NULL);
}

ze_close_publication_cache(z_move(pub_cache));

z_drop(z_move(pub_cache));
z_close(z_move(s));

return 0;
}
3 changes: 2 additions & 1 deletion examples/z_query_sub.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ int main(int argc, char **argv) {
exit(-1);
}

ze_querying_subscriber_options_t sub_opts = ze_querying_subscriber_options_default();
z_owned_closure_sample_t callback = z_closure(data_handler);
printf("Declaring querying subscriber on '%s'...\n", expr);
ze_owned_querying_subscriber_t sub =
ze_declare_querying_subscriber(z_loan(s), z_keyexpr(expr), z_move(callback), NULL);
ze_declare_querying_subscriber(z_loan(s), z_keyexpr(expr), z_move(callback), &sub_opts);
if (!z_check(sub)) {
printf("Unable to declare querying subscriber.\n");
exit(-1);
Expand Down
9 changes: 4 additions & 5 deletions src/querying_subscriber.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ use zenoh_util::core::zresult::ErrNo;

use crate::{
impl_guarded_transmute, z_closure_sample_call, z_keyexpr_t, z_owned_closure_sample_t,
z_query_consolidation_default, z_query_consolidation_t, z_query_target_default,
z_query_target_t, z_reliability_t, z_sample_t, z_session_t, zcu_locality_default,
zcu_locality_t, zcu_reply_keyexpr_default, zcu_reply_keyexpr_t, GuardedTransmute,
LOG_INVALID_SESSION,
z_query_consolidation_none, z_query_consolidation_t, z_query_target_default, z_query_target_t,
z_reliability_t, z_sample_t, z_session_t, zcu_locality_default, zcu_locality_t,
zcu_reply_keyexpr_default, zcu_reply_keyexpr_t, GuardedTransmute, LOG_INVALID_SESSION,
};

type FetchingSubscriber = Option<Box<zenoh_ext::FetchingSubscriber<'static, ()>>>;
Expand Down Expand Up @@ -120,7 +119,7 @@ pub extern "C" fn ze_querying_subscriber_options_default() -> ze_querying_subscr
allowed_origin: zcu_locality_default(),
query_selector: z_keyexpr_t::null(),
query_target: z_query_target_default(),
query_consolidation: z_query_consolidation_default(),
query_consolidation: z_query_consolidation_none(),
query_accept_replies: zcu_reply_keyexpr_default(),
query_timeout_ms: 0,
}
Expand Down

0 comments on commit 651484f

Please sign in to comment.