Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused check context.c #691

Merged
merged 3 commits into from
Jun 22, 2020
Merged

Remove unused check context.c #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eafc4f4
Remove unused check context.c
Blast545 Jun 19, 2020
fd89e8c
Add test for functiolaity removed
Blast545 Jun 19, 2020
963690e
Add rcl_reset_error() statement
Blast545 Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions rcl/src/rcl/context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
5 changes: 5 additions & 0 deletions rcl/test/rcl/test_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Blast545 marked this conversation as resolved.
Show resolved Hide resolved