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 RCL_RET_* codes only. #686

Merged
merged 1 commit into from
Jun 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rcl/include/rcl/init.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ extern "C"
* \return `RCL_RET_OK` if initialization is successful, or
* \return `RCL_RET_ALREADY_INIT` if rcl_init has already been called, or
* \return `RCL_RET_INVALID_ARGUMENT` if any arguments are invalid, or
* \return `RCL_RET_INVALID_ROS_ARGS` if an invalid ROS argument is found, or
* \return `RCL_RET_BAD_ALLOC` if allocating memory failed, or
* \return `RCL_RET_ERROR` if an unspecified error occurs.
*/
Expand Down
6 changes: 3 additions & 3 deletions rcl/src/rcl/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,13 @@ rcl_init(
"Enclave name is not valid: '%s'. Invalid index: %zu",
rcl_enclave_name_validation_result_string(validation_result),
invalid_index);
fail_ret = RMW_RET_ERROR;
fail_ret = RCL_RET_ERROR;
goto fail;
}

if (!context->impl->init_options.impl->rmw_init_options.enclave) {
RCL_SET_ERROR_MSG("failed to set context name");
fail_ret = RMW_RET_BAD_ALLOC;
fail_ret = RCL_RET_BAD_ALLOC;
goto fail;
}

Expand All @@ -204,7 +204,7 @@ rcl_init(
context->impl->init_options.impl->rmw_init_options.enclave,
&context->impl->allocator,
security_options);
if (RMW_RET_OK != ret) {
if (RCL_RET_OK != ret) {
brawner marked this conversation as resolved.
Show resolved Hide resolved
fail_ret = ret;
goto fail;
}
Expand Down
2 changes: 1 addition & 1 deletion rcl/src/rcl/publisher.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ rcl_publish_serialized_message(
if (ret == RMW_RET_BAD_ALLOC) {
return RCL_RET_BAD_ALLOC;
}
return RMW_RET_ERROR;
return RCL_RET_ERROR;
}
return RCL_RET_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion rcl/src/rcl/security.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ rcl_get_security_options_from_environment(

if (!use_security) {
security_options->enforce_security = RMW_SECURITY_ENFORCEMENT_PERMISSIVE;
return RMW_RET_OK;
return RCL_RET_OK;
}

ret = rcl_get_enforcement_policy(&security_options->enforce_security);
Expand Down