treewide: auto-convert the simple cases to log_*_errno()

[elogind.git] / src / login / logind-button.c

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 2561d13c673f55c7ab807369d01a28bbe4621316..d2cc43084538f33e42ab2a9d842fccf64fe9538f 100644 (file)
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -97,13 +97,27 @@ int button_set_seat(Button *b, const char *sn) {
         return 0;
 }
 
+static void button_lid_switch_handle_action(Manager *manager, bool is_edge) {
+        HandleAction handle_action;
+
+        assert(manager);
+
+        /* If we are docked, handle the lid switch differently */
+        if (manager_is_docked_or_multiple_displays(manager))
+                handle_action = manager->handle_lid_switch_docked;
+        else
+                handle_action = manager->handle_lid_switch;
+
+        manager_handle_action(manager, INHIBIT_HANDLE_LID_SWITCH, handle_action, manager->lid_switch_ignore_inhibited, is_edge);
+}
+
 static int button_recheck(sd_event_source *e, void *userdata) {
         Button *b = userdata;
 
         assert(b);
         assert(b->lid_closed);
 
-        manager_handle_action(b->manager, INHIBIT_HANDLE_LID_SWITCH, b->manager->handle_lid_switch, b->manager->lid_switch_ignore_inhibited, false);
+        button_lid_switch_handle_action(b->manager, false);
         return 1;
 }
 
@@ -145,8 +159,8 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
                 case KEY_POWER:
                 case KEY_POWER2:
                         log_struct(LOG_INFO,
-                                   "MESSAGE=Power key pressed.",
-                                   MESSAGE_ID(SD_MESSAGE_POWER_KEY),
+                                   LOG_MESSAGE("Power key pressed."),
+                                   LOG_MESSAGE_ID(SD_MESSAGE_POWER_KEY),
                                    NULL);
 
                         manager_handle_action(b->manager, INHIBIT_HANDLE_POWER_KEY, b->manager->handle_power_key, b->manager->power_key_ignore_inhibited, true);
@@ -160,8 +174,8 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
 
                 case KEY_SLEEP:
                         log_struct(LOG_INFO,
-                                   "MESSAGE=Suspend key pressed.",
-                                   MESSAGE_ID(SD_MESSAGE_SUSPEND_KEY),
+                                   LOG_MESSAGE("Suspend key pressed."),
+                                   LOG_MESSAGE_ID(SD_MESSAGE_SUSPEND_KEY),
                                    NULL);
 
                         manager_handle_action(b->manager, INHIBIT_HANDLE_SUSPEND_KEY, b->manager->handle_suspend_key, b->manager->suspend_key_ignore_inhibited, true);
@@ -169,8 +183,8 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
 
                 case KEY_SUSPEND:
                         log_struct(LOG_INFO,
-                                   "MESSAGE=Hibernate key pressed.",
-                                   MESSAGE_ID(SD_MESSAGE_HIBERNATE_KEY),
+                                   LOG_MESSAGE("Hibernate key pressed."),
+                                   LOG_MESSAGE_ID(SD_MESSAGE_HIBERNATE_KEY),
                                    NULL);
 
                         manager_handle_action(b->manager, INHIBIT_HANDLE_HIBERNATE_KEY, b->manager->handle_hibernate_key, b->manager->hibernate_key_ignore_inhibited, true);
@@ -181,18 +195,18 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
 
                 if (ev.code == SW_LID) {
                         log_struct(LOG_INFO,
-                                   "MESSAGE=Lid closed.",
-                                   MESSAGE_ID(SD_MESSAGE_LID_CLOSED),
+                                   LOG_MESSAGE("Lid closed."),
+                                   LOG_MESSAGE_ID(SD_MESSAGE_LID_CLOSED),
                                    NULL);
 
                         b->lid_closed = true;
-                        manager_handle_action(b->manager, INHIBIT_HANDLE_LID_SWITCH, b->manager->handle_lid_switch, b->manager->lid_switch_ignore_inhibited, true);
+                        button_lid_switch_handle_action(b->manager, true);
                         button_install_check_event_source(b);
 
                 } else if (ev.code == SW_DOCK) {
                         log_struct(LOG_INFO,
-                                   "MESSAGE=System docked.",
-                                   MESSAGE_ID(SD_MESSAGE_SYSTEM_DOCKED),
+                                   LOG_MESSAGE("System docked."),
+                                   LOG_MESSAGE_ID(SD_MESSAGE_SYSTEM_DOCKED),
                                    NULL);
 
                         b->docked = true;
@@ -202,8 +216,8 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
 
                 if (ev.code == SW_LID) {
                         log_struct(LOG_INFO,
-                                   "MESSAGE=Lid opened.",
-                                   MESSAGE_ID(SD_MESSAGE_LID_OPENED),
+                                   LOG_MESSAGE("Lid opened."),
+                                   LOG_MESSAGE_ID(SD_MESSAGE_LID_OPENED),
                                    NULL);
 
                         b->lid_closed = false;
@@ -211,8 +225,8 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
 
                 } else if (ev.code == SW_DOCK) {
                         log_struct(LOG_INFO,
-                                   "MESSAGE=System undocked.",
-                                   MESSAGE_ID(SD_MESSAGE_SYSTEM_UNDOCKED),
+                                   LOG_MESSAGE("System undocked."),
+                                   LOG_MESSAGE_ID(SD_MESSAGE_SYSTEM_UNDOCKED),
                                    NULL);
 
                         b->docked = false;
@@ -249,7 +263,7 @@ int button_open(Button *b) {
 
         r = sd_event_add_io(b->manager->event, &b->io_event_source, b->fd, EPOLLIN, button_dispatch, b);
         if (r < 0) {
-                log_error("Failed to add button event: %s", strerror(-r));
+                log_error_errno(-r, "Failed to add button event: %m");
                 goto fail;
         }