Fix init options memory node size (#191) (#193)

* Fix options memory node size

* Fix variable names

(cherry picked from commit e40f4d6)

Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>

Author: mergify[bot]

rmw_microxrcedds_c/src/config.h.in

@@ -50,7 +50,7 @@
 #define RMW_UXRCE_MAX_OUTPUT_BUFFER_SIZE (RMW_UXRCE_MAX_TRANSPORT_MTU * RMW_UXRCE_STREAM_HISTORY_OUTPUT)
 
 #define RMW_UXRCE_MAX_SESSIONS @RMW_UXRCE_MAX_SESSIONS@
-#define RMW_UXRCE_MAX_OPTIONS RMW_UXRCE_MAX_SESSIONS + 1
+#define RMW_UXRCE_MAX_OPTIONS RMW_UXRCE_MAX_SESSIONS*3
 #define RMW_UXRCE_MAX_NODES @RMW_UXRCE_MAX_NODES@
 #define RMW_UXRCE_MAX_PUBLISHERS @RMW_UXRCE_MAX_PUBLISHERS@
 #define RMW_UXRCE_MAX_SUBSCRIPTIONS @RMW_UXRCE_MAX_SUBSCRIPTIONS@

rmw_microxrcedds_c/src/rmw_guard_condition.c

@@ -28,14 +28,14 @@ rmw_create_guard_condition(
     RMW_SET_ERROR_MSG("Not available memory node");
     return NULL;
   }
-  rmw_uxrce_guard_condition_t * custom_guard_condition =
+  rmw_uxrce_guard_condition_t * aux_guard_condition =
     (rmw_uxrce_guard_condition_t *)memory_node->data;
-  custom_guard_condition->hasTriggered = false;
-  custom_guard_condition->rmw_guard_condition.context = context;
-  custom_guard_condition->rmw_guard_condition.implementation_identifier =
+  aux_guard_condition->hasTriggered = false;
+  aux_guard_condition->rmw_guard_condition.context = context;
+  aux_guard_condition->rmw_guard_condition.implementation_identifier =
     rmw_get_implementation_identifier();
 
-  return &custom_guard_condition->rmw_guard_condition;
+  return &aux_guard_condition->rmw_guard_condition;
 }
 
 rmw_ret_t
@@ -45,9 +45,9 @@ rmw_destroy_guard_condition(
   rmw_uxrce_mempool_item_t * item = guard_condition_memory.allocateditems;
 
   while (NULL != item) {
-    rmw_uxrce_guard_condition_t * custom_guard_condition =
+    rmw_uxrce_guard_condition_t * aux_guard_condition =
       (rmw_uxrce_guard_condition_t *)item->data;
-    if (&custom_guard_condition->rmw_guard_condition == guard_condition) {
+    if (&aux_guard_condition->rmw_guard_condition == guard_condition) {
       put_memory(&guard_condition_memory, item);
       return RMW_RET_OK;
     }

rmw_microxrcedds_c/src/rmw_init.c

@@ -165,9 +165,9 @@ rmw_init_options_fini(
   rmw_uxrce_mempool_item_t * item = init_options_memory.allocateditems;
 
   while (NULL != item) {
-    rmw_uxrce_init_options_impl_t * custom_init_options =
+    rmw_uxrce_init_options_impl_t * aux_init_options =
       (rmw_uxrce_init_options_impl_t *)item->data;
-    if (custom_init_options == init_options->impl) {
+    if (aux_init_options == init_options->impl) {
       put_memory(&init_options_memory, item);
       break;
     }

rmw_microxrcedds_c/src/rmw_wait_set.c

@@ -31,9 +31,9 @@ rmw_create_wait_set(
     RMW_SET_ERROR_MSG("Not available memory node");
     return NULL;
   }
-  rmw_uxrce_wait_set_t * custom_wait_set = (rmw_uxrce_wait_set_t *)memory_node->data;
+  rmw_uxrce_wait_set_t * aux_wait_set = (rmw_uxrce_wait_set_t *)memory_node->data;
 
-  return &custom_wait_set->rmw_wait_set;
+  return &aux_wait_set->rmw_wait_set;
 }
 
 rmw_ret_t
@@ -43,8 +43,8 @@ rmw_destroy_wait_set(
   rmw_uxrce_mempool_item_t * item = wait_set_memory.allocateditems;
 
   while (NULL != item) {
-    rmw_uxrce_wait_set_t * custom_wait_set = (rmw_uxrce_wait_set_t *)item->data;
-    if (&custom_wait_set->rmw_wait_set == wait_set) {
+    rmw_uxrce_wait_set_t * aux_wait_set = (rmw_uxrce_wait_set_t *)item->data;
+    if (&aux_wait_set->rmw_wait_set == wait_set) {
       put_memory(&wait_set_memory, item);
       return RMW_RET_OK;
     }