diff options
Diffstat (limited to 'src/cdrom_id/cdrom_id.c')
| -rw-r--r-- | src/cdrom_id/cdrom_id.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/cdrom_id/cdrom_id.c b/src/cdrom_id/cdrom_id.c index 5733ee4247..4d0e6e073a 100644 --- a/src/cdrom_id/cdrom_id.c +++ b/src/cdrom_id/cdrom_id.c @@ -41,19 +41,12 @@ #include "libudev.h" #include "libudev-private.h" -static bool debug; - _printf_(6,0) static void log_fn(struct udev *udev, int priority, const char *file, int line, const char *fn, const char *format, va_list args) { - if (debug) { - fprintf(stderr, "%s: ", fn); - vfprintf(stderr, format, args); - } else { - vsyslog(priority, format, args); - } + log_metav(priority, file, line, fn, format, args); } /* device info */ @@ -879,11 +872,12 @@ int main(int argc, char *argv[]) int cnt; int rc = 0; + log_open(); + udev = udev_new(); if (udev == NULL) goto exit; - log_open(); udev_set_log_fn(udev, log_fn); while (1) { @@ -904,9 +898,10 @@ int main(int argc, char *argv[]) eject = true; break; case 'd': - debug = true; + log_set_target(LOG_TARGET_CONSOLE); log_set_max_level(LOG_DEBUG); udev_set_log_priority(udev, LOG_DEBUG); + log_open(); break; case 'h': printf("Usage: cdrom_id [options] <device>\n" |