From cf7f50135377072d82a7bcac63f0782185c6e488 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 12 Jan 2019 08:31:53 +0900 Subject: [PATCH] udevadm: improve error message when no option specified for 'control' command Also drop redundant block, use SYNTHETIC_ERRNO(), and add log_oom(). --- src/udev/udevadm-control.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c index cb9b4cc..1966af7 100644 --- a/src/udev/udevadm-control.c +++ b/src/udev/udevadm-control.c @@ -77,11 +77,12 @@ int control_main(int argc, char *argv[], void *userdata) { } if (argc <= 1) - log_error("Option missing"); + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "This command expects one or more options."); uctrl = udev_ctrl_new(); if (!uctrl) - return -ENOMEM; + return log_oom(); while ((c = getopt_long(argc, argv, "el:sSRp:m:t:Vh", options, NULL)) >= 0) switch (c) { @@ -158,13 +159,9 @@ int control_main(int argc, char *argv[], void *userdata) { assert_not_reached("Unknown option."); } - if (optind < argc) { - log_error("Extraneous argument: %s", argv[optind]); - return -EINVAL; - } else if (optind == 1) { - log_error("Option missing"); - return -EINVAL; - } + if (optind < argc) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Extraneous argument: %s", argv[optind]); return 0; } -- 2.7.4