undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

env--helper: write to opt->value in parseopt helper

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2020-09-30 08:28:32 -04:00 committed by Junio C Hamano
parent e885a84f1b
commit 424e28fcad
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/env--helper.c
View File

@ -7,18 +7,20 @@ static char const * const env__helper_usage[] = {
NULL NULL
}; };
static enum { enum cmdmode {
ENV_HELPER_TYPE_BOOL = 1, ENV_HELPER_TYPE_BOOL = 1,
ENV_HELPER_TYPE_ULONG ENV_HELPER_TYPE_ULONG
} cmdmode = 0; };
static int option_parse_type(const struct option *opt, const char *arg, static int option_parse_type(const struct option *opt, const char *arg,
int unset) int unset)
{ {
enum cmdmode *cmdmode = opt->value;
if (!strcmp(arg, "bool")) if (!strcmp(arg, "bool"))
cmdmode = ENV_HELPER_TYPE_BOOL; *cmdmode = ENV_HELPER_TYPE_BOOL;
else if (!strcmp(arg, "ulong")) else if (!strcmp(arg, "ulong"))
cmdmode = ENV_HELPER_TYPE_ULONG; *cmdmode = ENV_HELPER_TYPE_ULONG;
else else
die(_("unrecognized --type argument, %s"), arg); 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 ret_int, default_int; int ret_int, default_int;
unsigned long ret_ulong, default_ulong; unsigned long ret_ulong, default_ulong;
enum cmdmode cmdmode = 0;
struct option opts[] = { struct option opts[] = {
OPT_CALLBACK_F(0, "type", &cmdmode, N_("type"), OPT_CALLBACK_F(0, "type", &cmdmode, N_("type"),
N_("value is given this type"), PARSE_OPT_NONEG, N_("value is given this type"), PARSE_OPT_NONEG,