X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=a80ca82e124ebb45550717bae4b4b469405970a4;hp=9ba302cbdc2c5e6afda8e0102822efe423a54a2c;hb=c7a84d7556531f93c7f47f2bd9c820418cdad5d9;hpb=0d1ecb44a0b8c00b0fc6314d19e1bc8efd0f32bb

diff --git a/udevinfo.c b/udevinfo.c
index 9ba302cbd..a80ca82e1 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -30,7 +30,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "libsysfs/dlist.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "udev_db.h"
 #include "logging.h"
@@ -39,7 +39,6 @@
 #define SYSFS_VALUE_SIZE		256
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
 	va_list	args;
@@ -219,8 +218,8 @@ static int print_sysfs_devices(void)
 			attr = sysfs_get_classdev_attr(class_dev, "dev");
 			if (attr) {
 				sscanf(attr->value, "%u:%u", &major, &minor);
-				printf("MAJOR          %u\n", minor);
-				printf("MINOR          %u\n", major);
+				printf("MAJOR          %u\n", major);
+				printf("MINOR          %u\n", minor);
 			}
 
 			phys_dev = sysfs_get_classdev_device(class_dev);
@@ -242,7 +241,7 @@ static int print_sysfs_devices(void)
 
 static int process_options(int argc, char *argv[])
 {
-	static const char short_options[] = "adn:p:q:rsVh";
+	static const char short_options[] = "an:p:q:rsVh";
 	int option;
 	int retval = 1;
 	struct udevice udev;
@@ -439,7 +438,7 @@ exit:
 	}
 
 help:
-	printf("Usage: [-anpqrdVh]\n"
+	printf("Usage: udevinfo [-anpqrVh]\n"
 	       "  -q TYPE  query database for the specified value:\n"
 	       "             'name'    name of device node\n"
 	       "             'symlink' pointing to node\n"