X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=udev%2Flib%2Flibudev-enumerate.c;h=6aa04d8f9b4c1e547cf6f22334435413a21fbcca;hb=7d563a17f3967890331daf08d43f2f005418139b;hp=e3198665fc6b545a0807caa12949f7fbc13ffaeb;hpb=cf8ec631a23eae532541bfeeccce20f0d978404d;p=elogind.git

diff --git a/udev/lib/libudev-enumerate.c b/udev/lib/libudev-enumerate.c
index e3198665f..6aa04d8f9 100644
--- a/udev/lib/libudev-enumerate.c
+++ b/udev/lib/libudev-enumerate.c
@@ -58,8 +58,8 @@ static int devices_scan_subsystem(struct udev *udev,
 		strlcpy(devpath, &path[len], sizeof(devpath));
 		strlcat(devpath, "/", sizeof(devpath));
 		strlcat(devpath, dent->d_name, sizeof(devpath));
-		sysfs_resolve_link(devpath, sizeof(devpath));
-		name_list_add(device_list, devpath, 1);
+		sysfs_resolve_link(udev, devpath, sizeof(devpath));
+		name_list_add(udev, device_list, devpath, 1);
 	}
 	closedir(dir);
 	return 0;
@@ -101,7 +101,7 @@ static int devices_delay(struct udev *udev, const char *devpath)
 
 	for (i = 0; delay_device_list[i] != NULL; i++) {
 		if (strstr(devpath, delay_device_list[i]) != NULL) {
-			log_info(udev, "delaying: %s\n", devpath);
+			info(udev, "delaying: %s\n", devpath);
 			return 1;
 		}
 	}
@@ -158,7 +158,7 @@ int udev_devices_enumerate(struct udev *udev, const char *subsystem,
 	INIT_LIST_HEAD(&device_list);
 
 	/* if we have /sys/subsystem/, forget all the old stuff */
-	strlcpy(base, sysfs_path, sizeof(base));
+	strlcpy(base, udev_get_sys_path(udev), sizeof(base));
 	strlcat(base, "/subsystem", sizeof(base));
 	if (stat(base, &statbuf) == 0) {
 		devices_scan_subsystems(udev, "/subsystem", subsystem, "/devices", &device_list);