commnted out check for received sequence id - error in build-job for …

…rolling https://build.ros2.org/job/Rpr__rclc__ubuntu_focal_amd64/72/ see also PR ros2#46 and issue ros2#49 Signed-off-by: Jan Staschulat <[email protected]>
micro-ROS · Aug 10, 2021 · be385fe · be385fe
1 parent 5de86bd
commit be385fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/rclc_lifecycle/CMakeLists.txt b/rclc_lifecycle/CMakeLists.txt
@@ -6,10 +6,6 @@ if(NOT CMAKE_C_STANDARD)
   set(CMAKE_C_STANDARD 99)
 endif()
 
-# maximum number of states - should cover all default lifecycle states
-set(RCLC_LIFECYCLE_MAX_STATES 10 CACHE STRING "Set the maximum number of states.")
-add_definitions(-DRCLC_LIFECYCLE_MAX_STATES=${RCLC_LIFECYCLE_MAX_STATES})
-
 # maximum string length - should cover all lifecycle state and transition names
 set(RCLC_LIFECYCLE_MAX_STRING_LENGTH 20 CACHE STRING "Set the maximum length for strings.")
 add_definitions(-DRCLC_LIFECYCLE_MAX_STRING_LENGTH=${RCLC_LIFECYCLE_MAX_STRING_LENGTH})

diff --git a/rclc_lifecycle/src/rclc_lifecycle/rclc_lifecycle.c b/rclc_lifecycle/src/rclc_lifecycle/rclc_lifecycle.c
@@ -89,9 +89,9 @@ rclc_make_node_a_lifecycle_node(
   lifecycle_msgs__srv__GetAvailableStates_Response__init(&lifecycle_node->gas_res);
   lifecycle_msgs__msg__State__Sequence__init(
     &lifecycle_node->gas_res.available_states,
-    RCLC_LIFECYCLE_MAX_STATES);
+    state_machine->transition_map.states_size);
   lifecycle_node->gas_res.available_states.size = 0;
-  for (size_t i = 0; i < RCLC_LIFECYCLE_MAX_STATES; ++i) {
+  for (size_t i = 0; i < state_machine->transition_map.states_size; ++i) {
     rosidl_runtime_c__String__assign(
       &lifecycle_node->gas_res.available_states.data[i].label,
       (const char *) empty_string);
@@ -392,12 +392,8 @@ rclc_lifecycle_get_available_states_callback(
   rcl_lifecycle_state_machine_t * sm =
     context_in->lifecycle_node->state_machine;
 
-  lifecycle_msgs__srv__GetAvailableStates_Response__init(res_in);
-  lifecycle_msgs__msg__State__Sequence__init(
-    &res_in->available_states,
-    sm->transition_map.states_size);
-
   bool success = true;
+  res_in->available_states.size = sm->transition_map.states_size;
   for (unsigned int i = 0; i < sm->transition_map.states_size; ++i) {
     res_in->available_states.data[i].id = sm->transition_map.states[i].id;
     success &= rosidl_runtime_c__String__assign(