[CM] Linting if/else statements (ros-controls#1193)

henrygerardmoore · Dec 12, 2023 · 51b8985 · 51b8985
1 parent 562f36d
commit 51b8985
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/controller_manager/src/controller_manager.cpp b/controller_manager/src/controller_manager.cpp
@@ -2462,14 +2462,9 @@ bool ControllerManager::controller_sorting(
     // The case of the controllers that don't have any command interfaces. For instance,
     // joint_state_broadcaster
     // If the controller b is also under the same condition, then maintain their initial order
-    if (ctrl_b.c->command_interface_configuration().names.empty() || !ctrl_b.c->is_chainable())
-    {
-      return false;
-    }
-    else
-    {
-      return true;
-    }
+    const auto command_interfaces_exist =
+      !ctrl_b.c->command_interface_configuration().names.empty();
+    return ctrl_b.c->is_chainable() && command_interfaces_exist;
   }
   else if (ctrl_b.c->command_interface_configuration().names.empty() || !ctrl_b.c->is_chainable())
   {