diff --git a/rcl/src/rcl/security_directory.c b/rcl/src/rcl/security_directory.c index ab353f8626..6e7d9f54ee 100644 --- a/rcl/src/rcl/security_directory.c +++ b/rcl/src/rcl/security_directory.c @@ -261,4 +261,4 @@ char * rcl_get_secure_root( } allocator->deallocate(ros_secure_root_env, allocator->state); return node_secure_root; -} \ No newline at end of file +} diff --git a/rcl/test/rcl/test_security_directory.cpp b/rcl/test/rcl/test_security_directory.cpp index 806f82f829..7f5b08daab 100644 --- a/rcl/test/rcl/test_security_directory.cpp +++ b/rcl/test/rcl/test_security_directory.cpp @@ -84,11 +84,11 @@ class TestGetSecureRoot : public ::testing::Test void set_base_lookup_dir_fqn(const char * resource_dir, const char * resource_dir_name) { base_lookup_dir_fqn = rcutils_join_path(resource_dir, - resource_dir_name, allocator); + resource_dir_name, allocator); std::string putenv_input = ROS_SECURITY_ROOT_DIRECTORY_VAR_NAME "="; putenv_input += base_lookup_dir_fqn; memcpy(g_envstring, putenv_input.c_str(), - std::min(putenv_input.length(), sizeof(g_envstring) - 1)); + std::min(putenv_input.length(), sizeof(g_envstring) - 1)); putenv_wrapper(g_envstring); } @@ -142,11 +142,11 @@ TEST_F(TestGetSecureRoot, successScenarios_local_prefixMatch) { * Namespace: /test_security_directory * Node: dummy_node_and_some_suffix_added */ root_path = rcl_get_secure_root(TEST_NODE_NAME "_and_some_suffix_added", - TEST_NODE_NAMESPACE, &allocator); + TEST_NODE_NAMESPACE, &allocator); ASSERT_STRNE(root_path, secure_root); putenv_wrapper(ROS_SECURITY_LOOKUP_TYPE_VAR_NAME "=MATCH_PREFIX"); root_path = rcl_get_secure_root(TEST_NODE_NAME "_and_some_suffix_added", - TEST_NODE_NAMESPACE, &allocator); + TEST_NODE_NAMESPACE, &allocator); ASSERT_STREQ(root_path, secure_root); } @@ -183,7 +183,7 @@ TEST_F(TestGetSecureRoot, successScenarios_root_prefixMatch) { * Namespace: / * Node: dummy_node_and_some_suffix_added */ root_path = rcl_get_secure_root(TEST_NODE_NAME "_and_some_suffix_added", - ROOT_NAMESPACE, &allocator); + ROOT_NAMESPACE, &allocator); ASSERT_STREQ(root_path, secure_root); } @@ -191,7 +191,7 @@ TEST_F(TestGetSecureRoot, nodeSecurityDirectoryOverride_validDirectory) { /* Specify a valid directory */ putenv_wrapper(ROS_SECURITY_NODE_DIRECTORY_VAR_NAME "=" TEST_RESOURCES_DIRECTORY); root_path = rcl_get_secure_root("name shouldn't matter", - "namespace shouldn't matter", &allocator); + "namespace shouldn't matter", &allocator); ASSERT_STREQ(root_path, TEST_RESOURCES_DIRECTORY); } @@ -200,7 +200,7 @@ TEST_F(TestGetSecureRoot, /* Setting root dir has no effect */ putenv_wrapper(ROS_SECURITY_NODE_DIRECTORY_VAR_NAME "=" TEST_RESOURCES_DIRECTORY); root_path = rcl_get_secure_root("name shouldn't matter", - "namespace shouldn't matter", &allocator); + "namespace shouldn't matter", &allocator); putenv_wrapper(ROS_SECURITY_ROOT_DIRECTORY_VAR_NAME "=" TEST_RESOURCES_DIRECTORY); ASSERT_STREQ(root_path, TEST_RESOURCES_DIRECTORY); }