Address reviewer feedback.

ros2 · Nov 13, 2018 · 280fd2d · 280fd2d
1 parent cbf2e8d
commit 280fd2d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 12 deletions.
diff --git a/rmw_fastrtps_cpp/src/rmw_publisher.cpp b/rmw_fastrtps_cpp/src/rmw_publisher.cpp
@@ -183,11 +183,11 @@ rmw_create_publisher(
 }
 
 rmw_ret_t
-rmw_count_matched_subscriptions(
+rmw_publisher_count_matched_subscriptions(
   const rmw_publisher_t * publisher,
   size_t * subscription_count)
 {
-  return rmw_fastrtps_shared_cpp::__rmw_count_matched_subscriptions(
+  return rmw_fastrtps_shared_cpp::__rmw_publisher_count_matched_subscriptions(
     publisher, subscription_count);
 }
 

diff --git a/rmw_fastrtps_cpp/src/rmw_subscription.cpp b/rmw_fastrtps_cpp/src/rmw_subscription.cpp
@@ -165,11 +165,11 @@ rmw_create_subscription(
 }
 
 rmw_ret_t
-rmw_count_matched_publishers(
+rmw_subscription_count_matched_publishers(
   const rmw_subscription_t * subscription,
   size_t * publisher_count)
 {
-  return rmw_fastrtps_shared_cpp::__rmw_count_matched_publishers(
+  return rmw_fastrtps_shared_cpp::__rmw_subscription_count_matched_publishers(
     subscription, publisher_count);
 }
 

diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_publisher.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_publisher.cpp
@@ -181,6 +181,15 @@ rmw_create_publisher(
   return nullptr;
 }
 
+rmw_ret_t
+rmw_publisher_count_matched_subscriptions(
+  const rmw_publisher_t * publisher,
+  size_t * subscription_count)
+{
+  return rmw_fastrtps_shared_cpp::__rmw_publisher_count_matched_subscriptions(
+    publisher, subscription_count);
+}
+
 rmw_ret_t
 rmw_destroy_publisher(rmw_node_t * node, rmw_publisher_t * publisher)
 {

diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_subscription.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_subscription.cpp
@@ -165,6 +165,15 @@ rmw_create_subscription(
   return nullptr;
 }
 
+rmw_ret_t
+rmw_subscription_count_matched_publishers(
+  const rmw_subscription_t * subscription,
+  size_t * publisher_count)
+{
+  return rmw_fastrtps_shared_cpp::__rmw_subscription_count_matched_publishers(
+    subscription, publisher_count);
+}
+
 rmw_ret_t
 rmw_destroy_subscription(rmw_node_t * node, rmw_subscription_t * subscription)
 {

diff --git a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/rmw_common.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/rmw_common.hpp
@@ -131,7 +131,7 @@ __rmw_destroy_publisher(
 
 RMW_FASTRTPS_SHARED_CPP_PUBLIC
 rmw_ret_t
-__rmw_count_matched_subscriptions(
+__rmw_publisher_count_matched_subscriptions(
   const rmw_publisher_t * publisher,
   size_t * subscription_count);
 
@@ -201,7 +201,7 @@ __rmw_destroy_subscription(
 
 RMW_FASTRTPS_SHARED_CPP_PUBLIC
 rmw_ret_t
-__rmw_count_matched_publishers(
+__rmw_subscription_count_matched_publishers(
   const rmw_subscription_t * subscription,
   size_t * publisher_count);
 

diff --git a/rmw_fastrtps_shared_cpp/src/rmw_publisher.cpp b/rmw_fastrtps_shared_cpp/src/rmw_publisher.cpp
@@ -87,18 +87,18 @@ __rmw_destroy_publisher(
 }
 
 rmw_ret_t
-__rmw_count_matched_subscriptions(
+__rmw_publisher_count_matched_subscriptions(
   const rmw_publisher_t * publisher,
   size_t * subscription_count)
 {
   if (!publisher) {
     RMW_SET_ERROR_MSG("publisher handle is null");
-    return RMW_RET_ERROR;
+    return RMW_RET_INVALID_ARGUMENT;
   }
 
   if (!subscription_count) {
     RMW_SET_ERROR_MSG("subscription_count is null");
-    return RMW_RET_ERROR;
+    return RMW_RET_INVALID_ARGUMENT;
   }
 
   auto info = static_cast<CustomPublisherInfo *>(publisher->data);

diff --git a/rmw_fastrtps_shared_cpp/src/rmw_subscription.cpp b/rmw_fastrtps_shared_cpp/src/rmw_subscription.cpp
@@ -93,18 +93,18 @@ __rmw_destroy_subscription(
 }
 
 rmw_ret_t
-__rmw_count_matched_publishers(
+__rmw_subscription_count_matched_publishers(
   const rmw_subscription_t * subscription,
   size_t * publisher_count)
 {
   if (!subscription) {
     RMW_SET_ERROR_MSG("subscription handle is null");
-    return RMW_RET_ERROR;
+    return RMW_RET_INVALID_ARGUMENT;
   }
 
   if (!publisher_count) {
     RMW_SET_ERROR_MSG("publisher_count is null");
-    return RMW_RET_ERROR;
+    return RMW_RET_INVALID_ARGUMENT;
   }
 
   auto info = static_cast<CustomSubscriberInfo *>(subscription->data);