[PATCH] rename LOG to USE_LOG in all places

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 122d34c1a5397b7e85ae20ea3c027eaefac3725d..76de8181d17e6c1fcba9095674477da03ab93988 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -40,7 +40,7 @@
 #include "logging.h"
 
 
-#ifdef LOG
+#ifdef USE_LOG
 void log_message(int level, const char *format, ...)
 {
        va_list args;
@@ -96,7 +96,6 @@ static void asmlinkage sig_handler(int signum)
 
 int main(int argc, char *argv[], char *envp[])
 {
-       struct sigaction act;
        struct sysfs_class_device *class_dev;
        struct sysfs_device *devices_dev;
        struct udevice udev;
@@ -106,6 +105,7 @@ int main(int argc, char *argv[], char *envp[])
        const char *devpath;
        const char *subsystem;
        int managed_event;
+       struct sigaction act;
        int retval = -EINVAL;
 
        if (argc == 2 && strcmp(argv[1], "-V") == 0) {
@@ -152,20 +152,11 @@ int main(int argc, char *argv[], char *envp[])
        /* older kernels passed the SUBSYSTEM only as argument */
        if (!subsystem && argc == 2)
                subsystem = argv[1];
-       udev_init_device(&udev, devpath, subsystem);
 
-       if (!action) {
-               dbg("no action");
-               goto hotplug;
-       }
-
-       if (!subsystem) {
-               dbg("no subsystem");
-               goto hotplug;
-       }
+       udev_init_device(&udev, devpath, subsystem);
 
-       if (!devpath) {
-               dbg("no devpath");
+       if (!action || !subsystem || !devpath) {
+               dbg("action, subsystem or devpath missing");
                goto hotplug;
        }
 
@@ -173,13 +164,13 @@ int main(int argc, char *argv[], char *envp[])
        if (udev_log)
                setenv("UDEV_LOG", "1", 1);
 
-       if ((strncmp(devpath, "/block/", 7) == 0) || (strncmp(devpath, "/class/", 7) == 0)) {
+       if (udev.type == BLOCK || udev.type == CLASS || udev.type == NET) {
                if (strcmp(action, "add") == 0) {
                        /* wait for sysfs and possibly add node */
                        dbg("udev add");
 
                        /* skip subsystems without "dev", but handle net devices */
-                       if (udev.type != 'n' && subsystem_expect_no_dev(udev.subsystem)) {
+                       if (udev.type != NET && subsystem_expect_no_dev(udev.subsystem)) {
                                dbg("don't care about '%s' devices", udev.subsystem);
                                goto hotplug;
                        }
@@ -221,7 +212,7 @@ int main(int argc, char *argv[], char *envp[])
                        if (udev_dev_d)
                                udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
                }
-       } else if ((strncmp(devpath, "/devices/", 9) == 0)) {
+       } else if (udev.type == PHYSDEV) {
                if (strcmp(action, "add") == 0) {
                        /* wait for sysfs */
                        dbg("devices add");
@@ -245,6 +236,7 @@ int main(int argc, char *argv[], char *envp[])
        }
 
 hotplug:
+       udev_cleanup_device(&udev);
        if (udev_hotplug_d && managed_event)
                udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);