X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-info.c;h=5f6209af2a772666082f7b12e6964666dab173c8;hb=901e80dc593967c5d5e810390722461760177ff8;hp=88bb0d401ff2dcf2f5117b8b7bdd9a53d11e923b;hpb=405c307a72af520a8aba5609112a8c3a2b8a42a3;p=elogind.git

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index 88bb0d401..5f6209af2 100644
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2009 Kay Sievers <kay.sievers@vrfy.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ static void print_all_attributes(struct udev_device *device, const char *key)
 			value = udev_device_get_sysattr_value(device, dent->d_name);
 			if (value == NULL)
 				continue;
-			dbg(udev, "attr '%s'='%s'(%zi)\n", dent->d_name, value, len);
+			dbg(udev, "attr '%s'='%s'\n", dent->d_name, value);
 
 			/* skip nonprintable attributes */
 			len = strlen(value);
@@ -142,14 +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);
@@ -388,23 +380,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) {