Skip to content

Commit

Permalink
- Changed default return type for rmw_get_publishers_info_by_topic and
Browse files Browse the repository at this point in the history
rmw_get_subscriptions_info_by_topic to RMW_RET_UNSUPPORTED.
- Added a rmw_reset_error_msg() after GET_SYMBOL() to above two
functions to prevent a display of "Error message being replaced. Called
rcultils_reset_error() after error handling".

Signed-off-by: Jaison Titus <[email protected]>
  • Loading branch information
jaisontj committed Nov 15, 2019
1 parent feb6744 commit 6dd0abf
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions rmw_implementation/src/functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ RMW_INTERFACE_FN(rmw_set_log_severity,
1, ARG_TYPES(rmw_log_severity_t))

RMW_INTERFACE_FN(rmw_get_publishers_info_by_topic,
rmw_ret_t, RMW_RET_ERROR,
rmw_ret_t, RMW_RET_UNSUPPORTED,
5, ARG_TYPES(
const rmw_node_t *,
rcutils_allocator_t *,
Expand All @@ -544,7 +544,7 @@ RMW_INTERFACE_FN(rmw_get_publishers_info_by_topic,
rmw_topic_info_array_t *))

RMW_INTERFACE_FN(rmw_get_subscriptions_info_by_topic,
rmw_ret_t, RMW_RET_ERROR,
rmw_ret_t, RMW_RET_UNSUPPORTED,
5, ARG_TYPES(
const rmw_node_t *,
rcutils_allocator_t *,
Expand Down Expand Up @@ -626,7 +626,9 @@ void prefetch_symbols(void)
GET_SYMBOL(rmw_service_server_is_available)
GET_SYMBOL(rmw_set_log_severity)
GET_SYMBOL(rmw_get_publishers_info_by_topic)
rmw_reset_error();
GET_SYMBOL(rmw_get_subscriptions_info_by_topic)
rmw_reset_error();
}

void * symbol_rmw_init = nullptr;
Expand Down

0 comments on commit 6dd0abf

Please sign in to comment.