Skip to content

Commit

Permalink
Fix cpplint uncrustify (ros-navigation#4341)
Browse files Browse the repository at this point in the history
Signed-off-by: Mike Wake <michael.wake@aosgrp.com.au>
  • Loading branch information
aosmw committed Oct 4, 2024
1 parent 43bfff0 commit a7fb2a4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
7 changes: 2 additions & 5 deletions nav2_bt_navigator/src/navigators/navigate_through_poses.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
7 changes: 2 additions & 5 deletions nav2_bt_navigator/src/navigators/navigate_to_pose.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
3 changes: 2 additions & 1 deletion nav2_waypoint_follower/src/waypoint_follower.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
Expand Down

0 comments on commit a7fb2a4

Please sign in to comment.