[PATCH] udev_volume_id: fix -d option

[elogind.git] / extras / volume_id / udev_volume_id.c

diff --git a/extras/volume_id/udev_volume_id.c b/extras/volume_id/udev_volume_id.c
index 5d1ccf6a89d74c4ce5dce05dc545eee34a61c3ef..7b6985680414837457996c4a298be3a930487c43 100644 (file)
--- a/extras/volume_id/udev_volume_id.c
+++ b/extras/volume_id/udev_volume_id.c
@@ -29,7 +29,7 @@
 #include <sys/ioctl.h>
 
 #include "../../libsysfs/sysfs/libsysfs.h"
-#include "../../udev_lib.h"
+#include "../../udev_utils.h"
 #include "../../logging.h"
 #include "volume_id.h"
 #include "dasdlabel.h"
@@ -37,7 +37,6 @@
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message(int level, const char *format, ...)
 {
        va_list args;
@@ -187,7 +186,7 @@ int main(int argc, char *argv[])
                if (class_dev_parent != NULL)
                        vid = open_classdev(class_dev_parent);
                else
-                       vid = open_classdev(class_dev_parent);
+                       vid = open_classdev(class_dev);
                if (vid == NULL)
                        goto exit;