From 7b77ed8cf36e8eca6017791626044b61ae2d68e7 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 13 Dec 2013 03:30:42 +0100
Subject: event: be more conservative when returning errors from event handler
 callbacks

We really should return errors from event handlers if we have a
continous problem and don't know any other solution.
---
 src/login/logind-button.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'src/login/logind-button.c')

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 3dd0829486..e29f2c4c5f 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -141,7 +141,9 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
                                    "MESSAGE=Power key pressed.",
                                    MESSAGE_ID(SD_MESSAGE_POWER_KEY),
                                    NULL);
-                        return button_handle(b, INHIBIT_HANDLE_POWER_KEY, b->manager->handle_power_key, b->manager->power_key_ignore_inhibited, true);
+
+                        button_handle(b, INHIBIT_HANDLE_POWER_KEY, b->manager->handle_power_key, b->manager->power_key_ignore_inhibited, true);
+                        break;
 
                 /* The kernel is a bit confused here:
 
@@ -154,41 +156,41 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
                                    "MESSAGE=Suspend key pressed.",
                                    MESSAGE_ID(SD_MESSAGE_SUSPEND_KEY),
                                    NULL);
-                        return button_handle(b, INHIBIT_HANDLE_SUSPEND_KEY, b->manager->handle_suspend_key, b->manager->suspend_key_ignore_inhibited, true);
+
+                        button_handle(b, INHIBIT_HANDLE_SUSPEND_KEY, b->manager->handle_suspend_key, b->manager->suspend_key_ignore_inhibited, true);
+                        break;
 
                 case KEY_SUSPEND:
                         log_struct(LOG_INFO,
                                    "MESSAGE=Hibernate key pressed.",
                                    MESSAGE_ID(SD_MESSAGE_HIBERNATE_KEY),
                                    NULL);
-                        return button_handle(b, INHIBIT_HANDLE_HIBERNATE_KEY, b->manager->handle_hibernate_key, b->manager->hibernate_key_ignore_inhibited, true);
+
+                        button_handle(b, 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) {
 
-                switch (ev.code) {
-
-                case SW_LID:
+                if (ev.code == SW_LID) {
                         log_struct(LOG_INFO,
                                    "MESSAGE=Lid closed.",
                                    MESSAGE_ID(SD_MESSAGE_LID_CLOSED),
                                    NULL);
-                        b->lid_close_queued = true;
 
-                        return button_handle(b, INHIBIT_HANDLE_LID_SWITCH, b->manager->handle_lid_switch, b->manager->lid_switch_ignore_inhibited, true);
+                        b->lid_close_queued = true;
+                        button_handle(b, INHIBIT_HANDLE_LID_SWITCH, b->manager->handle_lid_switch, b->manager->lid_switch_ignore_inhibited, true);
                 }
 
         } else if (ev.type == EV_SW && ev.value == 0) {
 
-                switch (ev.code) {
-
-                case SW_LID:
+                if (ev.code == SW_LID) {
                         log_struct(LOG_INFO,
                                    "MESSAGE=Lid opened.",
                                    MESSAGE_ID(SD_MESSAGE_LID_OPENED),
                                    NULL);
+
                         b->lid_close_queued = false;
-                        break;
                 }
         }
 
-- 
cgit v1.2.3-54-g00ecf