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

Remove error message when client take returns false (#182)

Browse source 
* Remove error msg from valid case

* Document RCL_RET_{CLIENT/SERVICE}_TAKE_FAILED
This commit is contained in:
dhood 2017-11-15 12:10:09 -08:00 • committed by GitHub
parent 40d899adfd
commit 0ff5b98c3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rcl/include/rcl/client.h
View file

@ -275,6 +275,8 @@ rcl_send_request(const rcl_client_t * client, const void * ros_request, int64_t
* \return `RCL_RET_OK` if the response was taken successfully, or * \return `RCL_RET_OK` if the response was taken successfully, 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_CLIENT_INVALID` if the client is invalid, or * \return `RCL_RET_CLIENT_INVALID` if the client is invalid, or
* \return `RCL_RET_CLIENT_TAKE_FAILED` if take failed but no error occurred
* in the middleware, or
* \return `RCL_RET_ERROR` if an unspecified error occurs. * \return `RCL_RET_ERROR` if an unspecified error occurs.
*/ */
RCL_PUBLIC RCL_PUBLIC

2
rcl/include/rcl/service.h
View file

@ -234,6 +234,8 @@ rcl_service_get_default_options(void);
* \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_SERVICE_INVALID` if the service is invalid, or * \return `RCL_RET_SERVICE_INVALID` if the service is invalid, or
* \return `RCL_RET_BAD_ALLOC` if allocating memory failed, or * \return `RCL_RET_BAD_ALLOC` if allocating memory failed, or
* \return `RCL_RET_SERVICE_TAKE_FAILED` if take failed but no error occurred
* in the middleware, or
* \return `RCL_RET_ERROR` if an unspecified error occurs. * \return `RCL_RET_ERROR` if an unspecified error occurs.
*/ */
RCL_PUBLIC RCL_PUBLIC

1
rcl/src/rcl/client.c
View file

@ -271,7 +271,6 @@ rcl_take_response(
return RCL_RET_ERROR; return RCL_RET_ERROR;
} }
if (!taken) { if (!taken) {
RCL_SET_ERROR_MSG(rmw_get_error_string_safe(), client->impl->options.allocator);
return RCL_RET_CLIENT_TAKE_FAILED; return RCL_RET_CLIENT_TAKE_FAILED;
} }
return RCL_RET_OK; return RCL_RET_OK;