Add dummy options parameter to z_open/z_close

eclipse-zenoh · Sep 10, 2024 · 4e1d84f · 4e1d84f
1 parent 2ab9562
commit 4e1d84f
Show file tree

Hide file tree

Showing 81 changed files with 236 additions and 216 deletions.
diff --git a/examples/arduino/z_get.ino b/examples/arduino/z_get.ino
@@ -89,7 +89,7 @@ void setup() {
 
     // Open Zenoh session
     Serial.print("Opening Zenoh Session...");
-    if (z_open(&s, z_config_move(&config)) < 0) {
+    if (z_open(&s, z_config_move(&config), NULL) < 0) {
         Serial.println("Unable to open session!");
         while (1) {
             ;

diff --git a/examples/arduino/z_pub.ino b/examples/arduino/z_pub.ino
@@ -65,7 +65,7 @@ void setup() {
     // Open Zenoh session
     Serial.print("Opening Zenoh Session...");
     z_owned_session_t s;
-    if (z_open(&s, z_config_move(&config)) < 0) {
+    if (z_open(&s, z_config_move(&config), NULL) < 0) {
         Serial.println("Unable to open session!");
         while (1) {
             ;

diff --git a/examples/arduino/z_pull.ino b/examples/arduino/z_pull.ino
@@ -66,7 +66,7 @@ void setup() {
     // Open Zenoh session
     Serial.print("Opening Zenoh Session...");
     z_owned_session_t s;
-    if (z_open(&s, z_config_move(&config)) < 0) {
+    if (z_open(&s, z_config_move(&config), NULL) < 0) {
         Serial.println("Unable to open session!");
         while (1) {
             ;
@@ -76,7 +76,7 @@ void setup() {
 
     if (zp_start_read_task(z_session_loan_mut(&s), NULL) < 0 || zp_start_lease_task(z_session_loan_mut(&s), NULL) < 0) {
         printf("Unable to start read and lease tasks\n");
-        z_close(z_session_move(&s));
+        z_close(z_session_move(&s), NULL);
         return;
     }
 

diff --git a/examples/arduino/z_queryable.ino b/examples/arduino/z_queryable.ino
@@ -89,7 +89,7 @@ void setup() {
     // Open Zenoh session
     Serial.print("Opening Zenoh Session...");
     z_owned_session_t s;
-    if (z_open(&s, z_config_move(&config)) < 0) {
+    if (z_open(&s, z_config_move(&config), NULL) < 0) {
         Serial.println("Unable to open session!");
         while (1) {
             ;

diff --git a/examples/arduino/z_sub.ino b/examples/arduino/z_sub.ino
@@ -76,7 +76,7 @@ void setup() {
     // Open Zenoh session
     Serial.print("Opening Zenoh Session...");
     z_owned_session_t s;
-    if (z_open(&s, z_config_move(&config)) < 0) {
+    if (z_open(&s, z_config_move(&config), NULL) < 0) {
         Serial.println("Unable to open session!");
         while (1) {
             ;

diff --git a/examples/espidf/z_get.c b/examples/espidf/z_get.c
@@ -147,7 +147,7 @@ void app_main() {
     // Open Zenoh session
     printf("Opening Zenoh Session...");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -180,7 +180,7 @@ void app_main() {
 
     printf("Closing Zenoh Session...");
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     printf("OK!\n");
 }
 #else

diff --git a/examples/espidf/z_pub.c b/examples/espidf/z_pub.c
@@ -129,7 +129,7 @@ void app_main() {
     // Open Zenoh session
     printf("Opening Zenoh Session...");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -165,7 +165,7 @@ void app_main() {
     printf("Closing Zenoh Session...");
     z_undeclare_publisher(z_move(pub));
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     printf("OK!\n");
 }
 #else

diff --git a/examples/espidf/z_pull.c b/examples/espidf/z_pull.c
@@ -131,7 +131,7 @@ void app_main() {
     // Open Zenoh session
     printf("Opening Zenoh Session...");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -140,7 +140,7 @@ void app_main() {
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan_mut(s), NULL) < 0 || zp_start_lease_task(z_loan_mut(s), NULL) < 0) {
         printf("Unable to start read and lease tasks\n");
-        z_close(z_session_move(&s));
+        z_close(z_session_move(&s), NULL);
         exit(-1);
     }
 
@@ -181,7 +181,7 @@ void app_main() {
     z_undeclare_subscriber(z_move(sub));
     z_drop(z_move(handler));
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     printf("OK!\n");
 }
 #else

diff --git a/examples/espidf/z_queryable.c b/examples/espidf/z_queryable.c
@@ -156,7 +156,7 @@ void app_main() {
     // Open Zenoh session
     printf("Opening Zenoh Session...");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -187,7 +187,7 @@ void app_main() {
     printf("Closing Zenoh Session...");
     z_undeclare_queryable(z_move(qable));
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     printf("OK!\n");
 }
 #else

diff --git a/examples/espidf/z_sub.c b/examples/espidf/z_sub.c
@@ -139,7 +139,7 @@ void app_main() {
     // Open Zenoh session
     printf("Opening Zenoh Session...");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -168,7 +168,7 @@ void app_main() {
     printf("Closing Zenoh Session...");
     z_undeclare_subscriber(z_move(sub));
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     printf("OK!\n");
 }
 #else

diff --git a/examples/freertos_plus_tcp/z_get.c b/examples/freertos_plus_tcp/z_get.c
@@ -63,15 +63,15 @@ void app_main(void) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         return;
     }
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan_mut(s), NULL) < 0 || zp_start_lease_task(z_loan_mut(s), NULL) < 0) {
         printf("Unable to start read and lease tasks\n");
-        z_close(z_session_move(&s));
+        z_close(z_session_move(&s), NULL);
         return;
     }
 
@@ -100,7 +100,7 @@ void app_main(void) {
         }
     }
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 }
 #else
 void app_main(void) {

diff --git a/examples/freertos_plus_tcp/z_pub.c b/examples/freertos_plus_tcp/z_pub.c
@@ -41,7 +41,7 @@ void app_main(void) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         return;
     }
@@ -78,7 +78,7 @@ void app_main(void) {
     if (zp_start_read_task(z_loan_mut(s), &read_task_opt) < 0 ||
         zp_start_lease_task(z_loan_mut(s), &lease_task_opt) < 0) {
         printf("Unable to start read and lease tasks\n");
-        z_close(z_session_move(&s));
+        z_close(z_session_move(&s), NULL);
         return;
     }
 
@@ -108,7 +108,7 @@ void app_main(void) {
 
     // Clean-up
     z_undeclare_publisher(z_move(pub));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 }
 #else
 void app_main(void) {

diff --git a/examples/freertos_plus_tcp/z_pub_st.c b/examples/freertos_plus_tcp/z_pub_st.c
@@ -42,7 +42,7 @@ void app_main(void) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         return;
     }
@@ -80,7 +80,7 @@ void app_main(void) {
 
     z_undeclare_publisher(z_move(pub));
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 }
 #else
 void app_main(void) {

diff --git a/examples/freertos_plus_tcp/z_pull.c b/examples/freertos_plus_tcp/z_pull.c
@@ -41,15 +41,15 @@ void app_main(void) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         return;
     }
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan_mut(s), NULL) < 0 || zp_start_lease_task(z_loan_mut(s), NULL) < 0) {
         printf("Unable to start read and lease tasks\n");
-        z_close(z_session_move(&s));
+        z_close(z_session_move(&s), NULL);
         return;
     }
 
@@ -90,7 +90,7 @@ void app_main(void) {
     z_undeclare_subscriber(z_move(sub));
     z_drop(z_move(handler));
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 }
 #else
 void app_main(void) {

diff --git a/examples/freertos_plus_tcp/z_put.c b/examples/freertos_plus_tcp/z_put.c
@@ -39,15 +39,15 @@ void app_main(void) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         return;
     }
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan_mut(s), NULL) < 0 || zp_start_lease_task(z_loan_mut(s), NULL) < 0) {
         printf("Unable to start read and lease tasks\n");
-        z_close(z_session_move(&s));
+        z_close(z_session_move(&s), NULL);
         return;
     }
 
@@ -57,7 +57,7 @@ void app_main(void) {
     z_view_keyexpr_from_str_unchecked(&vke, KEYEXPR);
     if (z_declare_keyexpr(&ke, z_loan(s), z_loan(vke)) < 0) {
         printf("Unable to declare key expression!\n");
-        z_close(z_move(s));
+        z_close(z_move(s), NULL);
         return;
     }
 
@@ -79,7 +79,7 @@ void app_main(void) {
 
     // Clean up
     z_undeclare_keyexpr(z_move(ke), z_loan(s));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 }
 #else
 void app_main(void) {

diff --git a/examples/freertos_plus_tcp/z_queryable.c b/examples/freertos_plus_tcp/z_queryable.c
@@ -65,15 +65,15 @@ void app_main(void) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         return;
     }
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan_mut(s), NULL) < 0 || zp_start_lease_task(z_loan_mut(s), NULL) < 0) {
         printf("Unable to start read and lease tasks\n");
-        z_close(z_session_move(&s));
+        z_close(z_session_move(&s), NULL);
         return;
     }
 
@@ -98,7 +98,7 @@ void app_main(void) {
 
     z_undeclare_queryable(z_move(qable));
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 }
 #else
 void app_main(void) {

diff --git a/examples/freertos_plus_tcp/z_sub.c b/examples/freertos_plus_tcp/z_sub.c
@@ -49,15 +49,15 @@ void app_main(void) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         return;
     }
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan_mut(s), NULL) < 0 || zp_start_lease_task(z_loan_mut(s), NULL) < 0) {
         printf("Unable to start read and lease tasks\n");
-        z_close(z_session_move(&s));
+        z_close(z_session_move(&s), NULL);
         return;
     }
 
@@ -78,7 +78,7 @@ void app_main(void) {
 
     z_undeclare_subscriber(z_move(sub));
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 }
 #else
 void app_main(void) {

diff --git a/examples/freertos_plus_tcp/z_sub_st.c b/examples/freertos_plus_tcp/z_sub_st.c
@@ -53,7 +53,7 @@ void app_main(void) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         return;
     }
@@ -78,7 +78,7 @@ void app_main(void) {
 
     z_undeclare_subscriber(z_move(sub));
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 }
 #else
 void app_main(void) {

diff --git a/examples/mbed/z_get.cpp b/examples/mbed/z_get.cpp
@@ -68,7 +68,7 @@ int main(int argc, char **argv) {
     // Open Zenoh session
     printf("Opening Zenoh Session...");
     z_owned_session_t s;
-    if (z_open(&s, z_config_move(&config)) < 0) {
+    if (z_open(&s, z_config_move(&config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -101,7 +101,7 @@ int main(int argc, char **argv) {
 
     printf("Closing Zenoh Session...");
 
-    z_close(z_session_move(&s));
+    z_close(z_session_move(&s), NULL);
     printf("OK!\n");
 
     return 0;

diff --git a/examples/mbed/z_pub.cpp b/examples/mbed/z_pub.cpp
@@ -49,7 +49,7 @@ int main(int argc, char **argv) {
     // Open Zenoh session
     printf("Opening Zenoh Session...");
     z_owned_session_t s;
-    if (z_open(&s, z_config_move(&config)) < 0) {
+    if (z_open(&s, z_config_move(&config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -85,7 +85,7 @@ int main(int argc, char **argv) {
     printf("Closing Zenoh Session...");
     z_undeclare_publisher(z_publisher_move(&pub));
 
-    z_close(z_session_move(&s));
+    z_close(z_session_move(&s), NULL);
     printf("OK!\n");
 
     return 0;