Cleanup network flow endpoints test. (#1094)

So that we don't get warnings on unsupported RMW implementations. Signed-off-by: Chris Lalancette <[email protected]>
ros2 · Aug 22, 2023 · 7c1b387 · 7c1b387
1 parent 55cc2c7
commit 7c1b387
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/rcl/src/rcl/network_flow_endpoints.c b/rcl/src/rcl/network_flow_endpoints.c
@@ -12,11 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 #include "rcl/error_handling.h"
 #include "rcl/graph.h"
 #include "rcl/network_flow_endpoints.h"
@@ -115,7 +110,3 @@ rcl_subscription_get_network_flow_endpoints(
   }
   return rcl_convert_rmw_ret_to_rcl_ret(rmw_ret);
 }
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/rcl/test/rcl/test_network_flow_endpoints.cpp b/rcl/test/rcl/test_network_flow_endpoints.cpp
@@ -408,9 +408,11 @@ TEST_F(
           strcmp_ret);
       }
     }
-  }
 
-  // Release resources
-  rcl_network_flow_endpoint_array_fini(&network_flow_endpoint_array_1);
-  rcl_network_flow_endpoint_array_fini(&network_flow_endpoint_array_2);
+    // Release resources
+    rcl_network_flow_endpoint_array_fini(&network_flow_endpoint_array_1);
+    rcl_network_flow_endpoint_array_fini(&network_flow_endpoint_array_2);
+  } else {
+    rcl_reset_error();
+  }
 }