Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use rmw_security_common #529

Open
wants to merge 3 commits into
base: rolling
Choose a base branch
from

Conversation

ahcorde
Copy link
Contributor

@ahcorde ahcorde commented Jan 30, 2025

Depends on ros2/rmw#388

Move some functionality from rmw_dds_common to a new package called rmw_security_common

Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
@ahcorde ahcorde self-assigned this Jan 30, 2025
Comment on lines +1277 to +1289
auto scope_exit_ws = rcpputils::make_scope_exit(
[&security_files]()
{
rcutils_ret_t ret = rcutils_string_map_fini(&security_files);
if (ret != RMW_RET_OK) {
RMW_SET_ERROR_MSG("Failed to fini string map for security");
}
});

if (ret != RMW_RET_OK) {
RMW_SET_ERROR_MSG("Failed to initialize string map for security");
return RMW_RET_ERROR;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
auto scope_exit_ws = rcpputils::make_scope_exit(
[&security_files]()
{
rcutils_ret_t ret = rcutils_string_map_fini(&security_files);
if (ret != RMW_RET_OK) {
RMW_SET_ERROR_MSG("Failed to fini string map for security");
}
});
if (ret != RMW_RET_OK) {
RMW_SET_ERROR_MSG("Failed to initialize string map for security");
return RMW_RET_ERROR;
}
if (ret != RMW_RET_OK) {
RMW_SET_ERROR_MSG("Failed to initialize string map for security");
return RMW_RET_ERROR;
}
auto scope_exit_ws = rcpputils::make_scope_exit(
[&security_files]()
{
rcutils_ret_t ret = rcutils_string_map_fini(&security_files);
if (ret != RMW_RET_OK) {
RMW_SET_ERROR_MSG("Failed to fini string map for security");
}
});

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants