chiark / gitweb /
sd-event: fix typo
[elogind.git] / src / libsystemd-terminal / idev-evdev.c
index b3e86bfb19679b0b703e546a77c38363de83c78d..91ae507d91485e10baefc848992ed7e03c17e929 100644 (file)
 ***/
 
 #include <fcntl.h>
-#include <inttypes.h>
 #include <libevdev/libevdev.h>
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
-#include <unistd.h>
 #include "bus-util.h"
-#include "hashmap.h"
 #include "idev.h"
 #include "idev-internal.h"
 #include "macro.h"
-#include "udev-util.h"
 #include "util.h"
 
 typedef struct idev_evdev idev_evdev;
@@ -426,15 +422,15 @@ static void unmanaged_evdev_resume(idev_element *e) {
                 fd = open(eu->devnode, O_RDWR | O_CLOEXEC | O_NOCTTY | O_NONBLOCK);
                 if (fd < 0) {
                         if (errno != EACCES && errno != EPERM) {
-                                log_debug("idev-evdev: %s/%s: cannot open node %s: %m",
-                                          e->session->name, e->name, eu->devnode);
+                                log_debug_errno(errno, "idev-evdev: %s/%s: cannot open node %s: %m",
+                                                e->session->name, e->name, eu->devnode);
                                 return;
                         }
 
                         fd = open(eu->devnode, O_RDONLY | O_CLOEXEC | O_NOCTTY | O_NONBLOCK);
                         if (fd < 0) {
-                                log_debug("idev-evdev: %s/%s: cannot open node %s: %m",
-                                          e->session->name, e->name, eu->devnode);
+                                log_debug_errno(errno, "idev-evdev: %s/%s: cannot open node %s: %m",
+                                                e->session->name, e->name, eu->devnode);
                                 return;
                         }
 
@@ -565,7 +561,7 @@ static int managed_evdev_take_device_fn(sd_bus *bus,
 
         fd = fcntl(fd, F_DUPFD_CLOEXEC, 3);
         if (fd < 0) {
-                log_debug("idev-evdev: %s/%s: cannot duplicate evdev fd: %m", s->name, e->name);
+                log_debug_errno(errno, "idev-evdev: %s/%s: cannot duplicate evdev fd: %m", s->name, e->name);
                 return 0;
         }
 
@@ -698,8 +694,8 @@ static void managed_evdev_resume(idev_element *e, int fd) {
 
         fd = fcntl(fd, F_DUPFD_CLOEXEC, 3);
         if (fd < 0) {
-                log_debug("idev-evdev: %s/%s: cannot duplicate evdev fd: %m",
-                          s->name, e->name);
+                log_debug_errno(errno, "idev-evdev: %s/%s: cannot duplicate evdev fd: %m",
+                                s->name, e->name);
                 return;
         }