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

refactor the name of rmw handle getters

Browse source
This commit is contained in:
William Woodall 2015-12-16 15:46:00 -08:00
parent 64dc7ac220
commit c6a903ffaf
8 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -158,7 +158,7 @@ rcl_guard_condition_trigger(const rcl_guard_condition_t * guard_condition);
*/
RCL_PUBLIC
rmw_guard_condition_t *
rcl_guard_condition_get_rmw_guard_condition_handle(const rcl_guard_condition_t * guard_condition);
rcl_guard_condition_get_rmw_handle(const rcl_guard_condition_t * guard_condition);
#if __cplusplus
}

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

@ -208,7 +208,7 @@ rcl_node_get_domain_id(const rcl_node_t * node, size_t * domain_id);
*/
RCL_PUBLIC
rmw_node_t *
rcl_node_get_rmw_node_handle(const rcl_node_t * node);
rcl_node_get_rmw_handle(const rcl_node_t * node);
/// Return the associated rcl instance id.
/* This id is stored when rcl_node_init is called and can be compared with the

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

@ -263,7 +263,7 @@ rcl_publisher_get_options(const rcl_publisher_t * publisher);
*/
RCL_PUBLIC
rmw_publisher_t *
rcl_publisher_get_rmw_publisher_handle(const rcl_publisher_t * publisher);
rcl_publisher_get_rmw_handle(const rcl_publisher_t * publisher);
#if __cplusplus
}

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

@ -270,7 +270,7 @@ rcl_subscription_get_options(const rcl_subscription_t * subscription);
*/
RCL_PUBLIC
rmw_subscription_t *
rcl_subscription_get_rmw_subscription_handle(const rcl_subscription_t * subscription);
rcl_subscription_get_rmw_handle(const rcl_subscription_t * subscription);
#if __cplusplus
}

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

@ -137,7 +137,7 @@ rcl_trigger_guard_condition(const rcl_guard_condition_t * guard_condition)
}
rmw_guard_condition_t *
rcl_guard_condition_get_rmw_guard_condition_handle(const rcl_guard_condition_t * guard_condition)
rcl_guard_condition_get_rmw_handle(const rcl_guard_condition_t * guard_condition)
{
RCL_CHECK_ARGUMENT_FOR_NULL(guard_condition, NULL);
RCL_CHECK_FOR_NULL_WITH_MSG(

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

@ -158,7 +158,7 @@ rcl_node_get_options(const rcl_node_t * node)
}
rmw_node_t *
rcl_node_get_rmw_node_handle(const rcl_node_t * node)
rcl_node_get_rmw_handle(const rcl_node_t * node)
{
RCL_CHECK_ARGUMENT_FOR_NULL(node, NULL);
RCL_CHECK_FOR_NULL_WITH_MSG(node->impl, "node implementation is invalid", return NULL);

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

@ -69,7 +69,7 @@ rcl_publisher_init(
// rmw handle (create rmw publisher)
// TODO(wjwwood): pass along the allocator to rmw when it supports it
publisher->impl->rmw_handle = rmw_create_publisher(
rcl_node_get_rmw_node_handle(node),
rcl_node_get_rmw_handle(node),
type_support,
topic_name,
&rmw_qos_profile_default);
@ -95,7 +95,7 @@ rcl_publisher_fini(rcl_publisher_t * publisher, rcl_node_t * node)
RCL_CHECK_ARGUMENT_FOR_NULL(node, RCL_RET_INVALID_ARGUMENT);
if (publisher->impl) {
rmw_ret_t ret =
rmw_destroy_publisher(rcl_node_get_rmw_node_handle(node), publisher->impl->rmw_handle);
rmw_destroy_publisher(rcl_node_get_rmw_handle(node), publisher->impl->rmw_handle);
if (ret != RMW_RET_OK) {
RCL_SET_ERROR_MSG(rmw_get_error_string_safe());
result = RCL_RET_ERROR;
@ -151,7 +151,7 @@ rcl_publisher_get_options(const rcl_publisher_t * publisher)
}
rmw_publisher_t *
rcl_publisher_get_rmw_publisher_handle(const rcl_publisher_t * publisher)
rcl_publisher_get_rmw_handle(const rcl_publisher_t * publisher)
{
RCL_CHECK_ARGUMENT_FOR_NULL(publisher, NULL);
RCL_CHECK_FOR_NULL_WITH_MSG(

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

@ -67,7 +67,7 @@ rcl_subscription_init(
// rmw_handle
// TODO(wjwwood): pass allocator once supported in rmw api.
subscription->impl->rmw_handle = rmw_create_subscription(
rcl_node_get_rmw_node_handle(node),
rcl_node_get_rmw_handle(node),
type_support,
topic_name,
&rmw_qos_profile_default,
@ -94,7 +94,7 @@ rcl_subscription_fini(rcl_subscription_t * subscription, rcl_node_t * node)
RCL_CHECK_ARGUMENT_FOR_NULL(node, RCL_RET_INVALID_ARGUMENT);
if (subscription->impl) {
rmw_ret_t ret =
rmw_destroy_subscription(rcl_node_get_rmw_node_handle(node), subscription->impl->rmw_handle);
rmw_destroy_subscription(rcl_node_get_rmw_handle(node), subscription->impl->rmw_handle);
if (ret != RMW_RET_OK) {
RCL_SET_ERROR_MSG(rmw_get_error_string_safe());
result = RCL_RET_ERROR;
@ -167,7 +167,7 @@ rcl_subscription_get_options(const rcl_subscription_t * subscription)
}
rmw_subscription_t *
rcl_subscription_get_rmw_subscription_handle(const rcl_subscription_t * subscription)
rcl_subscription_get_rmw_handle(const rcl_subscription_t * subscription)
{
RCL_CHECK_ARGUMENT_FOR_NULL(subscription, NULL);
RCL_CHECK_FOR_NULL_WITH_MSG(