tree-wide: use ASSERT_PTR more

[thirdparty/systemd.git] / src / login / logind-button.c

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index a2eb4c5269fb3f47844315f48d1ef7cf2aa4ab7c..0314ae1774357cb99181399693c61776d31fa07d 100644 (file)
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -84,8 +84,7 @@ static void button_lid_switch_handle_action(Manager *manager, bool is_edge) {
          * differently */
         if (manager_is_docked_or_external_displays(manager))
                 handle_action = manager->handle_lid_switch_docked;
-        else if (manager->handle_lid_switch_ep != _HANDLE_ACTION_INVALID &&
-                 manager_is_on_external_power())
+        else if (handle_action_valid(manager->handle_lid_switch_ep) && manager_is_on_external_power())
                 handle_action = manager->handle_lid_switch_ep;
         else
                 handle_action = manager->handle_lid_switch;
@@ -94,9 +93,8 @@ static void button_lid_switch_handle_action(Manager *manager, bool is_edge) {
 }
 
 static int button_recheck(sd_event_source *e, void *userdata) {
-        Button *b = userdata;
+        Button *b = ASSERT_PTR(userdata);
 
-        assert(b);
         assert(b->lid_closed);
 
         button_lid_switch_handle_action(b->manager, false);
@@ -120,10 +118,9 @@ static int button_install_check_event_source(Button *b) {
 }
 
 static int long_press_of_power_key_handler(sd_event_source *e, uint64_t usec, void *userdata) {
-        Manager *m = userdata;
+        Manager *m = ASSERT_PTR(userdata);
 
         assert(e);
-        assert(m);
 
         m->power_key_long_press_event_source = sd_event_source_unref(m->power_key_long_press_event_source);
 
@@ -136,10 +133,9 @@ static int long_press_of_power_key_handler(sd_event_source *e, uint64_t usec, vo
 }
 
 static int long_press_of_reboot_key_handler(sd_event_source *e, uint64_t usec, void *userdata) {
-        Manager *m = userdata;
+        Manager *m = ASSERT_PTR(userdata);
 
         assert(e);
-        assert(m);
 
         m->reboot_key_long_press_event_source = sd_event_source_unref(m->reboot_key_long_press_event_source);
 
@@ -152,10 +148,9 @@ static int long_press_of_reboot_key_handler(sd_event_source *e, uint64_t usec, v
 }
 
 static int long_press_of_suspend_key_handler(sd_event_source *e, uint64_t usec, void *userdata) {
-        Manager *m = userdata;
+        Manager *m = ASSERT_PTR(userdata);
 
         assert(e);
-        assert(m);
 
         m->suspend_key_long_press_event_source = sd_event_source_unref(m->suspend_key_long_press_event_source);
 
@@ -168,10 +163,9 @@ static int long_press_of_suspend_key_handler(sd_event_source *e, uint64_t usec,
 }
 
 static int long_press_of_hibernate_key_handler(sd_event_source *e, uint64_t usec, void *userdata) {
-        Manager *m = userdata;
+        Manager *m = ASSERT_PTR(userdata);
 
         assert(e);
-        assert(m);
 
         m->hibernate_key_long_press_event_source = sd_event_source_unref(m->hibernate_key_long_press_event_source);
 
@@ -203,13 +197,12 @@ static void start_long_press(Manager *m, sd_event_source **e, sd_event_time_hand
 }
 
 static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
-        Button *b = userdata;
+        Button *b = ASSERT_PTR(userdata);
         struct input_event ev;
         ssize_t l;
 
         assert(s);
         assert(fd == b->fd);
-        assert(b);
 
         l = read(b->fd, &ev, sizeof(ev));
         if (l < 0)
@@ -227,7 +220,8 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
                                 log_debug("Power key pressed. Further action depends on the key press duration.");
                                 start_long_press(b->manager, &b->manager->power_key_long_press_event_source, long_press_of_power_key_handler);
                         } else {
-                                log_struct(LOG_INFO, LOG_MESSAGE("Power key pressed short."),
+                                log_struct(LOG_INFO,
+                                           LOG_MESSAGE("Power key pressed short."),
                                            "MESSAGE_ID=" SD_MESSAGE_POWER_KEY_STR);
                                 manager_handle_action(b->manager, INHIBIT_HANDLE_POWER_KEY, b->manager->handle_power_key, b->manager->power_key_ignore_inhibited, true);
                         }
@@ -243,7 +237,8 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
                                 log_debug("Reboot key pressed. Further action depends on the key press duration.");
                                 start_long_press(b->manager, &b->manager->reboot_key_long_press_event_source, long_press_of_reboot_key_handler);
                         } else {
-                                log_struct(LOG_INFO, LOG_MESSAGE("Reboot key pressed short."),
+                                log_struct(LOG_INFO,
+                                           LOG_MESSAGE("Reboot key pressed short."),
                                            "MESSAGE_ID=" SD_MESSAGE_REBOOT_KEY_STR);
                                 manager_handle_action(b->manager, INHIBIT_HANDLE_REBOOT_KEY, b->manager->handle_reboot_key, b->manager->reboot_key_ignore_inhibited, true);
                         }
@@ -260,7 +255,8 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
                                 log_debug("Suspend key pressed. Further action depends on the key press duration.");
                                 start_long_press(b->manager, &b->manager->suspend_key_long_press_event_source, long_press_of_suspend_key_handler);
                         } else {
-                                log_struct(LOG_INFO, LOG_MESSAGE("Suspend key pressed short."),
+                                log_struct(LOG_INFO,
+                                           LOG_MESSAGE("Suspend key pressed short."),
                                            "MESSAGE_ID=" SD_MESSAGE_SUSPEND_KEY_STR);
                                 manager_handle_action(b->manager, INHIBIT_HANDLE_SUSPEND_KEY, b->manager->handle_suspend_key, b->manager->suspend_key_ignore_inhibited, true);
                         }
@@ -271,7 +267,8 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
                                 log_debug("Hibernate key pressed. Further action depends on the key press duration.");
                                 start_long_press(b->manager, &b->manager->hibernate_key_long_press_event_source, long_press_of_hibernate_key_handler);
                         } else {
-                                log_struct(LOG_INFO, LOG_MESSAGE("Hibernate key pressed short."),
+                                log_struct(LOG_INFO,
+                                           LOG_MESSAGE("Hibernate key pressed short."),
                                            "MESSAGE_ID=" SD_MESSAGE_HIBERNATE_KEY_STR);
                                 manager_handle_action(b->manager, INHIBIT_HANDLE_HIBERNATE_KEY, b->manager->handle_hibernate_key, b->manager->hibernate_key_ignore_inhibited, true);
                         }
@@ -279,12 +276,28 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
                 }
 
         } else if (ev.type == EV_KEY && ev.value == 0) {
-                if (ev.code == KEY_RESTART) {
-                        if (b->manager->reboot_key_long_press_event_source) {
+
+                switch (ev.code) {
+
+                case KEY_POWER:
+                case KEY_POWER2:
+                        if (b->manager->power_key_long_press_event_source) {
                                 /* Long press event timer is still pending and key release
                                    event happened.  This means that key press duration was
                                    insufficient to trigger a long press event
                                 */
+                                log_struct(LOG_INFO,
+                                           LOG_MESSAGE("Power key pressed short."),
+                                           "MESSAGE_ID=" SD_MESSAGE_POWER_KEY_STR);
+
+                                b->manager->power_key_long_press_event_source = sd_event_source_unref(b->manager->power_key_long_press_event_source);
+
+                                manager_handle_action(b->manager, INHIBIT_HANDLE_POWER_KEY, b->manager->handle_power_key, b->manager->power_key_ignore_inhibited, true);
+                        }
+                        break;
+
+                case KEY_RESTART:
+                        if (b->manager->reboot_key_long_press_event_source) {
                                 log_struct(LOG_INFO,
                                            LOG_MESSAGE("Reboot key pressed short."),
                                            "MESSAGE_ID=" SD_MESSAGE_REBOOT_KEY_STR);
@@ -293,6 +306,30 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
 
                                 manager_handle_action(b->manager, INHIBIT_HANDLE_REBOOT_KEY, b->manager->handle_reboot_key, b->manager->reboot_key_ignore_inhibited, true);
                         }
+                        break;
+
+                case KEY_SLEEP:
+                        if (b->manager->suspend_key_long_press_event_source) {
+                                log_struct(LOG_INFO,
+                                           LOG_MESSAGE("Suspend key pressed short."),
+                                           "MESSAGE_ID=" SD_MESSAGE_SUSPEND_KEY_STR);
+
+                                b->manager->suspend_key_long_press_event_source = sd_event_source_unref(b->manager->suspend_key_long_press_event_source);
+
+                                manager_handle_action(b->manager, INHIBIT_HANDLE_SUSPEND_KEY, b->manager->handle_suspend_key, b->manager->suspend_key_ignore_inhibited, true);
+                        }
+                        break;
+                case KEY_SUSPEND:
+                        if (b->manager->hibernate_key_long_press_event_source) {
+                                log_struct(LOG_INFO,
+                                           LOG_MESSAGE("Hibernate key pressed short."),
+                                           "MESSAGE_ID=" SD_MESSAGE_HIBERNATE_KEY_STR);
+
+                                b->manager->hibernate_key_long_press_event_source = sd_event_source_unref(b->manager->hibernate_key_long_press_event_source);
+
+                                manager_handle_action(b->manager, INHIBIT_HANDLE_HIBERNATE_KEY, b->manager->handle_hibernate_key, b->manager->hibernate_key_ignore_inhibited, true);
+                        }
+                        break;
                 }
 
         } else if (ev.type == EV_SW && ev.value > 0) {