X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-button.c;h=d7211e66ce4d70829790636d1c895669a0b35ac6;hb=1433efd219a6df414a1821b3d3d70d86201ed3e4;hp=1afb01fc6838db375eb5933081e9e7b083f67ded;hpb=56f64d95763a799ba4475daf44d8e9f72a1bd474;p=elogind.git

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 1afb01fc6..d7211e66c 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -247,13 +247,11 @@ 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_errno(errno, "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_errno(errno, "Failed to get input name: %m");