Update CMakeLists.txt (#128) (#130)

* Update CMakeLists.txt * Fix typo (cherry picked from commit f26ce4e) Co-authored-by: Pablo Garrido <[email protected]>
ros2 · Jul 17, 2021 · 701a32d · 701a32d
1 parent 31c7aa8
commit 701a32d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/rclc_parameter/CMakeLists.txt b/rclc_parameter/CMakeLists.txt
@@ -4,8 +4,8 @@ project(rclc_parameter)
 #################################################
 # package options
 #################################################
-set(RCLC_PARAMETER_MAX_STRING_LENGHT 50 CACHE STRING "Set the maximum length for strings.")
-add_compile_definitions(RCLC_PARAMETER_MAX_STRING_LENGHT=${RCLC_PARAMETER_MAX_STRING_LENGHT})
+set(RCLC_PARAMETER_MAX_STRING_LENGTH 50 CACHE STRING "Set the maximum length for strings.")
+add_definitions(-DRCLC_PARAMETER_MAX_STRING_LENGTH=${RCLC_PARAMETER_MAX_STRING_LENGTH})
 
 #################################################
 # compiler settings

diff --git a/rclc_parameter/src/rclc_parameter/parameter_server.c b/rclc_parameter/src/rclc_parameter/parameter_server.c
@@ -303,9 +303,9 @@ rclc_parameter_server_init_with_option(
       &rmw_qos_profile_parameter_events);
   }
 
-  static char empty_string[RCLC_PARAMETER_MAX_STRING_LENGHT];
-  memset(empty_string, ' ', RCLC_PARAMETER_MAX_STRING_LENGHT);
-  empty_string[RCLC_PARAMETER_MAX_STRING_LENGHT - 1] = '\0';
+  static char empty_string[RCLC_PARAMETER_MAX_STRING_LENGTH];
+  memset(empty_string, ' ', RCLC_PARAMETER_MAX_STRING_LENGTH);
+  empty_string[RCLC_PARAMETER_MAX_STRING_LENGTH - 1] = '\0';
 
   rcl_interfaces__msg__Parameter__Sequence__init(
     &parameter_server->parameter_list,
@@ -755,8 +755,8 @@ rclc_parameter_server_init_service(
 {
   const char * node_name = rcl_node_get_name(node);
 
-  static char get_service_name[RCLC_PARAMETER_MAX_STRING_LENGHT];
-  memset(get_service_name, 0, RCLC_PARAMETER_MAX_STRING_LENGHT);
+  static char get_service_name[RCLC_PARAMETER_MAX_STRING_LENGTH];
+  memset(get_service_name, 0, RCLC_PARAMETER_MAX_STRING_LENGTH);
   memcpy(get_service_name, node_name, strlen(node_name) + 1);
   memcpy((get_service_name + strlen(node_name)), service_name, strlen(service_name) + 1);
   return rclc_service_init(service, node, srv_type, get_service_name, &rmw_qos_profile_parameters);

diff --git a/rclc_parameter/test/rclc_parameter/test_parameter.cpp b/rclc_parameter/test/rclc_parameter/test_parameter.cpp
@@ -110,9 +110,9 @@ TEST(Test, rclc_node_init_default) {
   EXPECT_EQ(RCL_RET_ERROR, rc);
 
   // Fail on name length
-  char overflow_name[RCLC_PARAMETER_MAX_STRING_LENGHT + 1];
-  memset(overflow_name, ' ', RCLC_PARAMETER_MAX_STRING_LENGHT + 1);
-  overflow_name[RCLC_PARAMETER_MAX_STRING_LENGHT] = '\0';
+  char overflow_name[RCLC_PARAMETER_MAX_STRING_LENGTH + 1];
+  memset(overflow_name, ' ', RCLC_PARAMETER_MAX_STRING_LENGTH + 1);
+  overflow_name[RCLC_PARAMETER_MAX_STRING_LENGTH] = '\0';
 
   rc = rclc_add_parameter(&param_server, overflow_name, RCLC_PARAMETER_BOOL);
   EXPECT_EQ(RCL_RET_ERROR, rc);