SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libudev: enumerate_get_devices_list -> enumerate_get_list

Browse Source
This commit is contained in:
Kay Sievers
2008-09-26 19:41:50 +02:00
parent 04f5d75f0c
commit cd42b50d86
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TODO
+2 -1
View File
@@ -1,10 +1,11 @@
o enumerate() - add buses and drivers
o increase ressize buffer
o lazy loading of "uevent" and db
o lazy init of selinux
o add DVB variables to kernel, and drop shell script rule
o add watershed extra
o lazy init of selinux
o replace list.h with ccan list.h which is gpl-v2-or-later version
o get all distros to agree on a default set of rules
o rework rules to a match-action list, instead of a rules array
udev/lib/exported_symbols
+1 -1
View File
@@ -33,7 +33,7 @@ udev_device_get_attr_value
udev_enumerate_new_from_subsystems
udev_enumerate_ref
udev_enumerate_unref
udev_enumerate_get_devices_list
udev_enumerate_get_list
udev_monitor_new_from_socket
udev_monitor_new_from_netlink
udev_monitor_enable_receiving
udev/lib/libudev-device.c
+3 -4
View File
@@ -118,7 +118,6 @@ static int device_read_db(struct udev_device *udev_device)
char target[UTIL_PATH_SIZE];
int target_len;
info(udev_device->udev, "found a symlink as db file\n");
target_len = readlink(filename, target, sizeof(target));
if (target_len > 0)
target[target_len] = '\0';
@@ -126,9 +125,9 @@ static int device_read_db(struct udev_device *udev_device)
info(udev_device->udev, "error reading db link %s: %s\n", filename, strerror(errno));
return -1;
}
dbg(udev_device->udev, "db link points to '%s'\n", target);
if (asprintf(&udev_device->devname, "%s/%s", udev_get_dev_path(udev_device->udev), target) < 0)
return -ENOMEM;
info(udev_device->udev, "device %p filled with db symlink data '%s'\n", udev_device, udev_device->devname);
return 0;
}
@@ -176,7 +175,7 @@ static int device_read_db(struct udev_device *udev_device)
}
fclose(f);
info(udev_device->udev, "device %p filled with udev database data\n", udev_device);
info(udev_device->udev, "device %p filled with db file data\n", udev_device);
return 0;
}
@@ -272,7 +271,7 @@ struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, de
enumerate = udev_enumerate_new_from_subsystems(udev, NULL);
if (enumerate == NULL)
return NULL;
list = udev_enumerate_get_devices_list(enumerate);
list = udev_enumerate_get_list(enumerate);
while (list != NULL) {
struct udev_device *device_loop;
udev/lib/libudev-enumerate.c
+1 -1
View File
@@ -54,7 +54,7 @@ void udev_enumerate_unref(struct udev_enumerate *udev_enumerate)
free(udev_enumerate);
}
struct udev_list *udev_enumerate_get_devices_list(struct udev_enumerate *udev_enumerate)
struct udev_list *udev_enumerate_get_list(struct udev_enumerate *udev_enumerate)
{
if (udev_enumerate == NULL)
return NULL;
udev/lib/libudev.h
+1 -1
View File
@@ -83,7 +83,7 @@ extern const char *udev_device_get_attr_value(struct udev_device *udev_device, c
extern struct udev_enumerate *udev_enumerate_new_from_subsystems(struct udev *udev, const char *subsystem);
extern struct udev_enumerate *udev_enumerate_ref(struct udev_enumerate *udev_enumerate);
extern void udev_enumerate_unref(struct udev_enumerate *udev_enumerate);
extern struct udev_list *udev_enumerate_get_devices_list(struct udev_enumerate *udev_enumerate);
extern struct udev_list *udev_enumerate_get_list(struct udev_enumerate *udev_enumerate);
/* udev and kernel device events */
extern struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path);
udev/lib/test-libudev.c
+1 -1
View File
@@ -150,7 +150,7 @@ static int test_enumerate(struct udev *udev, const char *subsystem)
enumerate = udev_enumerate_new_from_subsystems(udev, NULL);
if (enumerate == NULL)
return -1;
list = udev_enumerate_get_devices_list(enumerate);
list = udev_enumerate_get_list(enumerate);
while (list != NULL) {
struct udev_device *device;
udev/udevadm-info.c
+8 -8
View File
@@ -192,7 +192,7 @@ static int export_devices(struct udev *udev)
enumerate = udev_enumerate_new_from_subsystems(udev, NULL);
if (enumerate == NULL)
return -1;
list = udev_enumerate_get_devices_list(enumerate);
list = udev_enumerate_get_list(enumerate);
while (list != NULL) {
struct udev_device *device;
@@ -375,18 +375,18 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
goto exit;
case 'h':
printf("Usage: udevadm info OPTIONS\n"
" --query=<type> query database for the specified value:\n"
" --query=<type> query device information:\n"
" name name of device node\n"
" symlink pointing to node\n"
" path sysfs device path\n"
" path sys device path\n"
" env the device related imported environment\n"
" all all values\n"
" --path=<devpath> sysfs device path used for query or chain\n"
" --name=<name> node or symlink name used for query\n"
" --root prepend to query result or print udev_root\n"
" --attribute-walk print all key matches while walking along chain\n"
" --path=<syspath> sys device path used for query or attribute walk\n"
" --name=<name> node or symlink name used for query or attribute walk\n"
" --root prepend dev directory to path names\n"
" --attribute-walk print all key matches while walking along the chain\n"
" of parent devices\n"
" --device-id-of-file=<file> print major/minor of underlying device\n"
" --device-id-of-file=<file> print major:minor of device containing this file\n"
" --export-db export the content of the udev database\n"
" --help print this text\n"
"\n");