X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibudev-device.c;h=10f28b8cd5bb5a4a4fb40067d2f4cfdd3b1155d3;hp=a3356cfd18bba8b09f5c22624480925404aa67ab;hb=0ecfcbd4f758f9ff10926156eb8c7a7542650627;hpb=912541b0246ef315d4d851237483b98c9dd3f992

diff --git a/src/libudev-device.c b/src/libudev-device.c
index a3356cfd1..10f28b8cd 100644
--- a/src/libudev-device.c
+++ b/src/libudev-device.c
@@ -548,16 +548,23 @@ int udev_device_read_uevent_file(struct udev_device *udev_device)
                         continue;
                 pos[0] = '\0';
 
-                if (strncmp(line, "DEVTYPE=", 8) == 0)
+                if (strncmp(line, "DEVTYPE=", 8) == 0) {
                         udev_device_set_devtype(udev_device, &line[8]);
-                else if (strncmp(line, "MAJOR=", 6) == 0)
+                        continue;
+                }
+                if (strncmp(line, "IFINDEX=", 8) == 0) {
+                        udev_device_set_ifindex(udev_device, strtoull(&line[8], NULL, 10));
+                        continue;
+                }
+                if (strncmp(line, "DEVNAME=", 8) == 0) {
+                        udev_device_set_devnode(udev_device, &line[8]);
+                        continue;
+                }
+
+                if (strncmp(line, "MAJOR=", 6) == 0)
                         maj = strtoull(&line[6], NULL, 10);
                 else if (strncmp(line, "MINOR=", 6) == 0)
                         min = strtoull(&line[6], NULL, 10);
-                else if (strncmp(line, "IFINDEX=", 8) == 0)
-                        udev_device_set_ifindex(udev_device, strtoull(&line[8], NULL, 10));
-                else if (strncmp(line, "DEVNAME=", 8) == 0)
-                        udev_device_set_devnode(udev_device, &line[8]);
                 else if (strncmp(line, "DEVMODE=", 8) == 0)
                         udev_device->devnode_mode = strtoul(&line[8], NULL, 8);