fix: compilation issues

eclipse-zenoh · Jan 18, 2024 · afce929 · afce929
1 parent d4fb72b
commit afce929
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/api/api.c b/src/api/api.c
@@ -647,7 +647,7 @@ int8_t z_put(z_session_t zs, z_keyexpr_t keyexpr, const uint8_t *payload, z_zint
     );
 
     // Trigger local subscriptions
-    _z_trigger_local_subscriptions(&zs._val.in->val, keyexpr, payload, payload_len);
+    _z_trigger_local_subscriptions(&zs._val.in->val, keyexpr, payload, payload_len
 #if Z_FEATURE_ATTACHMENT == 1
                                    ,
                                    opt.attachment
@@ -666,7 +666,7 @@ int8_t z_delete(z_session_t zs, z_keyexpr_t keyexpr, const z_delete_options_t *o
         opt.priority = options->priority;
     }
     ret = _z_write(&zs._val.in->val, keyexpr, NULL, 0, z_encoding_default(), Z_SAMPLE_KIND_DELETE,
-                   opt.priority
+                   opt.congestion_control, opt.priority
 #if Z_FEATURE_ATTACHMENT == 1
                    ,
                    z_attachment_null()
@@ -746,7 +746,7 @@ int8_t z_publisher_put(const z_publisher_t pub, const uint8_t *payload, size_t l
     );
 
     // Trigger local subscriptions
-    _z_trigger_local_subscriptions(&pub._val->_zn.in->val, pub._val->_key, payload, len);
+    _z_trigger_local_subscriptions(&pub._val->_zn.in->val, pub._val->_key, payload, len
 #if Z_FEATURE_ATTACHMENT == 1
                                    ,
                                    opt.attachment
@@ -834,8 +834,7 @@ int8_t z_get(z_session_t zs, z_keyexpr_t keyexpr, const char *parameters, z_owne
     }
 
     ret = _z_query(&zs._val.in->val, keyexpr, parameters, opt.target, opt.consolidation.mode, opt.value,
-                   wrapped_ctx, callback->drop, ctx
-
+                   __z_reply_handler, wrapped_ctx, callback->drop, ctx
 #if Z_FEATURE_ATTACHMENT == 1
                    ,
                    z_attachment_null()

diff --git a/tests/z_client_test.c b/tests/z_client_test.c
@@ -122,7 +122,7 @@ int main(int argc, char **argv) {
 
     z_owned_session_t s1 = z_open(z_move(config));
     assert(z_check(s1));
-    z_string_t zid1 = format_id(&z_loan(s1)._val.ptr->_local_zid);
+    z_string_t zid1 = format_id(&z_loan(s1)._val.in->val._local_zid);
     printf("Session 1 with PID: %s\n", zid1.val);
     _z_string_clear(&zid1);
 
@@ -137,7 +137,7 @@ int main(int argc, char **argv) {
 
     z_owned_session_t s2 = z_open(z_move(config));
     assert(z_check(s2));
-    z_string_t zid2 = format_id(&z_loan(s2)._val.ptr->_local_zid);
+    z_string_t zid2 = format_id(&z_loan(s2)._val.in->val._local_zid);
     printf("Session 2 with PID: %s\n", zid2.val);
     _z_string_clear(&zid2);
 

diff --git a/tests/z_peer_multicast_test.c b/tests/z_peer_multicast_test.c
@@ -74,7 +74,7 @@ int main(int argc, char **argv) {
     z_owned_session_t s1 = z_open(z_move(config));
     assert(z_check(s1));
     _z_bytes_t id_as_bytes =
-        _z_bytes_wrap(z_loan(s1)._val.ptr->_local_zid.id, _z_id_len(z_loan(s1)._val.ptr->_local_zid));
+        _z_bytes_wrap(z_loan(s1)._val.ptr->_local_zid.id, _z_id_len(z_loan(s1)._val.in->val._local_zid));
     z_string_t zid1 = _z_string_from_bytes(&id_as_bytes);
     printf("Session 1 with PID: %s\n", zid1.val);
     _z_string_clear(&zid1);
@@ -91,7 +91,7 @@ int main(int argc, char **argv) {
 
     z_owned_session_t s2 = z_open(z_move(config));
     assert(z_check(s2));
-    id_as_bytes = _z_bytes_wrap(z_loan(s2)._val.ptr->_local_zid.id, _z_id_len(z_loan(s2)._val.ptr->_local_zid));
+    id_as_bytes = _z_bytes_wrap(z_loan(s2)._val.ptr->_local_zid.id, _z_id_len(z_loan(s2)._val.in->val._local_zid));
     z_string_t zid2 = _z_string_from_bytes(&id_as_bytes);
     printf("Session 2 with PID: %s\n", zid2.val);
     _z_string_clear(&zid2);