From ed7e852c6fc101cf508501ee72a4db88e791db32 Mon Sep 17 00:00:00 2001 From: ivanpauno Date: Thu, 29 Aug 2019 17:38:17 -0300 Subject: [PATCH 1/2] Add specific return type for non existent node Signed-off-by: ivanpauno --- rmw/include/rmw/get_node_info_and_types.h | 4 ++++ rmw/include/rmw/ret_types.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/rmw/include/rmw/get_node_info_and_types.h b/rmw/include/rmw/get_node_info_and_types.h index 6ea5301b..368afd49 100644 --- a/rmw/include/rmw/get_node_info_and_types.h +++ b/rmw/include/rmw/get_node_info_and_types.h @@ -47,6 +47,7 @@ extern "C" * \return `RMW_RET_OK` if the query was successful, or * \return `RMW_RET_INVALID_ARGUMENT` if the node is invalid, or * \return `RMW_RET_INVALID_ARGUMENT` if any arguments are invalid, or + * \return `RMW_RET_NON_EXISTENT_NODE_NAME` if the node name wasn't found, or * \return `RMW_RET_BAD_ALLOC` if memory allocation fails, or * \return `RMW_RET_ERROR` if an unspecified error occurs. */ @@ -83,6 +84,7 @@ rmw_get_subscriber_names_and_types_by_node( * \return `RMW_RET_OK` if the query was successful, or * \return `RMW_RET_INVALID_ARGUMENT` if the node is invalid, or * \return `RMW_RET_INVALID_ARGUMENT` if any arguments are invalid, or + * \return `RMW_RET_NON_EXISTENT_NODE_NAME` if the node name wasn't found, or * \return `RMW_RET_BAD_ALLOC` if memory allocation fails, or * \return `RMW_RET_ERROR` if an unspecified error occurs. */ @@ -118,6 +120,7 @@ rmw_get_publisher_names_and_types_by_node( * \return `RMW_RET_OK` if the query was successful, or * \return `RMW_RET_INVALID_ARGUMENT` if the node is invalid, or * \return `RMW_RET_INVALID_ARGUMENT` if any arguments are invalid, or + * \return `RMW_RET_NON_EXISTENT_NODE_NAME` if the node name wasn't found, or * \return `RMW_RET_BAD_ALLOC` if memory allocation fails, or * \return `RMW_RET_ERROR` if an unspecified error occurs. */ @@ -153,6 +156,7 @@ rmw_get_service_names_and_types_by_node( * \return `RMW_RET_OK` if the query was successful, or * \return `RMW_RET_INVALID_ARGUMENT` if the node is invalid, or * \return `RMW_RET_INVALID_ARGUMENT` if any arguments are invalid, or + * \return `RMW_RET_NON_EXISTENT_NODE_NAME` if the node name wasn't found, or * \return `RMW_RET_BAD_ALLOC` if memory allocation fails, or * \return `RMW_RET_ERROR` if an unspecified error occurs. */ diff --git a/rmw/include/rmw/ret_types.h b/rmw/include/rmw/ret_types.h index 5b23a216..d3e77bf4 100644 --- a/rmw/include/rmw/ret_types.h +++ b/rmw/include/rmw/ret_types.h @@ -36,6 +36,10 @@ typedef int32_t rmw_ret_t; /// Incorrect rmw implementation. #define RMW_RET_INCORRECT_RMW_IMPLEMENTATION 12 +// rmw node specific ret codes in 2XX +/// Failed to find node name +#define RMW_RET_NON_EXISTENT_NODE_NAME 203 + #ifdef __cplusplus } #endif From 43692bb2a11b00ee374332de6adfc95ac469be1e Mon Sep 17 00:00:00 2001 From: ivanpauno Date: Fri, 30 Aug 2019 12:00:22 -0300 Subject: [PATCH 2/2] Address review comments Signed-off-by: ivanpauno --- rmw/include/rmw/get_node_info_and_types.h | 8 ++++---- rmw/include/rmw/ret_types.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rmw/include/rmw/get_node_info_and_types.h b/rmw/include/rmw/get_node_info_and_types.h index 368afd49..680596e4 100644 --- a/rmw/include/rmw/get_node_info_and_types.h +++ b/rmw/include/rmw/get_node_info_and_types.h @@ -47,7 +47,7 @@ extern "C" * \return `RMW_RET_OK` if the query was successful, or * \return `RMW_RET_INVALID_ARGUMENT` if the node is invalid, or * \return `RMW_RET_INVALID_ARGUMENT` if any arguments are invalid, or - * \return `RMW_RET_NON_EXISTENT_NODE_NAME` if the node name wasn't found, or + * \return `RMW_RET_NODE_NAME_NON_EXISTENT` if the node name wasn't found, or * \return `RMW_RET_BAD_ALLOC` if memory allocation fails, or * \return `RMW_RET_ERROR` if an unspecified error occurs. */ @@ -84,7 +84,7 @@ rmw_get_subscriber_names_and_types_by_node( * \return `RMW_RET_OK` if the query was successful, or * \return `RMW_RET_INVALID_ARGUMENT` if the node is invalid, or * \return `RMW_RET_INVALID_ARGUMENT` if any arguments are invalid, or - * \return `RMW_RET_NON_EXISTENT_NODE_NAME` if the node name wasn't found, or + * \return `RMW_RET_NODE_NAME_NON_EXISTENT` if the node name wasn't found, or * \return `RMW_RET_BAD_ALLOC` if memory allocation fails, or * \return `RMW_RET_ERROR` if an unspecified error occurs. */ @@ -120,7 +120,7 @@ rmw_get_publisher_names_and_types_by_node( * \return `RMW_RET_OK` if the query was successful, or * \return `RMW_RET_INVALID_ARGUMENT` if the node is invalid, or * \return `RMW_RET_INVALID_ARGUMENT` if any arguments are invalid, or - * \return `RMW_RET_NON_EXISTENT_NODE_NAME` if the node name wasn't found, or + * \return `RMW_RET_NODE_NAME_NON_EXISTENT` if the node name wasn't found, or * \return `RMW_RET_BAD_ALLOC` if memory allocation fails, or * \return `RMW_RET_ERROR` if an unspecified error occurs. */ @@ -156,7 +156,7 @@ rmw_get_service_names_and_types_by_node( * \return `RMW_RET_OK` if the query was successful, or * \return `RMW_RET_INVALID_ARGUMENT` if the node is invalid, or * \return `RMW_RET_INVALID_ARGUMENT` if any arguments are invalid, or - * \return `RMW_RET_NON_EXISTENT_NODE_NAME` if the node name wasn't found, or + * \return `RMW_RET_NODE_NAME_NON_EXISTENT` if the node name wasn't found, or * \return `RMW_RET_BAD_ALLOC` if memory allocation fails, or * \return `RMW_RET_ERROR` if an unspecified error occurs. */ diff --git a/rmw/include/rmw/ret_types.h b/rmw/include/rmw/ret_types.h index d3e77bf4..1a983864 100644 --- a/rmw/include/rmw/ret_types.h +++ b/rmw/include/rmw/ret_types.h @@ -38,7 +38,8 @@ typedef int32_t rmw_ret_t; // rmw node specific ret codes in 2XX /// Failed to find node name -#define RMW_RET_NON_EXISTENT_NODE_NAME 203 +// Using same return code than in rcl +#define RMW_RET_NODE_NAME_NON_EXISTENT 203 #ifdef __cplusplus }