From accc92a8ad48f6f941caa5d3281064d7e67a3115 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 20 Mar 2015 12:48:24 +1000 Subject: udev: builtin-keyboard: move fetching the device node up No point parsing the properties if we can't get the devnode to apply them later. Plus, this makes future additions easier to slot in. Signed-off-by: Anthony G. Basile --- src/udev/udev-builtin-keyboard.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/udev/udev-builtin-keyboard.c') diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c index d8ee4cbb61..bde7bf07fb 100644 --- a/src/udev/udev-builtin-keyboard.c +++ b/src/udev/udev-builtin-keyboard.c @@ -75,6 +75,13 @@ static int builtin_keyboard(struct udev_device *dev, int argc, char *argv[], boo unsigned map_count = 0; unsigned release[1024]; unsigned release_count = 0; + const char *node; + + node = udev_device_get_devnode(dev); + if (!node) { + log_error("Error, no device node for '%s'", udev_device_get_syspath(dev)); + return EXIT_FAILURE; + } udev_list_entry_foreach(entry, udev_device_get_properties_list_entry(dev)) { const char *key; @@ -128,17 +135,10 @@ static int builtin_keyboard(struct udev_device *dev, int argc, char *argv[], boo } if (map_count > 0 || release_count > 0) { - const char *node; int fd; unsigned i; - node = udev_device_get_devnode(dev); - if (!node) { - log_error("Error, no device node for '%s'", udev_device_get_syspath(dev)); - return EXIT_FAILURE; - } - - fd = open(udev_device_get_devnode(dev), O_RDWR|O_CLOEXEC|O_NONBLOCK|O_NOCTTY); + fd = open(node, O_RDWR|O_CLOEXEC|O_NONBLOCK|O_NOCTTY); if (fd < 0) { log_error_errno(errno, "Error, opening device '%s': %m", node); return EXIT_FAILURE; -- cgit v1.2.3-54-g00ecf