Refactor CheckPoolState to use a cleaner switch.

Signed-off-by: Patrick Vacek <[email protected]>
advancedtelematic · Dec 17, 2018 · 5694746 · 5694746
1 parent 8638659
commit 5694746
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/sota_tools/deploy.cc b/src/sota_tools/deploy.cc
@@ -12,10 +12,14 @@
 #include "utilities/utils.h"
 
 bool CheckPoolState(const OSTreeObject::ptr &root_object, const RequestPool &request_pool) {
-  if (request_pool.run_mode() == RunMode::kWalkTree || request_pool.run_mode() == RunMode::kPushTree) {
-    return !request_pool.is_idle() && !request_pool.is_stopped();
-  } else {
-    return root_object->is_on_server() != PresenceOnServer::kObjectPresent && !request_pool.is_stopped();
+  switch (request_pool.run_mode()) {
+    case RunMode::kWalkTree:
+      return !request_pool.is_stopped() && !request_pool.is_idle();
+    case RunMode::kPushTree:
+      return root_object->is_on_server() != PresenceOnServer::kObjectPresent && !request_pool.is_stopped() &&
+             !request_pool.is_idle();
+    default:
+      return root_object->is_on_server() != PresenceOnServer::kObjectPresent && !request_pool.is_stopped();
   }
 }