X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-info.c;h=14baa6accb79c979e984f267623d649a6bec6806;hp=d95091c4a43edae87d1052eaba8cd5f92556b719;hb=88cbfb09ee5510277503ff1830ecc3aa6c380b00;hpb=78715f65c92a8892960e2a5fce945496939f8599

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index d95091c4a..14baa6acc 100644
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -142,18 +142,6 @@ static void print_record(struct udev_device *device)
 	if (i != 0)
 		printf("L: %i\n", i);
 
-	i = udev_device_get_num_fake_partitions(device);
-	if (i != 0)
-		printf("A: %u\n", i);
-
-	i = udev_device_get_ignore_remove(device);
-	if (i != 0)
-		printf("R: %u\n", i);
-
-	i = udev_device_get_watch_handle(device);
-	if (i >= 0)
-		printf("W: %u\n", i);
-
 	udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(device)) {
 		len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
 		printf("S: %s\n", &udev_list_entry_get_name(list_entry)[len+1]);
@@ -250,7 +238,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		QUERY_ALL,
 	} query = QUERY_NONE;
 
-	while (1) {
+	for (;;) {
 		int option;
 		struct stat statbuf;
 
@@ -388,23 +376,24 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		}
 
 		switch(query) {
-		case QUERY_NAME:
+		case QUERY_NAME: {
+			const char *node = udev_device_get_devnode(device);
+
+			if (node == NULL) {
+				fprintf(stderr, "no device node found\n");
+				rc = 5;
+				goto exit;
+			}
+
 			if (root) {
 				printf("%s\n", udev_device_get_devnode(device));
 			} else {
-				size_t len;
-				const char *node;
-
-				len = strlen(udev_get_dev_path(udev));
-				node = udev_device_get_devnode(device);
-				if (node == NULL) {
-					fprintf(stderr, "no device node found\n");
-					rc = 5;
-					goto exit;
-				}
-					printf("%s\n", &udev_device_get_devnode(device)[len+1]);
+				size_t len = strlen(udev_get_dev_path(udev));
+
+				printf("%s\n", &udev_device_get_devnode(device)[len+1]);
 			}
 			break;
+		}
 		case QUERY_SYMLINK:
 			list_entry = udev_device_get_devlinks_list_entry(device);
 			while (list_entry != NULL) {