[PATCH] remove unused variables

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index e71cddd3eee3cfd5f47d8ba892c832713f38aaa9..847cc5dade49bdf177082e5f8a4ae88110e70c9d 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -33,7 +33,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_sysfs.h"
 #include "udev_version.h"
 #include "namedev.h"
@@ -108,7 +108,6 @@ int main(int argc, char *argv[], char *envp[])
        udev_init_config();
 
        /* set signal handlers */
-       memset(&act, 0x00, sizeof(act));
        act.sa_handler = (void (*) (int))sig_handler;
        sigemptyset (&act.sa_mask);
        act.sa_flags = 0;
@@ -120,7 +119,7 @@ int main(int argc, char *argv[], char *envp[])
        /* trigger timeout to interrupt blocking syscalls */
        alarm(ALARM_TIMEOUT);
 
-       udev_set_values(&udev, devpath, subsystem, action);
+       udev_init_device(&udev, devpath, subsystem);
 
        if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
                dbg("udevstart");
@@ -157,11 +156,11 @@ int main(int argc, char *argv[], char *envp[])
                        /* wait for sysfs and possibly add node */
                        dbg("udev add");
 
-                       /* skip blacklisted subsystems */
+                       /* skip subsystems without "dev", but handle net devices */
                        if (udev.type != 'n' && subsystem_expect_no_dev(udev.subsystem)) {
                                dbg("don't care about '%s' devices", udev.subsystem);
                                goto hotplug;
-                       };
+                       }
 
                        snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
                        class_dev = wait_class_device_open(path);
@@ -179,30 +178,25 @@ int main(int argc, char *argv[], char *envp[])
                        /* name, create node, store in db */
                        retval = udev_add_device(&udev, class_dev);
 
-                       /* run dev.d/ scripts if we created a node or changed a netif name */
-                       if (udev.devname[0] != '\0') {
-                               setenv("DEVNAME", udev.devname, 1);
-                               dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
-                       }
-
                        sysfs_close_class_device(class_dev);
                } else if (strcmp(action, "remove") == 0) {
                        /* possibly remove a node */
                        dbg("udev remove");
 
+                       /* skip subsystems without "dev" */
+                       if (subsystem_expect_no_dev(udev.subsystem)) {
+                               dbg("don't care about '%s' devices", udev.subsystem);
+                               goto hotplug;
+                       }
+
                        /* get node from db, remove db-entry, delete created node */
                        retval = udev_remove_device(&udev);
+               }
 
-                       /* Set the DEVNAME if known */
-                       if (udev.devname[0] != '\0') {
-                               setenv("DEVNAME", udev.devname, 1);
-                       }
-                       /* run dev.d/ scripts if we're not instructed to ignore the event */
-                       if (udev.devname[0] != '\0') {
-                               setenv("DEVNAME", udev.devname, 1);
-                               dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
-                       }
-
+               /* run dev.d/ scripts if we created/deleted a node or changed a netif name */
+               if (udev_dev_d && udev.devname[0] != '\0') {
+                       setenv("DEVNAME", udev.devname, 1);
+                       udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
                }
        } else if ((strncmp(devpath, "/devices/", 9) == 0)) {
                if (strcmp(action, "add") == 0) {
@@ -228,8 +222,8 @@ int main(int argc, char *argv[], char *envp[])
        }
 
 hotplug:
-       if (manage_hotplug_event())
-               dev_d_execute(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
+       if (udev_hotplug_d && manage_hotplug_event())
+               udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
 
 exit:
        logging_close();