Skip to content

Commit

Permalink
Remove extra semicolons
Browse files Browse the repository at this point in the history
  • Loading branch information
dhood committed Nov 21, 2017
1 parent 7c7e117 commit decb56a
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions rcl/test/rcl/service_fixture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ wait_for_service_to_be_ready(
rcl_ret_t ret = rcl_wait_set_init(&wait_set, 0, 0, 0, 0, 1, rcl_get_default_allocator());
if (ret != RCL_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
ROS_PACKAGE_NAME, "Error in wait set init: %s", rcl_get_error_string_safe());
ROS_PACKAGE_NAME, "Error in wait set init: %s", rcl_get_error_string_safe())
return false;
}
auto wait_set_exit = make_scope_exit(
[&wait_set]() {
if (rcl_wait_set_fini(&wait_set) != RCL_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
ROS_PACKAGE_NAME, "Error in wait set fini: %s", rcl_get_error_string_safe());
ROS_PACKAGE_NAME, "Error in wait set fini: %s", rcl_get_error_string_safe())
throw std::runtime_error("error waiting for service to be ready");
}
});
Expand All @@ -54,20 +54,20 @@ wait_for_service_to_be_ready(
++iteration;
if (rcl_wait_set_clear_services(&wait_set) != RCL_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
ROS_PACKAGE_NAME, "Error in wait_set_clear_services: %s", rcl_get_error_string_safe());
ROS_PACKAGE_NAME, "Error in wait_set_clear_services: %s", rcl_get_error_string_safe())
return false;
}
if (rcl_wait_set_add_service(&wait_set, service) != RCL_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
ROS_PACKAGE_NAME, "Error in wait_set_add_service: %s", rcl_get_error_string_safe());
ROS_PACKAGE_NAME, "Error in wait_set_add_service: %s", rcl_get_error_string_safe())
return false;
}
ret = rcl_wait(&wait_set, RCL_MS_TO_NS(period_ms));
if (ret == RCL_RET_TIMEOUT) {
continue;
}
if (ret != RCL_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(ROS_PACKAGE_NAME, "Error in wait: %s", rcl_get_error_string_safe());
RCUTILS_LOG_ERROR_NAMED(ROS_PACKAGE_NAME, "Error in wait: %s", rcl_get_error_string_safe())
return false;
}
for (size_t i = 0; i < wait_set.size_of_services; ++i) {
Expand All @@ -85,22 +85,22 @@ int main(int argc, char ** argv)
{
if (rcl_init(argc, argv, rcl_get_default_allocator()) != RCL_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
ROS_PACKAGE_NAME, "Error in rcl init: %s", rcl_get_error_string_safe());
ROS_PACKAGE_NAME, "Error in rcl init: %s", rcl_get_error_string_safe())
return -1;
}
rcl_node_t node = rcl_get_zero_initialized_node();
const char * name = "service_fixture_node";
rcl_node_options_t node_options = rcl_node_get_default_options();
if (rcl_node_init(&node, name, "", &node_options) != RCL_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
ROS_PACKAGE_NAME, "Error in node init: %s", rcl_get_error_string_safe());
ROS_PACKAGE_NAME, "Error in node init: %s", rcl_get_error_string_safe())
return -1;
}
auto node_exit = make_scope_exit(
[&main_ret, &node]() {
if (rcl_node_fini(&node) != RCL_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
ROS_PACKAGE_NAME, "Error in node fini: %s", rcl_get_error_string_safe());
ROS_PACKAGE_NAME, "Error in node fini: %s", rcl_get_error_string_safe())
main_ret = -1;
}
});
Expand All @@ -114,15 +114,15 @@ int main(int argc, char ** argv)
rcl_ret_t ret = rcl_service_init(&service, &node, ts, topic, &service_options);
if (ret != RCL_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
ROS_PACKAGE_NAME, "Error in service init: %s", rcl_get_error_string_safe());
ROS_PACKAGE_NAME, "Error in service init: %s", rcl_get_error_string_safe())
return -1;
}

auto service_exit = make_scope_exit(
[&main_ret, &service, &node]() {
if (rcl_service_fini(&service, &node)) {
RCUTILS_LOG_ERROR_NAMED(
ROS_PACKAGE_NAME, "Error in service fini: %s", rcl_get_error_string_safe());
ROS_PACKAGE_NAME, "Error in service fini: %s", rcl_get_error_string_safe())
main_ret = -1;
}
});
Expand Down Expand Up @@ -153,15 +153,15 @@ int main(int argc, char ** argv)
// TODO(jacquelinekay) May have to check for timeout error codes
if (rcl_take_request(&service, &header, &service_request) != RCL_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
ROS_PACKAGE_NAME, "Error in take_request: %s", rcl_get_error_string_safe());
ROS_PACKAGE_NAME, "Error in take_request: %s", rcl_get_error_string_safe())
return -1;
}

// Sum the request and send the response.
service_response.sum = service_request.a + service_request.b;
if (rcl_send_response(&service, &header, &service_response) != RCL_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
ROS_PACKAGE_NAME, "Error in send_response: %s", rcl_get_error_string_safe());
ROS_PACKAGE_NAME, "Error in send_response: %s", rcl_get_error_string_safe())
return -1;
}
// Our scope exits should take care of fini for everything
Expand Down

0 comments on commit decb56a

Please sign in to comment.