X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevinfo.c;h=8ff09da3d1504d7e212ea09a6a7954e72f844de0;hb=aab4c0eebef44c5b67d4c9537f1c5149de3ca9c2;hp=0089df46b651571a11675fee365da8631bad7469;hpb=24ca5c3398eb61380e0add8b9ffac1651a008bb3;p=elogind.git

diff --git a/udevinfo.c b/udevinfo.c
index 0089df46b..8ff09da3d 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -31,7 +31,6 @@
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_version.h"
-#include "udev_db.h"
 #include "logging.h"
 
 
@@ -166,16 +165,16 @@ exit:
 	return retval;
 }
 
-static void dump_name_devpath(struct udevice *udev) {
+static void export_name_devpath(struct udevice *udev) {
 	printf("%s=%s/%s\n", udev->devpath, udev_root, udev->name);
 }
 
-static void dump_record(struct udevice *udev) {
+static void export_record(struct udevice *udev) {
 	print_record(udev);
 	printf("\n");
 }
 
-static void dump_db(void fnct(struct udevice *udev)) {
+static void export_db(void fnct(struct udevice *udev)) {
 	LIST_HEAD(name_list);
 	struct name_entry *name_loop;
 
@@ -204,10 +203,9 @@ static void print_help(void)
 	       "  -p PATH  sysfs device path used for query or chain\n"
 	       "  -n NAME  node/symlink name used for query\n"
 	       "\n"
-	       "  -r       print udev root\n"
+	       "  -r       prepend to query result or print udev_root\n"
 	       "  -a       print all SYSFS_attributes along the device chain\n"
-	       "  -d       print the relationship of devpath and the node name for all\n"
-	       "  -e       print the content of the udev database\n"
+	       "  -e       export the content of the udev database\n"
 	       "  -V       print udev version\n"
 	       "  -h       print this help text\n"
 	       "\n");
@@ -299,10 +297,10 @@ int main(int argc, char *argv[], char *envp[])
 			action = ACTION_ATTRIBUTE_WALK;
 			break;
 		case 'd':
-			dump_db(dump_name_devpath);
+			export_db(export_name_devpath);
 			goto exit;
 		case 'e':
-			dump_db(dump_record);
+			export_db(export_record);
 			goto exit;
 		case 'V':
 			printf("udevinfo, version %s\n", UDEV_VERSION);