diff options
| -rw-r--r-- | udev/udevadm-control.c | 5 | ||||
| -rw-r--r-- | udev/udevadm-settle.c | 3 | ||||
| -rw-r--r-- | udev/udevadm-trigger.c | 1 | ||||
| -rw-r--r-- | udev/udevadm.c | 2 |
4 files changed, 2 insertions, 9 deletions
diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c index 3eb03d8b04..42818d9db7 100644 --- a/udev/udevadm-control.c +++ b/udev/udevadm-control.c @@ -81,8 +81,6 @@ int udevadm_control(struct udev *udev, int argc, char *argv[]) break; if (option > 255) { - fprintf(stderr, "udevadm control expects commands without underscore, " - "this will stop working in a future release\n"); err(udev, "udevadm control expects commands without underscore, " "this will stop working in a future release\n"); } @@ -144,8 +142,6 @@ int udevadm_control(struct udev *udev, int argc, char *argv[]) if (argv[optind] != NULL) { const char *arg = argv[optind]; - fprintf(stderr, "udevadm control commands requires the --<command> format, " - "this will stop working in a future release\n"); err(udev, "udevadm control commands requires the --<command> format, " "this will stop working in a future release\n"); @@ -177,7 +173,6 @@ int udevadm_control(struct udev *udev, int argc, char *argv[]) } if (rc != 0) { - fprintf(stderr, "unrecognized command\n"); err(udev, "unrecognized command\n"); } exit: diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c index 124c59698c..5030f18602 100644 --- a/udev/udevadm-settle.c +++ b/udev/udevadm-settle.c @@ -140,14 +140,12 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[]) if (start > end) { err(udev, "seq-start larger than seq-end, ignoring\n"); - fprintf(stderr, "seq-start larger than seq-end, ignoring\n"); start = 0; end = 0; } if (start > kernel_seq || end > kernel_seq) { err(udev, "seq-start or seq-end larger than current kernel value, ignoring\n"); - fprintf(stderr, "seq-start or seq-end larger than current kernel value, ignoring\n"); start = 0; end = 0; } @@ -155,7 +153,6 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[]) } else { if (end > 0) { err(udev, "seq-end needs seq-start parameter, ignoring\n"); - fprintf(stderr, "seq-end needs seq-start parameter, ignoring\n"); end = 0; } } diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c index 8a626ec744..dbcaee3dbd 100644 --- a/udev/udevadm-trigger.c +++ b/udev/udevadm-trigger.c @@ -146,7 +146,6 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[]) } else if (strcmp(optarg, "failed") == 0) { device_type = TYPE_FAILED; } else { - fprintf(stderr, "unknown type --type=%s\n", optarg); err(udev, "unknown type --type=%s\n", optarg); rc = 2; goto exit; diff --git a/udev/udevadm.c b/udev/udevadm.c index 452489a0c7..3d94215ba9 100644 --- a/udev/udevadm.c +++ b/udev/udevadm.c @@ -35,6 +35,8 @@ static void log_fn(struct udev *udev, int priority, fprintf(stderr, "%s: ", fn); vfprintf(stderr, format, args); } else { + if (priority <= LOG_ERR) + vfprintf(stderr, format, args); vsyslog(priority, format, args); } } |