diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-10-23 18:26:06 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-10-23 18:29:25 +0900 |
| commit | d354690e7d0429338cdd1c2cfe1fdd08fc53da9e (patch) | |
| tree | d973cacc0865e3ddcb222692459bc8d887ebfa09 /src/udev/udev-builtin-keyboard.c | |
| parent | 45a73f4be32481eacdb652c0869d69025fab354c (diff) | |
| download | systemd-d354690e7d0429338cdd1c2cfe1fdd08fc53da9e.tar.gz | |
udev-builtin: propagate negative errno
Diffstat (limited to 'src/udev/udev-builtin-keyboard.c')
| -rw-r--r-- | src/udev/udev-builtin-keyboard.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c index 79d9826621..728daa02d8 100644 --- a/src/udev/udev-builtin-keyboard.c +++ b/src/udev/udev-builtin-keyboard.c @@ -195,8 +195,7 @@ static int builtin_keyboard(sd_device *dev, int argc, char *argv[], bool test) { const char *s = NULL; (void) sd_device_get_syspath(dev, &s); - log_error_errno(r, "No device node for \"%s\": %m", strnull(s)); - return EXIT_FAILURE; + return log_error_errno(r, "No device node for \"%s\": %m", strnull(s)); } FOREACH_DEVICE_PROPERTY(dev, key, value) { @@ -228,7 +227,7 @@ static int builtin_keyboard(sd_device *dev, int argc, char *argv[], bool test) { if (fd == -1) { fd = open_device(node); if (fd < 0) - return EXIT_FAILURE; + return fd; } map_keycode(fd, node, scancode, keycode); @@ -245,7 +244,7 @@ static int builtin_keyboard(sd_device *dev, int argc, char *argv[], bool test) { if (fd == -1) { fd = open_device(node); if (fd < 0) - return EXIT_FAILURE; + return fd; } if (has_abs == -1) { @@ -253,10 +252,8 @@ static int builtin_keyboard(sd_device *dev, int argc, char *argv[], bool test) { int rc; rc = ioctl(fd, EVIOCGBIT(0, sizeof(bits)), &bits); - if (rc < 0) { - log_error_errno(errno, "Unable to EVIOCGBIT device \"%s\"", node); - return EXIT_FAILURE; - } + if (rc < 0) + return log_error_errno(errno, "Unable to EVIOCGBIT device \"%s\"", node); has_abs = !!(bits & (1 << EV_ABS)); if (!has_abs) @@ -275,7 +272,7 @@ static int builtin_keyboard(sd_device *dev, int argc, char *argv[], bool test) { if (release_count > 0) install_force_release(dev, release, release_count); - return EXIT_SUCCESS; + return 0; } const struct udev_builtin udev_builtin_keyboard = { |