use RMW_RET_UNSUPPORTED

Signed-off-by: Karsten Knese <karsten@openrobotics.org>
ros2 · Oct 14, 2019 · 1e8a032 · 1e8a032
1 parent 6371fa5
commit 1e8a032
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/rmw_fastrtps_cpp/src/rmw_publish.cpp b/rmw_fastrtps_cpp/src/rmw_publish.cpp
@@ -56,6 +56,6 @@ rmw_publish_loaned_message(
   (void) allocation;
 
   RMW_SET_ERROR_MSG("rmw_publish_loaned_message not implemented for rmw_fastrtps_cpp");
-  return RMW_RET_ERROR;
+  return RMW_RET_UNSUPPORTED;
 }
 }  // extern "C"
diff --git a/rmw_fastrtps_cpp/src/rmw_publisher.cpp b/rmw_fastrtps_cpp/src/rmw_publisher.cpp
@@ -271,7 +271,8 @@ rmw_borrow_loaned_message(
   (void) type_support;
   (void) ros_message;
 
-  return RMW_RET_ERROR;
+  RMW_SET_ERROR_MSG("rmw_borrow_loaned_message not implemented for rmw_fastrtps_cpp");
+  return RMW_RET_UNSUPPORTED;
 }
 
 rmw_ret_t
@@ -282,8 +283,8 @@ rmw_return_loaned_message(
   (void) publisher;
   (void) loaned_message;
 
-  RMW_SET_ERROR_MSG("fastrtps currently doesn't support loaned messages");
-  return RMW_RET_ERROR;
+  RMW_SET_ERROR_MSG("rmw_return_loaned_message not implemented for rmw_fastrtps_cpp");
+  return RMW_RET_UNSUPPORTED;
 }
 
 rmw_ret_t

diff --git a/rmw_fastrtps_cpp/src/rmw_take.cpp b/rmw_fastrtps_cpp/src/rmw_take.cpp
@@ -83,7 +83,7 @@ rmw_take_loaned_message(
   (void) allocation;
 
   RMW_SET_ERROR_MSG("rmw_take_loaned_message not implemented for rmw_fastrtps_cpp");
-  return RMW_RET_ERROR;
+  return RMW_RET_UNSUPPORTED;
 }
 
 rmw_ret_t
@@ -101,7 +101,7 @@ rmw_take_loaned_message_with_info(
   (void) allocation;
 
   RMW_SET_ERROR_MSG("rmw_take_loaned_message_with_info not implemented for rmw_fastrtps_cpp");
-  return RMW_RET_ERROR;
+  return RMW_RET_UNSUPPORTED;
 }
 
 rmw_ret_t
@@ -113,7 +113,7 @@ rmw_release_loaned_message(
   (void) loaned_message;
 
   RMW_SET_ERROR_MSG("rmw_release_loaned_message_with_info not implemented for rmw_fastrtps_cpp");
-  return RMW_RET_ERROR;
+  return RMW_RET_UNSUPPORTED;
 }
 
 rmw_ret_t

diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_publish.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_publish.cpp
@@ -46,7 +46,7 @@ rmw_publish_loaned_message(
   (void) allocation;
 
   RMW_SET_ERROR_MSG("rmw_publish_loaned_message is not implemented for rmw_fastrtps_dynamic_cpp");
-  return RMW_RET_ERROR;
+  return RMW_RET_UNSUPPORTED;
 }
 
 rmw_ret_t

diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_publisher.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_publisher.cpp
@@ -267,7 +267,8 @@ rmw_borrow_loaned_message(
   (void) type_support;
   (void) ros_message;
 
-  return RMW_RET_ERROR;
+  RMW_SET_ERROR_MSG("rmw_borrow_loaned_message is not implemented for rmw_fastrtps_dynamic_cpp");
+  return RMW_RET_UNSUPPORTED;
 }
 
 rmw_ret_t
@@ -278,8 +279,8 @@ rmw_return_loaned_message(
   (void) publisher;
   (void) loaned_message;
 
-  RMW_SET_ERROR_MSG("fastrtps-dynamic currently doesn't support loaned messages");
-  return RMW_RET_ERROR;
+  RMW_SET_ERROR_MSG("rmw_return_loaned_message is not implemented for rmw_fastrtps_dynamic_cpp");
+  return RMW_RET_UNSUPPORTED;
 }
 
 rmw_ret_t

diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_take.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_take.cpp
@@ -83,7 +83,7 @@ rmw_take_loaned_message(
   (void) allocation;
 
   RMW_SET_ERROR_MSG("rmw_take_loaned_message is not implemented for rmw_fastrtps_dynamic_cpp");
-  return RMW_RET_ERROR;
+  return RMW_RET_UNSUPPORTED;
 }
 
 rmw_ret_t
@@ -102,7 +102,7 @@ rmw_take_loaned_message_with_info(
 
   RMW_SET_ERROR_MSG(
     "rmw_take_loaned_message_with_info is not implemented for rmw_fastrtps_dynamic_cpp");
-  return RMW_RET_ERROR;
+  return RMW_RET_UNSUPPORTED;
 }
 
 rmw_ret_t
@@ -114,7 +114,7 @@ rmw_release_loaned_message(
   (void) loaned_message;
 
   RMW_SET_ERROR_MSG("rmw_release_loaned_message is not implemented for rmw_fastrtps_dynamic_cpp");
-  return RMW_RET_ERROR;
+  return RMW_RET_UNSUPPORTED;
 }
 
 rmw_ret_t