From a7ef118174332ae98cb80763b0dfb97823e6a395 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 23 Jan 2012 05:21:13 +0100 Subject: move variable inside condition --- src/udev-event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/udev-event.c b/src/udev-event.c index 227c186236..0b6db30eda 100644 --- a/src/udev-event.c +++ b/src/udev-event.c @@ -347,12 +347,12 @@ subst: l = util_strpcpy(&s, l, udev_device_get_devnode(dev)); break; case SUBST_NAME: { - size_t devlen = strlen(udev_get_dev_path(event->udev))+1; - if (event->name != NULL) { l = util_strpcpy(&s, l, event->name); dbg(event->udev, "substitute custom name '%s'\n", event->name); } else { + size_t devlen = strlen(udev_get_dev_path(event->udev))+1; + l = util_strpcpy(&s, l, &udev_device_get_devnode(dev)[devlen]); dbg(event->udev, "substitute name'%s'\n", &udev_device_get_devnode(dev)[devlen]); } -- cgit v1.2.3-54-g00ecf