fsckd: the error code is actually returned in 'fd'

[elogind.git] / src / libsystemd-terminal / idev.c

diff --git a/src/libsystemd-terminal/idev.c b/src/libsystemd-terminal/idev.c
index e979b608b64d4ae6caea5c16238767956994e47a..44be7c30d2c1919fa87aa182f7814e5cee597b71 100644 (file)
--- a/src/libsystemd-terminal/idev.c
+++ b/src/libsystemd-terminal/idev.c
@@ -19,21 +19,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <inttypes.h>
 #include <libudev.h>
-#include <linux/input.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
-#include <systemd/sd-login.h>
-#include <xkbcommon/xkbcommon.h>
 #include "hashmap.h"
 #include "idev.h"
 #include "idev-internal.h"
 #include "login-shared.h"
 #include "macro.h"
-#include "udev-util.h"
 #include "util.h"
 
 static void element_open(idev_element *e);
@@ -351,8 +346,8 @@ static int session_add_device(idev_session *s, idev_device *d) {
 
 error:
         if (r < 0)
-                log_debug("idev: %s: error while adding device '%s': %s",
-                          s->name, d->name, strerror(-r));
+                log_debug_errno(r, "idev: %s: error while adding device '%s': %m",
+                                s->name, d->name);
         return r;
 }
 
@@ -372,8 +367,8 @@ static int session_remove_device(idev_session *s, idev_device *d) {
         idev_device_disable(d);
 
         if (error < 0)
-                log_debug("idev: %s: error while removing device '%s': %s",
-                          s->name, d->name, strerror(-error));
+                log_debug_errno(error, "idev: %s: error while removing device '%s': %m",
+                                s->name, d->name);
         idev_device_free(d);
         return error;
 }
@@ -420,8 +415,8 @@ static int session_remove_element(idev_session *s, idev_element *e) {
         element_disable(e);
 
         if (error < 0)
-                log_debug("idev: %s: error while removing element '%s': %s",
-                          s->name, e->name, strerror(-r));
+                log_debug_errno(r, "idev: %s: error while removing element '%s': %m",
+                                s->name, e->name);
         idev_element_free(e);
         return error;
 }