From: Kay Sievers <kay.sievers@vrfy.org>
Date: Mon, 23 Jan 2012 04:21:13 +0000 (+0100)
Subject: move variable inside condition
X-Git-Tag: 179~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7ef118174332ae98cb80763b0dfb97823e6a395;p=systemd

move variable inside condition
---

diff --git a/src/udev-event.c b/src/udev-event.c
index 227c1862..0b6db30e 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]);
                         }