util: rework strappenda(), and rename it strjoina()

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

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index d2cc43084538f33e42ab2a9d842fccf64fe9538f..d7211e66ce4d70829790636d1c895669a0b35ac6 100644 (file)
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -247,23 +247,21 @@ int button_open(Button *b) {
                 b->fd = -1;
         }
 
-        p = strappenda("/dev/input/", b->name);
+        p = strjoina("/dev/input/", b->name);
 
         b->fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK);
-        if (b->fd < 0) {
-                log_warning("Failed to open %s: %m", b->name);
-                return -errno;
-        }
+        if (b->fd < 0)
+                return log_warning_errno(errno, "Failed to open %s: %m", b->name);
 
         if (ioctl(b->fd, EVIOCGNAME(sizeof(name)), name) < 0) {
-                log_error("Failed to get input name: %m");
+                log_error_errno(errno, "Failed to get input name: %m");
                 r = -errno;
                 goto fail;
         }
 
         r = sd_event_add_io(b->manager->event, &b->io_event_source, b->fd, EPOLLIN, button_dispatch, b);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add button event: %m");
+                log_error_errno(r, "Failed to add button event: %m");
                 goto fail;
         }