From 9d814db96b6f093fc334f60fa7c97fb3ce9852a8 Mon Sep 17 00:00:00 2001
From: Sven Eden <yamakuzure@gmx.net>
Date: Mon, 27 Aug 2018 08:44:24 +0200
Subject: Prep v239: A few cosmetic upgrades

---
 src/login/logind-dbus.c   | 1 -
 src/shared/sleep-config.c | 8 ++++++++
 src/sleep/sleep.c         | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 63a206ce2..5178dd847 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2434,7 +2434,6 @@ static int method_can_shutdown_or_sleep(
         }
 
  finish:
-
         return sd_bus_reply_method_return(message, "s", result);
 }
 
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 1d7d46ac1..77b380ca3 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -363,7 +363,11 @@ static bool can_s2h(Manager *m) {
         }
 
         FOREACH_STRING(p, "suspend", "hibernate") {
+#if 0 /// elogind must transport a pointer to its managers instance
+                r = can_sleep(p);
+#else
                 r = can_sleep(m, p);
+#endif // 0
                 if (IN_SET(r, 0, -ENOSPC)) {
                         log_debug("Unable to %s system.", p);
                         return false;
@@ -395,7 +399,11 @@ int can_sleep(Manager *m, const char *verb) {
         assert(STR_IN_SET(verb, "suspend", "hibernate", "hybrid-sleep", "suspend-then-hibernate"));
 
         if (streq(verb, "suspend-then-hibernate"))
+#if 0 /// elogind must transport a pointer to its managers instance
+                return can_s2h();
+#else
                 return can_s2h(m);
+#endif // 0
 
 #if 0 /// already parsed by elogind config
         r = parse_sleep_config(verb, &modes, &states, NULL);
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index fba7b9baf..87efd0ac7 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -383,6 +383,7 @@ int main(int argc, char *argv[]) {
                 r = execute_s2h(delay);
         else
                 r = execute(modes, states);
+finish:
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 #else
-- 
cgit v1.2.3