Remove unused check context.c (#691)

* Remove unused check context.c * Add test for functionality removed * Add rcl_reset_error() statement Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>
ros2 · Oct 16, 2020 · dda5103 · dda5103
1 parent 91dad10
commit dda5103
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/rcl/src/rcl/context.c b/rcl/src/rcl/context.c
@@ -95,11 +95,6 @@ rcl_context_get_rmw_context(rcl_context_t * context)
 void
 __cleanup_context(rcl_context_t * context)
 {
-  // if null, nothing can be done
-  if (NULL == context) {
-    return;
-  }
-
   // reset the instance id to 0 to indicate "invalid" (should already be 0, but this is defensive)
   rcutils_atomic_store((atomic_uint_least64_t *)(&context->instance_id_storage), 0);
 

diff --git a/rcl/test/rcl/test_context.cpp b/rcl/test/rcl/test_context.cpp
@@ -124,3 +124,8 @@ TEST_F(CLASSNAME(TestContextFixture, RMW_IMPLEMENTATION), nominal) {
   ret = rcl_init_options_fini(&init_options);
   EXPECT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
 }
+
+TEST_F(CLASSNAME(TestContextFixture, RMW_IMPLEMENTATION), bad_fini) {
+  EXPECT_EQ(RCL_RET_INVALID_ARGUMENT, rcl_context_fini(nullptr));
+  rcl_reset_error();
+}