X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-info.c;h=dbcaaffcdb473b99c835ba37dee21a5f7d0cd8c6;hp=abb424bfea4895596d3d7c2cdf105dca7b8562e8;hb=fb762bb928772f1923fef1e342d8ebca9bf7691f;hpb=a076080bd43d55f0d4eabc9bef2bf46c9791372f diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c index abb424bfe..dbcaaffcd 100644 --- a/udev/udevadm-info.c +++ b/udev/udevadm-info.c @@ -15,8 +15,6 @@ * along with this program. If not, see . */ -#include "config.h" - #include #include #include @@ -150,7 +148,7 @@ static void print_record(struct udev_device *device) printf("P: %s\n", udev_device_get_devpath(device)); len = strlen(udev_get_dev_path(udev_device_get_udev(device))); - printf("N: %s\n", &udev_device_get_devname(device)[len+1]); + printf("N: %s\n", &udev_device_get_devnode(device)[len+1]); i = device_get_devlink_priority(device); if (i != 0) printf("L: %i\n", i); @@ -167,7 +165,7 @@ static void print_record(struct udev_device *device) static int export_all_cb(struct udev_device *device, void *data) { - if (udev_device_get_devname(device) != NULL) + if (udev_device_get_devnode(device) != NULL) print_record(device); return 0; } @@ -438,12 +436,12 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) switch(query) { case QUERY_NAME: if (root) { - printf("%s\n", udev_device_get_devname(device)); + printf("%s\n", udev_device_get_devnode(device)); } else { size_t len; len = strlen(udev_get_dev_path(udev)); - printf("%s\n", &udev_device_get_devname(device)[len+1]); + printf("%s\n", &udev_device_get_devnode(device)[len+1]); } break; case QUERY_SYMLINK: