From e29393333eac63f036e7cd3760467df0fd446859 Mon Sep 17 00:00:00 2001
From: Karsten Knese <karsten@openrobotics.org>
Date: Tue, 8 Oct 2019 11:16:27 -0700
Subject: [PATCH] unify error messages

Signed-off-by: Karsten Knese <karsten@openrobotics.org>
---
 rmw_fastrtps_cpp/src/rmw_publish.cpp         | 21 ++++++++++----------
 rmw_fastrtps_cpp/src/rmw_take.cpp            |  6 ++++++
 rmw_fastrtps_dynamic_cpp/src/rmw_publish.cpp |  2 +-
 rmw_fastrtps_dynamic_cpp/src/rmw_take.cpp    |  7 +++++++
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/rmw_fastrtps_cpp/src/rmw_publish.cpp b/rmw_fastrtps_cpp/src/rmw_publish.cpp
index dec3b8a42..f7517a860 100644
--- a/rmw_fastrtps_cpp/src/rmw_publish.cpp
+++ b/rmw_fastrtps_cpp/src/rmw_publish.cpp
@@ -35,6 +35,16 @@ rmw_publish(
     eprosima_fastrtps_identifier, publisher, ros_message, allocation);
 }
 
+rmw_ret_t
+rmw_publish_serialized_message(
+  const rmw_publisher_t * publisher,
+  const rmw_serialized_message_t * serialized_message,
+  rmw_publisher_allocation_t * allocation)
+{
+  return rmw_fastrtps_shared_cpp::__rmw_publish_serialized_message(
+    eprosima_fastrtps_identifier, publisher, serialized_message, allocation);
+}
+
 rmw_ret_t
 rmw_publish_loaned_message(
   const rmw_publisher_t * publisher,
@@ -45,17 +55,8 @@ rmw_publish_loaned_message(
   (void) ros_message;
   (void) allocation;
 
-  RMW_SET_ERROR_MSG("fastrtps currently doesn't support loaned messages");
+  RMW_SET_ERROR_MSG("rmw_publish_loaned_message not implemented for rmw_fastrtps_cpp");
   return RMW_RET_ERROR;
 }
 
-rmw_ret_t
-rmw_publish_serialized_message(
-  const rmw_publisher_t * publisher,
-  const rmw_serialized_message_t * serialized_message,
-  rmw_publisher_allocation_t * allocation)
-{
-  return rmw_fastrtps_shared_cpp::__rmw_publish_serialized_message(
-    eprosima_fastrtps_identifier, publisher, serialized_message, allocation);
-}
 }  // extern "C"
diff --git a/rmw_fastrtps_cpp/src/rmw_take.cpp b/rmw_fastrtps_cpp/src/rmw_take.cpp
index 8ef651c5a..87b1fb9ad 100644
--- a/rmw_fastrtps_cpp/src/rmw_take.cpp
+++ b/rmw_fastrtps_cpp/src/rmw_take.cpp
@@ -81,6 +81,8 @@ rmw_take_loaned_message(
   (void) loaned_message;
   (void) taken;
   (void) allocation;
+
+  RMW_SET_ERROR_MSG("rmw_take_loaned_message not implemented for rmw_fastrtps_cpp");
   return RMW_RET_ERROR;
 }
 
@@ -97,6 +99,8 @@ rmw_take_loaned_message_with_info(
   (void) taken;
   (void) message_info;
   (void) allocation;
+
+  RMW_SET_ERROR_MSG("rmw_take_loaned_message_with_info not implemented for rmw_fastrtps_cpp");
   return RMW_RET_ERROR;
 }
 
@@ -107,6 +111,8 @@ rmw_release_loaned_message(
 {
   (void) subscription;
   (void) loaned_message;
+
+  RMW_SET_ERROR_MSG("rmw_release_loaned_message_with_info not implemented for rmw_fastrtps_cpp");
   return RMW_RET_ERROR;
 }
 
diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_publish.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_publish.cpp
index b8f9d5a8e..8a0e8db1a 100644
--- a/rmw_fastrtps_dynamic_cpp/src/rmw_publish.cpp
+++ b/rmw_fastrtps_dynamic_cpp/src/rmw_publish.cpp
@@ -45,7 +45,7 @@ rmw_publish_loaned_message(
   (void) ros_message;
   (void) allocation;
 
-  RMW_SET_ERROR_MSG("fastrtps-dynamic currently doesn't support loaned messages");
+  RMW_SET_ERROR_MSG("rmw_publish_loaned_message is not implemented for rmw_fastrtps_dynamic_cpp");
   return RMW_RET_ERROR;
 }
 
diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_take.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_take.cpp
index 856f9ddd3..566f4450e 100644
--- a/rmw_fastrtps_dynamic_cpp/src/rmw_take.cpp
+++ b/rmw_fastrtps_dynamic_cpp/src/rmw_take.cpp
@@ -81,6 +81,8 @@ rmw_take_loaned_message(
   (void) loaned_message;
   (void) taken;
   (void) allocation;
+
+  RMW_SET_ERROR_MSG("rmw_take_loaned_message is not implemented for rmw_fastrtps_dynamic_cpp");
   return RMW_RET_ERROR;
 }
 
@@ -97,6 +99,9 @@ rmw_take_loaned_message_with_info(
   (void) taken;
   (void) message_info;
   (void) allocation;
+
+  RMW_SET_ERROR_MSG(
+    "rmw_take_loaned_message_with_info is not implemented for rmw_fastrtps_dynamic_cpp");
   return RMW_RET_ERROR;
 }
 
@@ -107,6 +112,8 @@ rmw_release_loaned_message(
 {
   (void) subscription;
   (void) loaned_message;
+
+  RMW_SET_ERROR_MSG("rmw_release_loaned_message is not implemented for rmw_fastrtps_dynamic_cpp");
   return RMW_RET_ERROR;
 }