From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 10 Jan 2024 15:11:23 +0000 (+0800)
Subject: logind-action: query HandleActionData.sleep_operation where appropriate
X-Git-Tag: v256-rc1~1209
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54cc0367cbfc2f6fbfc8748da115d87fab77a160;p=thirdparty%2Fsystemd.git

logind-action: query HandleActionData.sleep_operation where appropriate
---

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index acef32679a1..138952da91d 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -133,6 +133,11 @@ const HandleActionData* handle_action_lookup(HandleAction action) {
         return &handle_action_data_table[action];
 }
 
+static bool handle_action_sleep_supported(HandleAction action) {
+        assert(HANDLE_ACTION_IS_SLEEP(action) && action != HANDLE_SLEEP);
+        return sleep_supported(ASSERT_PTR(handle_action_lookup(action))->sleep_operation) > 0;
+}
+
 /* The order in which we try each sleep operation. We should typically prefer operations without a delay,
  * i.e. s2h and suspend, and use hibernation at last since it requires minimum hardware support.
  * hybrid-sleep is disabled by default, and thus should be ordered before suspend if manually chosen by user,
@@ -169,7 +174,7 @@ HandleAction handle_action_sleep_select(HandleActionSleepMask mask) {
                 if (!FLAGS_SET(mask, a))
                         continue;
 
-                if (sleep_supported(ASSERT_PTR(handle_action_lookup(*i))->sleep_operation) > 0)
+                if (handle_action_sleep_supported(*i))
                         return *i;
         }
 
@@ -266,18 +271,7 @@ static int handle_action_sleep_execute(
                 return handle_action_sleep_execute(m, a, ignore_inhibited, is_edge);
         }
 
-        bool supported;
-
-        if (handle == HANDLE_SUSPEND)
-                supported = sleep_supported(SLEEP_SUSPEND) > 0;
-        else if (handle == HANDLE_HIBERNATE)
-                supported = sleep_supported(SLEEP_HIBERNATE) > 0;
-        else if (handle == HANDLE_HYBRID_SLEEP)
-                supported = sleep_supported(SLEEP_HYBRID_SLEEP) > 0;
-        else if (handle == HANDLE_SUSPEND_THEN_HIBERNATE)
-                supported = sleep_supported(SLEEP_SUSPEND_THEN_HIBERNATE) > 0;
-        else
-                assert_not_reached();
+        bool supported = handle_action_sleep_supported(handle);
 
         if (!supported && handle != HANDLE_SUSPEND) {
                 supported = sleep_supported(SLEEP_SUSPEND) > 0;