fix dbg() callers

[elogind.git] / udev / udevadm-info.c

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index f59c196e02e1796c5c95712edb8e117cbffbc098..624fb01eb43a75ca77fde353d9e7a4713b3f9cfb 100644 (file)
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -32,6 +32,7 @@
 
 static void print_all_attributes(struct udev_device *device, const char *key)
 {
+       struct udev *udev = udev_device_get_udev(device);
        DIR *dir;
        struct dirent *dent;
 
@@ -69,7 +70,7 @@ static void print_all_attributes(struct udev_device *device, const char *key)
                        while (len > 0 && isprint(value[len-1]))
                                len--;
                        if (len > 0) {
-                               dbg(info, "attribute value of '%s' non-printable, skip\n", dent->d_name);
+                               dbg(udev, "attribute value of '%s' non-printable, skip\n", dent->d_name);
                                continue;
                        }
 
@@ -183,13 +184,14 @@ static int stat_device(const char *name, int export, const char *prefix)
 
 static int export_devices(struct udev *udev)
 {
-       struct udev_enumerate *enumerate;
+       struct udev_enumerate *udev_enumerate;
        struct udev_list_entry *list_entry;
 
-       enumerate = udev_enumerate_new_from_subsystems(udev, NULL);
-       if (enumerate == NULL)
+       udev_enumerate = udev_enumerate_new(udev);
+       if (udev_enumerate == NULL)
                return -1;
-       udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(enumerate)) {
+       udev_enumerate_scan_devices(udev_enumerate, NULL);
+       udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(udev_enumerate)) {
                struct udev_device *device;
 
                device = udev_device_new_from_syspath(udev, udev_list_entry_get_name(list_entry));
@@ -199,7 +201,7 @@ static int export_devices(struct udev *udev)
                        udev_device_unref(device);
                }
        }
-       udev_enumerate_unref(enumerate);
+       udev_enumerate_unref(udev_enumerate);
        return 0;
 }
 
@@ -301,7 +303,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                                rc = 2;
                                goto exit;
                        }
-                       /* add /sys if needed */
+                       /* add sys dir if needed */
                        if (strncmp(optarg, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) {
                                util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
                                util_strlcat(path, optarg, sizeof(path));