[PATCH] update the TODO list as we already have a devfs config file.

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 1c65f2e59c5063753fc92e7c5cb5a134c22ddc1f..4ae46845368e6880e72381466133c7cfaae46554 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -41,9 +41,9 @@ char **main_envp;
 
 #ifdef LOG
 unsigned char logname[42];
-void log_message (int level, const char *format, ...)
+void log_message(int level, const char *format, ...)
 {
-       va_list args;
+       va_list args;
 
        if (!udev_log)
                return;
@@ -67,30 +67,6 @@ static void sig_handler(int signum)
        }
 }
 
-static inline char *get_action(void)
-{
-       char *action;
-
-       action = getenv("ACTION");
-       return action;
-}
-
-static inline char *get_devpath(void)
-{
-       char *devpath;
-
-       devpath = getenv("DEVPATH");
-       return devpath;
-}
-
-static inline char *get_seqnum(void)
-{
-       char *seqnum;
-
-       seqnum = getenv("SEQNUM");
-       return seqnum;
-}
-
 static char *subsystem_blacklist[] = {
        "net",
        "scsi_host",
@@ -100,7 +76,7 @@ static char *subsystem_blacklist[] = {
        "",
 };
 
-static int udev_hotplug(int argc, char **argv)
+static int udev_hotplug(void)
 {
        char *action;
        char *devpath;
@@ -130,7 +106,7 @@ static int udev_hotplug(int argc, char **argv)
        }
 
        /* skip blacklisted subsystems */
-       subsystem = argv[1];
+       subsystem = get_subsystem(main_argv[1]);
        if (!subsystem) {
                dbg("no subsystem?");
                goto exit;
@@ -147,9 +123,6 @@ static int udev_hotplug(int argc, char **argv)
        /* connect to the system message bus */
        sysbus_connect();
 
-       /* initialize our configuration */
-       udev_init_config();
-
        /* initialize udev database */
        retval = udevdb_init(UDEVDB_DEFAULT);
        if (retval != 0) {
@@ -196,9 +169,11 @@ int main(int argc, char **argv, char **envp)
        main_envp = envp;
 
        init_logging("udev");
-       dbg("version %s", UDEV_VERSION);
 
-       return udev_hotplug(argc, argv);
-}
+       /* initialize our configuration */
+       udev_init_config();
 
+       dbg("version %s", UDEV_VERSION);
 
+       return udev_hotplug();
+}