[PATCH] udev_volume_id: volume_id version 032

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index 6e6b9aeb3ed572e1b398ca0605f9845c8c4736fd..a80ca82e124ebb45550717bae4b4b469405970a4 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -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"