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;
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;
}
}
}
/**
- * udev_devices_enumerate:
+ * udev_enumerate_devices:
* @udev_device: udev device
* @cb: function to be called for every property found
* @data: data to be passed to the function
*
* Returns: the number of properties passed to the caller, or a negative value on error
**/
-int udev_devices_enumerate(struct udev *udev, const char *subsystem,
+int udev_enumerate_devices(struct udev *udev, const char *subsystem,
int (*cb)(struct udev *udev,
const char *devpath, const char *subsystem, const char *name, void *data),
void *data)
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);