From e345e2670a8c17f5e1145cc554b7a7646e271032 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 26 Sep 2008 19:44:53 +0200 Subject: libudev: rework list handling --- udev/udevadm-info.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'udev/udevadm-info.c') diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c index 2f41b7adf7..f9e2bb207c 100644 --- a/udev/udevadm-info.c +++ b/udev/udevadm-info.c @@ -152,14 +152,14 @@ static void print_record(struct udev_device *device) list = udev_device_get_devlinks_list(device); while (list != NULL) { len = strlen(udev_get_dev_path(udev_device_get_udev(device))); - printf("S: %s\n", &udev_list_get_name(list)[len+1]); - list = udev_list_get_next(list); + printf("S: %s\n", &udev_list_entry_get_name(list)[len+1]); + list = udev_list_entry_get_next(list); } list = udev_device_get_properties_list(device); while (list != NULL) { - printf("E: %s=%s\n", udev_list_get_name(list), udev_list_get_value(list)); - list = udev_list_get_next(list); + printf("E: %s=%s\n", udev_list_entry_get_name(list), udev_list_entry_get_value(list)); + list = udev_list_entry_get_next(list); } printf("\n"); @@ -196,13 +196,13 @@ static int export_devices(struct udev *udev) while (list != NULL) { struct udev_device *device; - device = udev_device_new_from_syspath(udev, udev_list_get_name(list)); + device = udev_device_new_from_syspath(udev, udev_list_entry_get_name(list)); if (device != NULL) { if (udev_device_get_devnode(device) != NULL) print_record(device); udev_device_unref(device); } - list = udev_list_get_next(list); + list = udev_list_entry_get_next(list); } udev_enumerate_unref(enumerate); return 0; @@ -419,14 +419,14 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) list = udev_device_get_devlinks_list(device); while (list != NULL) { if (root) { - printf("%s", udev_list_get_name(list)); + printf("%s", udev_list_entry_get_name(list)); } else { size_t len; len = strlen(udev_get_dev_path(udev_device_get_udev(device))); - printf("%s", &udev_list_get_name(list)[len+1]); + printf("%s", &udev_list_entry_get_name(list)[len+1]); } - list = udev_list_get_next(list); + list = udev_list_entry_get_next(list); if (list != NULL) printf(" "); } @@ -438,8 +438,8 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) case QUERY_ENV: list = udev_device_get_properties_list(device); while (list != NULL) { - printf("%s=%s\n", udev_list_get_name(list), udev_list_get_value(list)); - list = udev_list_get_next(list); + printf("%s=%s\n", udev_list_entry_get_name(list), udev_list_entry_get_value(list)); + list = udev_list_entry_get_next(list); } break; case QUERY_ALL: -- cgit v1.2.3-54-g00ecf