Rename matching methods and types from zc_ to z_ (#898)

eclipse-zenoh · Jan 29, 2025 · 7a21b9d · 7a21b9d
1 parent 220ef86
commit 7a21b9d
Show file tree

Hide file tree

Showing 13 changed files with 383 additions and 387 deletions.
diff --git a/build-resources/opaque-types/src/lib.rs b/build-resources/opaque-types/src/lib.rs
@@ -272,7 +272,7 @@ get_opaque_type_data!(Publisher<'static>, z_loaned_publisher_t);
 ///
 /// A listener that sends notifications when the [`MatchingStatus`] of a publisher or querier changes.
 /// Dropping the corresponding publisher, also drops matching listener.
-get_opaque_type_data!(Option<MatchingListener<()>>, zc_owned_matching_listener_t);
+get_opaque_type_data!(Option<MatchingListener<()>>, z_owned_matching_listener_t);
 
 /// An owned Zenoh <a href="https://zenoh.io/docs/manual/abstractions/#subscriber"> subscriber </a>.
 ///

diff --git a/docs/api.rst b/docs/api.rst
@@ -477,20 +477,20 @@ Matching
 
 Types
 -----
-.. doxygenstruct:: zc_owned_matching_listener_t
-.. doxygenstruct:: zc_owned_closure_matching_status_t
-.. doxygenstruct:: zc_matching_status_t
+.. doxygenstruct:: z_owned_matching_listener_t
+.. doxygenstruct:: z_owned_closure_matching_status_t
+.. doxygenstruct:: z_matching_status_t
     :members:
 
 Functions
 ---------
 
-.. doxygenfunction:: zc_matching_listener_drop
-.. doxygenfunction:: zc_undeclare_matching_listener
-.. doxygenfunction:: zc_closure_matching_status_drop
-.. doxygenfunction:: zc_closure_matching_status_loan
-.. doxygenfunction:: zc_closure_matching_status_call
-.. doxygenfunction:: zc_closure_matching_status
+.. doxygenfunction:: z_matching_listener_drop
+.. doxygenfunction:: z_undeclare_matching_listener
+.. doxygenfunction:: z_closure_matching_status_drop
+.. doxygenfunction:: z_closure_matching_status_loan
+.. doxygenfunction:: z_closure_matching_status_call
+.. doxygenfunction:: z_closure_matching_status
 
 
 Publication
@@ -540,9 +540,9 @@ Functions
 
 .. doxygenfunction:: z_reliability_default
 
-.. doxygenfunction:: zc_publisher_get_matching_status
-.. doxygenfunction:: zc_publisher_declare_matching_listener
-.. doxygenfunction:: zc_publisher_declare_background_matching_listener
+.. doxygenfunction:: z_publisher_get_matching_status
+.. doxygenfunction:: z_publisher_declare_matching_listener
+.. doxygenfunction:: z_publisher_declare_background_matching_listener
 
 Subscription
 ============
@@ -726,9 +726,9 @@ Functions
 .. doxygenfunction:: z_querier_id
 .. doxygenfunction:: z_querier_keyexpr
 .. doxygenfunction:: z_querier_get
-.. doxygenfunction:: zc_querier_get_matching_status
-.. doxygenfunction:: zc_querier_declare_matching_listener
-.. doxygenfunction:: zc_querier_declare_background_matching_listener
+.. doxygenfunction:: z_querier_get_matching_status
+.. doxygenfunction:: z_querier_declare_matching_listener
+.. doxygenfunction:: z_querier_declare_background_matching_listener
 
 .. doxygenfunction:: z_querier_options_default
 .. doxygenfunction:: z_querier_get_options_default

diff --git a/examples/z_pub.c b/examples/z_pub.c
@@ -30,7 +30,7 @@ struct args_t {
 struct args_t parse_args(int argc, char** argv, z_owned_config_t* config);
 
 #if defined(Z_FEATURE_UNSTABLE_API)
-void matching_status_handler(const zc_matching_status_t* matching_status, void* arg) {
+void matching_status_handler(const z_matching_status_t* matching_status, void* arg) {
     if (matching_status->matching) {
         printf("Publisher has matching subscribers.\n");
     } else {
@@ -63,9 +63,9 @@ int main(int argc, char** argv) {
 
 #if defined(Z_FEATURE_UNSTABLE_API)
     if (args.add_matching_listener) {
-        zc_owned_closure_matching_status_t callback;
+        z_owned_closure_matching_status_t callback;
         z_closure(&callback, matching_status_handler, NULL, NULL);
-        zc_publisher_declare_background_matching_listener(z_loan(pub), z_move(callback));
+        z_publisher_declare_background_matching_listener(z_loan(pub), z_move(callback));
     }
 #endif
 

diff --git a/examples/z_pub_shm.c b/examples/z_pub_shm.c
@@ -28,7 +28,7 @@ struct args_t {
 struct args_t parse_args(int argc, char** argv, z_owned_config_t* config);
 
 #if defined(Z_FEATURE_UNSTABLE_API)
-void matching_status_handler(const zc_matching_status_t* matching_status, void* arg) {
+void matching_status_handler(const z_matching_status_t* matching_status, void* arg) {
     if (matching_status->matching) {
         printf("Publisher has matching subscribers.\n");
     } else {
@@ -60,9 +60,9 @@ int main(int argc, char** argv) {
     }
 #if defined(Z_FEATURE_UNSTABLE_API)
     if (args.add_matching_listener) {
-        zc_owned_closure_matching_status_t callback;
+        z_owned_closure_matching_status_t callback;
         z_closure(&callback, matching_status_handler, NULL, NULL);
-        zc_publisher_declare_background_matching_listener(z_loan(pub), z_move(callback));
+        z_publisher_declare_background_matching_listener(z_loan(pub), z_move(callback));
     }
 #endif
 

diff --git a/examples/z_querier.c b/examples/z_querier.c
@@ -31,7 +31,7 @@ struct args_t {
 struct args_t parse_args(int argc, char** argv, z_owned_config_t* config);
 
 #if defined(Z_FEATURE_UNSTABLE_API)
-void matching_status_handler(const zc_matching_status_t* matching_status, void* arg) {
+void matching_status_handler(const z_matching_status_t* matching_status, void* arg) {
     if (matching_status->matching) {
         printf("Querier has matching queryables.\n");
     } else {
@@ -82,9 +82,9 @@ int main(int argc, char** argv) {
 
 #if defined(Z_FEATURE_UNSTABLE_API)
     if (args.add_matching_listener) {
-        zc_owned_closure_matching_status_t callback;
+        z_owned_closure_matching_status_t callback;
         z_closure(&callback, matching_status_handler, NULL, NULL);
-        zc_querier_declare_background_matching_listener(z_loan(querier), z_move(callback));
+        z_querier_declare_background_matching_listener(z_loan(querier), z_move(callback));
     }
 #endif