allow programs in /lib/udev called without the path

[elogind.git] / udev_device.c

diff --git a/udev_device.c b/udev_device.c
index 45bb6a28765ab39cb88ed51136c53a66e1a5641d..7821c91cb44a0e0d90efa797ccf7138028c97240 100644 (file)
--- a/udev_device.c
+++ b/udev_device.c
@@ -37,7 +37,6 @@
 #include "udev.h"
 #include "logging.h"
 #include "udev_utils.h"
-#include "udev_sysfs.h"
 #include "list.h"
 
 
@@ -58,7 +57,7 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
 
        if (devpath) {
                strlcpy(udev->devpath, devpath, sizeof(udev->devpath));
-               remove_trailing_char(udev->devpath, '/');
+               remove_trailing_chars(udev->devpath, '/');
 
                if (strncmp(udev->devpath, "/block/", 7) == 0)
                        udev->type = DEV_BLOCK;
@@ -103,19 +102,7 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
 
 void udev_cleanup_device(struct udevice *udev)
 {
-       struct name_entry *name_loop;
-       struct name_entry *temp_loop;
-
-       list_for_each_entry_safe(name_loop, temp_loop, &udev->symlink_list, node) {
-               list_del(&name_loop->node);
-               free(name_loop);
-       }
-       list_for_each_entry_safe(name_loop, temp_loop, &udev->run_list, node) {
-               list_del(&name_loop->node);
-               free(name_loop);
-       }
-       list_for_each_entry_safe(name_loop, temp_loop, &udev->env_list, node) {
-               list_del(&name_loop->node);
-               free(name_loop);
-       }
+       name_list_cleanup(&udev->symlink_list);
+       name_list_cleanup(&udev->run_list);
+       name_list_cleanup(&udev->env_list);
 }