Merge pull request #16316 from yuwata/backlight-use-actual-brightness

[thirdparty/systemd.git] / src / udev / udev-builtin-keyboard.c

diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
index 2df3d92acf60852ab7c98b360b79d96711619071..bb82e8ae9798f620b21117117b341b420fd7a09c 100644 (file)
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -2,9 +2,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <linux/input.h>
 
@@ -74,7 +72,7 @@ static int map_keycode(sd_device *dev, int fd, int scancode, const char *keycode
                 /* check if it's a numeric code already */
                 keycode_num = strtoul(keycode, &endptr, 0);
                 if (endptr[0] !='\0')
-                        return log_device_error_errno(dev, EINVAL, "Failed to parse key identifier '%s'", keycode);
+                        return log_device_error_errno(dev, SYNTHETIC_ERRNO(EINVAL), "Failed to parse key identifier '%s'", keycode);
         }
 
         map.scan = scancode;
@@ -89,7 +87,7 @@ static int map_keycode(sd_device *dev, int fd, int scancode, const char *keycode
         return 0;
 }
 
-static inline char* parse_token(const char *current, int32_t *val_out) {
+static char* parse_token(const char *current, int32_t *val_out) {
         char *next;
         int32_t val;
 
@@ -152,7 +150,7 @@ static int set_trackpoint_sensitivity(sd_device *dev, const char *value) {
         if (r < 0)
                 return log_device_error_errno(dev, r, "Failed to parse POINTINGSTICK_SENSITIVITY '%s': %m", value);
         else if (val_i < 0 || val_i > 255)
-                return log_device_error_errno(dev, ERANGE, "POINTINGSTICK_SENSITIVITY %d outside range [0..255]", val_i);
+                return log_device_error_errno(dev, SYNTHETIC_ERRNO(ERANGE), "POINTINGSTICK_SENSITIVITY %d outside range [0..255]", val_i);
 
         xsprintf(val_s, "%d", val_i);
 
@@ -193,7 +191,7 @@ static int builtin_keyboard(sd_device *dev, int argc, char *argv[], bool test) {
                                 keycode++;
 
                                 release[release_count] = scancode;
-                                if (release_count <  ELEMENTSOF(release)-1)
+                                if (release_count < ELEMENTSOF(release)-1)
                                         release_count++;
 
                                 if (keycode[0] == '\0')
@@ -251,7 +249,7 @@ static int builtin_keyboard(sd_device *dev, int argc, char *argv[], bool test) {
         return 0;
 }
 
-const struct udev_builtin udev_builtin_keyboard = {
+const UdevBuiltin udev_builtin_keyboard = {
         .name = "keyboard",
         .cmd = builtin_keyboard,
         .help = "Keyboard scan code to key mapping",