udevadm: info - use "udev_device"

[elogind.git] / udev / lib / libudev.c

diff --git a/udev/lib/libudev.c b/udev/lib/libudev.c
index 3bcafcd9a6955be02e0c4a4e9d9e0735a7c300df..04ad26c6fbc5ec076eb77ea16ee35bc7758d9823 100644 (file)
--- a/udev/lib/libudev.c
+++ b/udev/lib/libudev.c
@@ -33,7 +33,6 @@
 
 #include "libudev.h"
 #include "libudev-private.h"
-#include "../udev.h"
 
 struct udev {
        int refcount;
@@ -184,24 +183,24 @@ struct udev *udev_new(void)
        if (env != NULL) {
                free(udev->sys_path);
                udev->sys_path = strdup(env);
-               remove_trailing_chars(udev->sys_path, '/');
+               util_remove_trailing_chars(udev->sys_path, '/');
        }
 
        env = getenv("UDEV_RUN");
-       if (env != NULL && !string_is_true(env))
+       if (env != NULL && strcmp(env, "0") == 0)
                udev->run = 0;
 
        env = getenv("UDEV_CONFIG_FILE");
        if (env != NULL) {
                free(config_file);
                config_file = strdup(env);
-               remove_trailing_chars(config_file, '/');
+               util_remove_trailing_chars(config_file, '/');
        }
        if (config_file == NULL)
                goto err;
        f = fopen(config_file, "r");
        if (f != NULL) {
-               char line[LINE_SIZE];
+               char line[UTIL_LINE_SIZE];
                int line_nr = 0;
 
                while (fgets(line, sizeof(line), f)) {
@@ -263,19 +262,19 @@ struct udev *udev_new(void)
                        }
 
                        if (strcasecmp(key, "udev_log") == 0) {
-                               udev->log_priority = log_priority(val);
+                               udev->log_priority = util_log_priority(val);
                                continue;
                        }
                        if (strcasecmp(key, "udev_root") == 0) {
                                free(udev->dev_path);
                                udev->dev_path = strdup(val);
-                               remove_trailing_chars(udev->dev_path, '/');
+                               util_remove_trailing_chars(udev->dev_path, '/');
                                continue;
                        }
                        if (strcasecmp(key, "udev_rules") == 0) {
                                free(udev->rules_path);
                                udev->rules_path = strdup(val);
-                               remove_trailing_chars(udev->rules_path, '/');
+                               util_remove_trailing_chars(udev->rules_path, '/');
                                continue;
                        }
                }
@@ -286,12 +285,12 @@ struct udev *udev_new(void)
        if (env != NULL) {
                free(udev->dev_path);
                udev->dev_path = strdup(env);
-               remove_trailing_chars(udev->dev_path, '/');
+               util_remove_trailing_chars(udev->dev_path, '/');
        }
 
        env = getenv("UDEV_LOG");
        if (env != NULL)
-               udev->log_priority = log_priority(env);
+               udev->log_priority = util_log_priority(env);
 
        if (udev->dev_path == NULL || udev->sys_path == NULL)
                goto err;