From 0ff5b98c3e21457f01d24bab9094863982f2ef60 Mon Sep 17 00:00:00 2001 From: dhood Date: Wed, 15 Nov 2017 12:10:09 -0800 Subject: [PATCH] Remove error message when client take returns false (#182) * Remove error msg from valid case * Document RCL_RET_{CLIENT/SERVICE}_TAKE_FAILED --- rcl/include/rcl/client.h | 2 ++ rcl/include/rcl/service.h | 2 ++ rcl/src/rcl/client.c | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rcl/include/rcl/client.h b/rcl/include/rcl/client.h index 77b8e32..16a8059 100644 --- a/rcl/include/rcl/client.h +++ b/rcl/include/rcl/client.h @@ -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_INVALID_ARGUMENT` if any arguments are 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. */ RCL_PUBLIC diff --git a/rcl/include/rcl/service.h b/rcl/include/rcl/service.h index 5133779..fd9383a 100644 --- a/rcl/include/rcl/service.h +++ b/rcl/include/rcl/service.h @@ -234,6 +234,8 @@ rcl_service_get_default_options(void); * \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_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. */ RCL_PUBLIC diff --git a/rcl/src/rcl/client.c b/rcl/src/rcl/client.c index f26043f..27153b6 100644 --- a/rcl/src/rcl/client.c +++ b/rcl/src/rcl/client.c @@ -271,7 +271,6 @@ rcl_take_response( return RCL_RET_ERROR; } if (!taken) { - RCL_SET_ERROR_MSG(rmw_get_error_string_safe(), client->impl->options.allocator); return RCL_RET_CLIENT_TAKE_FAILED; } return RCL_RET_OK;