move syslog wrapper to libudev

[elogind.git] / extras / cdrom_id / cdrom_id.c

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 921e5346c920f2d10d168c9e97c58d4e196af3be..d4156ce7ac310586f90e5c28ef924353d3bb9f6a 100644 (file)
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -37,7 +37,8 @@
 #include <sys/ioctl.h>
 #include <linux/cdrom.h>
 
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
 
 static int debug;
 
@@ -528,7 +529,7 @@ int main(int argc, char *argv[])
        if (udev == NULL)
                goto exit;
 
-       logging_init("cdrom_id");
+       udev_log_init("cdrom_id");
        udev_set_log_fn(udev, log_fn);
 
        while (1) {
@@ -570,6 +571,7 @@ int main(int argc, char *argv[])
        fd = open(node, O_RDONLY | O_NONBLOCK);
        if (fd < 0) {
                info(udev, "unable to open '%s'\n", node);
+               fprintf(stderr, "unable to open '%s'\n", node);
                rc = 1;
                goto exit;
        }
@@ -705,7 +707,7 @@ exit:
        if (fd >= 0)
                close(fd);
        udev_unref(udev);
-       logging_close();
+       udev_log_close();
        return rc;
 }