Avoid passing getopt_control stucture in when returning a value is enough.
CC: Frodo Looijaard <frodo@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
misc-utils/getopt.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c
index 8134558..2940a7d 100644
--- a/misc-utils/getopt.c
+++ b/misc-utils/getopt.c
@@ -295,19 +295,17 @@ static void add_long_options(struct getopt_control *ctl, char *options)
}
}
-static void set_shell(struct getopt_control *ctl, const char *new_shell)
+static shell_t shell_type(const char *new_shell)
{
if (!strcmp(new_shell, "bash"))
- ctl->shell = BASH;
- else if (!strcmp(new_shell, "tcsh"))
- ctl->shell = TCSH;
- else if (!strcmp(new_shell, "sh"))
- ctl->shell = BASH;
- else if (!strcmp(new_shell, "csh"))
- ctl->shell = TCSH;
- else
- parse_error(_
- ("unknown shell after -s or --shell argument"));
+ return BASH;
+ if (!strcmp(new_shell, "sh"))
+ return BASH;
+ if (!strcmp(new_shell, "tcsh"))
+ return TCSH;
+ if (!strcmp(new_shell, "csh"))
+ return TCSH;
+ parse_error(_("unknown shell after -s or --shell argument"));
}
static void __attribute__ ((__noreturn__)) print_help(void)
@@ -419,7 +417,7 @@ int main(int argc, char *argv[])
ctl.quiet_output = 1;
break;
case 's':
- set_shell(&ctl, optarg);
+ ctl.shell = shell_type(optarg);
break;
case 'T':
return TEST_EXIT_CODE;
--
2.1.3
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
