From cd42b50d866c35c7ffbab07920dc1323dd978a23 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 26 Sep 2008 19:41:50 +0200 Subject: [PATCH] libudev: enumerate_get_devices_list -> enumerate_get_list --- TODO | 3 ++- udev/lib/exported_symbols | 2 +- udev/lib/libudev-device.c | 7 +++---- udev/lib/libudev-enumerate.c | 2 +- udev/lib/libudev.h | 2 +- udev/lib/test-libudev.c | 2 +- udev/udevadm-info.c | 16 ++++++++-------- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/TODO b/TODO index 17baf635..b61b7524 100644 --- a/TODO +++ b/TODO @@ -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 diff --git a/udev/lib/exported_symbols b/udev/lib/exported_symbols index e46aecbd..9650ef4d 100644 --- a/udev/lib/exported_symbols +++ b/udev/lib/exported_symbols @@ -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 diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c index 359ae443..6c6b1d38 100644 --- a/udev/lib/libudev-device.c +++ b/udev/lib/libudev-device.c @@ -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; diff --git a/udev/lib/libudev-enumerate.c b/udev/lib/libudev-enumerate.c index 80df8bd7..6d638670 100644 --- a/udev/lib/libudev-enumerate.c +++ b/udev/lib/libudev-enumerate.c @@ -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; diff --git a/udev/lib/libudev.h b/udev/lib/libudev.h index 014b5317..d2e57d41 100644 --- a/udev/lib/libudev.h +++ b/udev/lib/libudev.h @@ -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); diff --git a/udev/lib/test-libudev.c b/udev/lib/test-libudev.c index 421d0511..19968a17 100644 --- a/udev/lib/test-libudev.c +++ b/udev/lib/test-libudev.c @@ -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; diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c index 6a042576..2f41b7ad 100644 --- a/udev/udevadm-info.c +++ b/udev/udevadm-info.c @@ -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= query database for the specified value:\n" + " --query= 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= sysfs device path used for query or chain\n" - " --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= sys device path used for query or attribute walk\n" + " --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= print major/minor of underlying device\n" + " --device-id-of-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"); -- 2.39.5