From 64a01235e2f91ec1c1590fa55d9ad157be602191 Mon Sep 17 00:00:00 2001 From: Mike Wake Date: Wed, 28 Aug 2024 21:40:46 +1000 Subject: [PATCH] Fix cpplint uncrustify (#4341) Signed-off-by: Mike Wake --- .../src/navigators/navigate_through_poses.cpp | 7 ++----- nav2_bt_navigator/src/navigators/navigate_to_pose.cpp | 7 ++----- nav2_waypoint_follower/src/waypoint_follower.cpp | 3 ++- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/nav2_bt_navigator/src/navigators/navigate_through_poses.cpp b/nav2_bt_navigator/src/navigators/navigate_through_poses.cpp index 9202fb61c6d..74a1bc4b45e 100644 --- a/nav2_bt_navigator/src/navigators/navigate_through_poses.cpp +++ b/nav2_bt_navigator/src/navigators/navigate_through_poses.cpp @@ -92,16 +92,13 @@ NavigateThroughPosesNavigator::goalCompleted( typename ActionT::Result::SharedPtr result, const nav2_behavior_tree::BtStatus /*final_bt_status*/) { - if (result->error_code == 0 && internal_error_code_ != 0) - { + if (result->error_code == 0 && internal_error_code_ != 0) { RCLCPP_WARN(logger_, "NavigateThroughPosesNavigator::goalCompleted, set result to internal error %d:'%s'.", internal_error_code_, internal_error_msg_.c_str()); result->error_code = internal_error_code_; result->error_msg = internal_error_msg_; - } - else - { + } else { RCLCPP_INFO(logger_, "NavigateThroughPosesNavigator::goalCompleted result %d:'%s'.", result->error_code, result->error_msg.c_str()); diff --git a/nav2_bt_navigator/src/navigators/navigate_to_pose.cpp b/nav2_bt_navigator/src/navigators/navigate_to_pose.cpp index cf566893026..ba26e9427d9 100644 --- a/nav2_bt_navigator/src/navigators/navigate_to_pose.cpp +++ b/nav2_bt_navigator/src/navigators/navigate_to_pose.cpp @@ -106,16 +106,13 @@ NavigateToPoseNavigator::goalCompleted( typename ActionT::Result::SharedPtr result, const nav2_behavior_tree::BtStatus /*final_bt_status*/) { - if (result->error_code == 0 && !internal_error_code_ == 0) - { + if (result->error_code == 0 && !internal_error_code_ == 0) { RCLCPP_WARN(logger_, "NavigateThroughPosesNavigator::goalCompleted, set result to internal error %d:%s.", internal_error_code_, internal_error_msg_.c_str()); result->error_code = internal_error_code_; result->error_msg = internal_error_msg_; - } - else - { + } else { RCLCPP_INFO(logger_, "NavigateThroughPosesNavigator::goalCompleted result %d:%s.", result->error_code, result->error_msg.c_str()); diff --git a/nav2_waypoint_follower/src/waypoint_follower.cpp b/nav2_waypoint_follower/src/waypoint_follower.cpp index e1586ccb15c..04a6002d89b 100644 --- a/nav2_waypoint_follower/src/waypoint_follower.cpp +++ b/nav2_waypoint_follower/src/waypoint_follower.cpp @@ -453,7 +453,8 @@ WaypointFollower::goalResponseCallback( if (!goal) { current_goal_status_.status = ActionStatus::FAILED; current_goal_status_.error_code = nav2_msgs::action::FollowWaypoints::Result::UNKNOWN; - current_goal_status_.error_msg = "navigate_to_pose action client failed to send goal to server."; + current_goal_status_.error_msg = + "navigate_to_pose action client failed to send goal to server."; RCLCPP_ERROR(get_logger(), current_goal_status_.error_msg.c_str()); } }