move this fixes

eclipse-zenoh · Jan 15, 2024 · 78885f5 · 78885f5
1 parent b7132f5
commit 78885f5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/include/zenoh-pico/api/types.h b/include/zenoh-pico/api/types.h
@@ -559,7 +559,7 @@ struct _z_bytes_pair_t {
     _z_bytes_t value;
 };
 
-void _z_bytes_pair_clear(struct _z_bytes_pair_t *this);
+void _z_bytes_pair_clear(struct _z_bytes_pair_t *this_);
 
 _Z_ELEM_DEFINE(_z_bytes_pair, struct _z_bytes_pair_t, _z_noop_size, _z_bytes_pair_clear, _z_noop_copy)
 _Z_LIST_DEFINE(_z_bytes_pair, struct _z_bytes_pair_t)

diff --git a/src/api/api.c b/src/api/api.c
@@ -1093,9 +1093,9 @@ int8_t zp_send_join(z_session_t zs, const zp_send_join_options_t *options) {
     return _zp_send_join(zs._val);
 }
 
-void _z_bytes_pair_clear(struct _z_bytes_pair_t *this) {
-    _z_bytes_clear(&this->key);
-    _z_bytes_clear(&this->value);
+void _z_bytes_pair_clear(struct _z_bytes_pair_t *this_) {
+    _z_bytes_clear(&this_->key);
+    _z_bytes_clear(&this_->value);
 }
 
 z_attachment_t z_bytes_map_as_attachment(const z_owned_bytes_map_t *this_) {

diff --git a/src/collections/list.c b/src/collections/list.c
@@ -83,23 +83,23 @@ _z_list_t *_z_list_drop_filter(_z_list_t *xs, z_element_free_f f_f, z_element_eq
 
     while (current != NULL) {
         if (c_f(left, current->_val) == true) {
-            _z_list_t *this = current;
+            _z_list_t *this_ = current;
 
             // head removal
-            if (this == l) {
+            if (this_ == l) {
                 l = l->_tail;
             }
             // tail removal
-            else if (this->_tail == NULL) {
+            else if (this_->_tail == NULL) {
                 previous->_tail = NULL;
             }
             // middle removal
             else {
-                previous->_tail = this->_tail;
+                previous->_tail = this_->_tail;
             }
 
-            f_f(&this->_val);
-            z_free(this);
+            f_f(&this_->_val);
+            z_free(this_);
             break;
         } else {
             previous = current;

diff --git a/src/session/resource.c b/src/session/resource.c
@@ -25,7 +25,7 @@
 #include "zenoh-pico/system/platform.h"
 #include "zenoh-pico/utils/logging.h"
 
-_Bool _z_resource_eq(const _z_resource_t *other, const _z_resource_t *this) { return this->_id == other->_id; }
+_Bool _z_resource_eq(const _z_resource_t *other, const _z_resource_t *this_) { return this_->_id == other->_id; }
 
 void _z_resource_clear(_z_resource_t *res) { _z_keyexpr_clear(&res->_key); }
 

diff --git a/src/session/subscription.c b/src/session/subscription.c
@@ -25,8 +25,8 @@
 #include "zenoh-pico/utils/logging.h"
 
 #if Z_FEATURE_SUBSCRIPTION == 1
-_Bool _z_subscription_eq(const _z_subscription_t *other, const _z_subscription_t *this) {
-    return this->_id == other->_id;
+_Bool _z_subscription_eq(const _z_subscription_t *other, const _z_subscription_t *this_) {
+    return this_->_id == other->_id;
 }
 
 void _z_subscription_clear(_z_subscription_t *sub) {