Use simplified error checking.

ros2 · Nov 27, 2018 · f3c7ada · f3c7ada
1 parent 8bacb00
commit f3c7ada
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/rcl/src/rcl/publisher.c b/rcl/src/rcl/publisher.c
@@ -307,16 +307,13 @@ rcl_publisher_get_subscription_count(
   const rcl_publisher_t * publisher,
   size_t * subscription_count)
 {
-  RCL_CHECK_FOR_NULL_WITH_MSG(publisher, "publisher pointer is invalid",
-    return RCL_RET_INVALID_ARGUMENT);
+  if (!rcl_publisher_is_valid(publisher)) {
+    return RCL_RET_PUBLISHER_INVALID;
+  }
   RCL_CHECK_ARGUMENT_FOR_NULL(subscription_count, RCL_RET_INVALID_ARGUMENT);
-  RCL_CHECK_FOR_NULL_WITH_MSG(publisher->impl, "publisher's implementation is invalid",
-    return RCL_RET_ERROR);
-  RCL_CHECK_FOR_NULL_WITH_MSG(
-    publisher->impl->rmw_handle, "publisher's rmw handle is invalid",
-    return RCL_RET_ERROR);
 
-  rmw_ret_t ret = rmw_count_matched_subscriptions(publisher->impl->rmw_handle, subscription_count);
+  rmw_ret_t ret = rmw_publisher_count_matched_subscriptions(publisher->impl->rmw_handle,
+      subscription_count);
 
   if (ret != RMW_RET_OK) {
     RCL_SET_ERROR_MSG(rmw_get_error_string().str);

diff --git a/rcl/src/rcl/subscription.c b/rcl/src/rcl/subscription.c
@@ -342,15 +342,12 @@ rcl_subscription_get_publisher_count(
   const rcl_subscription_t * subscription,
   size_t * publisher_count)
 {
-  RCL_CHECK_FOR_NULL_WITH_MSG(subscription, "subscription pointer is invalid",
-    return RCL_RET_INVALID_ARGUMENT);
+  if (!rcl_subscription_is_valid(subscription)) {
+    return RCL_RET_SUBSCRIPTION_INVALID;
+  }
   RCL_CHECK_ARGUMENT_FOR_NULL(publisher_count, RCL_RET_INVALID_ARGUMENT);
-  RCL_CHECK_FOR_NULL_WITH_MSG(
-    subscription->impl, "subscription's implementation is invalid", return RCL_RET_ERROR);
-  RCL_CHECK_FOR_NULL_WITH_MSG(
-    subscription->impl->rmw_handle, "subscription's rmw handle is invalid", return RCL_RET_ERROR);
-
-  rmw_ret_t ret = rmw_count_matched_publishers(subscription->impl->rmw_handle, publisher_count);
+  rmw_ret_t ret = rmw_subscription_count_matched_publishers(subscription->impl->rmw_handle,
+      publisher_count);
 
   if (ret != RMW_RET_OK) {
     RCL_SET_ERROR_MSG(rmw_get_error_string().str);