From 47d20536e08fd1daa7023a56d6e97ae09cb2ea1b Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sun, 22 Feb 2015 14:41:39 +0000 Subject: [PATCH] eject: use parse_switch() [kzak@redhat.com: - use extended parse_switch()] Signed-off-by: Sami Kerola Signed-off-by: Karel Zak --- sys-utils/eject.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/sys-utils/eject.c b/sys-utils/eject.c index 4f7d6e6514..008b4fe4e6 100644 --- a/sys-utils/eject.c +++ b/sys-utils/eject.c @@ -202,12 +202,8 @@ static void parse_args(struct eject_control *ctl, int argc, char **argv) switch (c) { case 'a': ctl->a_option = 1; - if (!strcmp(optarg, "0") || !strcmp(optarg, "off")) - ctl->a_arg = 0; - else if (!strcmp(optarg, "1") || !strcmp(optarg, "on")) - ctl->a_arg = 1; - else - errx(EXIT_FAILURE, _("invalid argument to --auto/-a option")); + ctl->a_arg = parse_switch(optarg, _("argument error"), + "on", "off", "1", "0", NULL); break; case 'c': ctl->c_option = 1; @@ -231,12 +227,8 @@ static void parse_args(struct eject_control *ctl, int argc, char **argv) break; case 'i': ctl->i_option = 1; - if (!strcmp(optarg, "0") || !strcmp(optarg, "off")) - ctl->i_arg = 0; - else if (!strcmp(optarg, "1") || !strcmp(optarg, "on")) - ctl->i_arg = 1; - else - errx(EXIT_FAILURE, _("invalid argument to --manualeject/-i option")); + ctl->i_arg = parse_switch(optarg, _("argument error"), + "on", "off", "1", "0", NULL); break; case 'm': ctl->m_option = 1; -- 2.47.3