087 release

[elogind.git] / udev_config.c

diff --git a/udev_config.c b/udev_config.c
index c1af7c12ca8149c11e9981c79d19915d8e9e6d72..204827407d389ff4388d564db77c1a815ede064d 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -28,15 +28,9 @@
 #include <ctype.h>
 #include <syslog.h>
 
-#include "libsysfs/sysfs/libsysfs.h"
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "udev_version.h"
-#include "logging.h"
 
 /* global variables */
-char sysfs_path[PATH_SIZE];
 char udev_root[PATH_SIZE];
 char udev_config_filename[PATH_SIZE];
 char udev_rules_filename[PATH_SIZE];
@@ -142,7 +136,7 @@ static int parse_config_file(void)
                linepos = line;
                retval = get_key(&linepos, &variable, &value);
                if (retval != 0) {
-                       err("error parsing %s, line %d:%d", udev_config_filename, lineno, (int) (linepos-line));
+                       err("error parsing %s, line %d:%d", udev_config_filename, lineno, (int)(linepos-line));
                        continue;
                }
 
@@ -168,7 +162,7 @@ static int parse_config_file(void)
        return retval;
 }
 
-void udev_init_config(void)
+void udev_config_init(void)
 {
        const char *env;
 
@@ -177,7 +171,6 @@ void udev_init_config(void)
        strcpy(udev_rules_filename, UDEV_RULES_FILE);
        udev_log_priority = LOG_ERR;
        udev_run = 1;
-       sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
 
        /* disable RUN key execution */
        env = getenv("UDEV_RUN");
@@ -202,7 +195,6 @@ void udev_init_config(void)
        if (env)
                udev_log_priority = log_priority(env);
 
-       dbg("sysfs_path='%s'", sysfs_path);
        dbg("UDEV_CONFIG_FILE='%s'", udev_config_filename);
        dbg("udev_root='%s'", udev_root);
        dbg("udev_rules='%s'", udev_rules_filename);