diff mbox series

[03/10] env--helper: write to opt->value in parseopt helper

Message ID 20200930122832.GC1901279@coredump.intra.peff.net (mailing list archive)
State Accepted
Commit 424e28fcadfe0a40e444687c10fb4eaff8360f8d
Headers show
Series dropping more unused parameters | expand

Commit Message

Jeff King Sept. 30, 2020, 12:28 p.m. UTC
We use OPT_CALLBACK_F() to call the option_parse_type() callback,
passing it the address of "cmdmode" as the value to write to. But the
callback doesn't look at opt->value at all, and instead writes to a
global variable.

This works out because that's the same global variable we happen to pass
in, but it's rather confusing.  Let's use the passed-in value instead.
We'll also make "cmdmode" a local variable of the main function,
ensuring we can't make the same mistake again.

Signed-off-by: Jeff King <peff@peff.net>
 builtin/env--helper.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
diff mbox series


diff --git a/builtin/env--helper.c b/builtin/env--helper.c
index 23c214fff6..3aa4282114 100644
--- a/builtin/env--helper.c
+++ b/builtin/env--helper.c
@@ -7,18 +7,20 @@  static char const * const env__helper_usage[] = {
-static enum {
+enum cmdmode {
-} cmdmode = 0;
 static int option_parse_type(const struct option *opt, const char *arg,
 			     int unset)
+	enum cmdmode *cmdmode = opt->value;
 	if (!strcmp(arg, "bool"))
-		cmdmode = ENV_HELPER_TYPE_BOOL;
+		*cmdmode = ENV_HELPER_TYPE_BOOL;
 	else if (!strcmp(arg, "ulong"))
+		*cmdmode = ENV_HELPER_TYPE_ULONG;
 		die(_("unrecognized --type argument, %s"), arg);
@@ -33,6 +35,7 @@  int cmd_env__helper(int argc, const char **argv, const char *prefix)
 	int ret;
 	int ret_int, default_int;
 	unsigned long ret_ulong, default_ulong;
+	enum cmdmode cmdmode = 0;
 	struct option opts[] = {
 		OPT_CALLBACK_F(0, "type", &cmdmode, N_("type"),
 			       N_("value is given this type"), PARSE_OPT_NONEG,