niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use RCL_RET_* codes only. (#686) (#693)

Browse source 
Also, update documentation.

Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
This commit is contained in:
Michel Hidalgo 2020-06-24 17:21:54 -03:00 • committed by GitHub
parent 0e12a0a19b
commit fed3515c7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rcl/include/rcl/init.h
View file

@ -69,6 +69,7 @@ extern "C"
* \return `RCL_RET_OK` if initialization is successful, or * \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_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_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_BAD_ALLOC` if allocating memory failed, or
* \return `RCL_RET_ERROR` if an unspecified error occurs. * \return `RCL_RET_ERROR` if an unspecified error occurs.
*/ */

6
rcl/src/rcl/init.c
View file

@ -188,13 +188,13 @@ rcl_init(
"Enclave name is not valid: '%s'. Invalid index: %zu", "Enclave name is not valid: '%s'. Invalid index: %zu",
rcl_enclave_name_validation_result_string(validation_result), rcl_enclave_name_validation_result_string(validation_result),
invalid_index); invalid_index);
fail_ret = RMW_RET_ERROR; fail_ret = RCL_RET_ERROR;
goto fail; goto fail;
} }
if (!context->impl->init_options.impl->rmw_init_options.enclave) { if (!context->impl->init_options.impl->rmw_init_options.enclave) {
RCL_SET_ERROR_MSG("failed to set context name"); RCL_SET_ERROR_MSG("failed to set context name");
fail_ret = RMW_RET_BAD_ALLOC; fail_ret = RCL_RET_BAD_ALLOC;
goto fail; goto fail;
} }
@ -204,7 +204,7 @@ rcl_init(
context->impl->init_options.impl->rmw_init_options.enclave, context->impl->init_options.impl->rmw_init_options.enclave,
&context->impl->allocator, &context->impl->allocator,
security_options); security_options);
if (RMW_RET_OK != ret) { if (RCL_RET_OK != ret) {
fail_ret = ret; fail_ret = ret;
goto fail; goto fail;
} }

2
rcl/src/rcl/publisher.c
View file

@ -311,7 +311,7 @@ rcl_publish_serialized_message(
if (ret == RMW_RET_BAD_ALLOC) { if (ret == RMW_RET_BAD_ALLOC) {
return RCL_RET_BAD_ALLOC; return RCL_RET_BAD_ALLOC;
} }
return RMW_RET_ERROR; return RCL_RET_ERROR;
} }
return RCL_RET_OK; return RCL_RET_OK;
} }

2
rcl/src/rcl/security.c
View file

@ -42,7 +42,7 @@ rcl_get_security_options_from_environment(
if (!use_security) { if (!use_security) {
security_options->enforce_security = RMW_SECURITY_ENFORCEMENT_PERMISSIVE; 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); ret = rcl_get_enforcement_policy(&security_options->enforce_security);