diff options
author | Lennart Poettering <lennart@poettering.net> | 2017-10-02 16:08:49 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-12-08 07:35:32 +0100 |
commit | ad9cd1015e7428c8a1a989e64b774491428fc839 (patch) | |
tree | 4d085c8be17e3b6b40b4f89b5eb310e94227e348 /src/login/logind-dbus.c | |
parent | dfa9a97253a144ff90e64d271e6d02dec6a2ebad (diff) |
logind: reorder things a bit
Let's keep the three sleep method implementations close to each other.
Diffstat (limited to 'src/login/logind-dbus.c')
-rw-r--r-- | src/login/logind-dbus.c | 66 |
1 files changed, 28 insertions, 38 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 207b4358a..1769f221e 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1807,9 +1807,6 @@ static int method_do_shutdown_or_sleep( if (r < 0) return r; - log_debug_elogind("%s called with action '%s', sleep '%s' (%sinteractive)", - __FUNCTION__, action, sleep_verb, - interactive ? "" : "NOT "); /* Don't allow multiple jobs being executed at the same time */ if (m->action_what) return sd_bus_error_setf(error, BUS_ERROR_OPERATION_IN_PROGRESS, "There's already a shutdown or sleep operation in progress"); @@ -1839,7 +1836,6 @@ static int method_do_shutdown_or_sleep( static int method_poweroff(sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; - log_debug_elogind("%s called", __FUNCTION__); return method_do_shutdown_or_sleep( m, message, SPECIAL_POWEROFF_TARGET, @@ -1854,7 +1850,6 @@ static int method_poweroff(sd_bus_message *message, void *userdata, sd_bus_error static int method_reboot(sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; - log_debug_elogind("%s called", __FUNCTION__); return method_do_shutdown_or_sleep( m, message, SPECIAL_REBOOT_TARGET, @@ -1883,7 +1878,6 @@ static int method_halt(sd_bus_message *message, void *userdata, sd_bus_error *er static int method_suspend(sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; - log_debug_elogind("%s called", __FUNCTION__); return method_do_shutdown_or_sleep( m, message, SPECIAL_SUSPEND_TARGET, @@ -1894,6 +1888,34 @@ static int method_suspend(sd_bus_message *message, void *userdata, sd_bus_error "suspend", error); } + +static int method_hibernate(sd_bus_message *message, void *userdata, sd_bus_error *error) { + Manager *m = userdata; + + return method_do_shutdown_or_sleep( + m, message, + SPECIAL_HIBERNATE_TARGET, + INHIBIT_SLEEP, + "org.freedesktop.login1.hibernate", + "org.freedesktop.login1.hibernate-multiple-sessions", + "org.freedesktop.login1.hibernate-ignore-inhibit", + "hibernate", + error); +} + +static int method_hybrid_sleep(sd_bus_message *message, void *userdata, sd_bus_error *error) { + Manager *m = userdata; + + return method_do_shutdown_or_sleep( + m, message, + SPECIAL_HYBRID_SLEEP_TARGET, + INHIBIT_SLEEP, + "org.freedesktop.login1.hibernate", + "org.freedesktop.login1.hibernate-multiple-sessions", + "org.freedesktop.login1.hibernate-ignore-inhibit", + "hybrid-sleep", + error); +} #endif // 0 static int nologin_timeout_handler( @@ -2199,38 +2221,6 @@ static int method_cancel_scheduled_shutdown(sd_bus_message *message, void *userd return sd_bus_reply_method_return(message, "b", cancelled); } -#if 0 /// elogind has its own variant in elogind-dbus.c -static int method_hibernate(sd_bus_message *message, void *userdata, sd_bus_error *error) { - Manager *m = userdata; - - log_debug_elogind("%s called", __FUNCTION__); - return method_do_shutdown_or_sleep( - m, message, - SPECIAL_HIBERNATE_TARGET, - INHIBIT_SLEEP, - "org.freedesktop.login1.hibernate", - "org.freedesktop.login1.hibernate-multiple-sessions", - "org.freedesktop.login1.hibernate-ignore-inhibit", - "hibernate", - error); -} - -static int method_hybrid_sleep(sd_bus_message *message, void *userdata, sd_bus_error *error) { - Manager *m = userdata; - - log_debug_elogind("%s called", __FUNCTION__); - return method_do_shutdown_or_sleep( - m, message, - SPECIAL_HYBRID_SLEEP_TARGET, - INHIBIT_SLEEP, - "org.freedesktop.login1.hibernate", - "org.freedesktop.login1.hibernate-multiple-sessions", - "org.freedesktop.login1.hibernate-ignore-inhibit", - "hybrid-sleep", - error); -} -#endif // 0 - static int method_can_shutdown_or_sleep( Manager *m, sd_bus_message *message, |