diff options
| author | SZEDER Gábor <szeder.dev@gmail.com> | 2023-03-19 19:56:47 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-20 22:04:06 +0300 |
| commit | aa0275a2c030c9c03f7934340ce1496d8796954e (patch) | |
| tree | 8cfe2dc19fc841d62d0a694a27f4e5a4c8e2ee62 /parse-options.h | |
| parent | ab0845b38263e694686ce5b72be81c31c06c00cc (diff) | |
parse-options.h: rename _OPT_CONTAINS_OR_WITH()'s parameters
Rename the 'help' parameter as it matches one of the fields in 'struct
option', and, while at it, rename all other parameters to the usual
one-letter name used in similar macro definitions.
Furthermore, put all parameters in the replacement list between
parentheses, like all other OPT_* macros do.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/parse-options.h b/parse-options.h index 34f8caf369..7e99322bab 100644 --- a/parse-options.h +++ b/parse-options.h @@ -381,9 +381,9 @@ int parse_opt_tracking_mode(const struct option *, const char *, int); { OPTION_CALLBACK, (s), (l), (v), (a), (h), (f), parse_opt_passthru } #define OPT_PASSTHRU_ARGV(s, l, v, a, h, f) \ { OPTION_CALLBACK, (s), (l), (v), (a), (h), (f), parse_opt_passthru_argv } -#define _OPT_CONTAINS_OR_WITH(name, variable, help, flag) \ - { OPTION_CALLBACK, 0, name, (variable), N_("commit"), (help), \ - PARSE_OPT_LASTARG_DEFAULT | flag, \ +#define _OPT_CONTAINS_OR_WITH(l, v, h, f) \ + { OPTION_CALLBACK, 0, (l), (v), N_("commit"), (h), \ + PARSE_OPT_LASTARG_DEFAULT | (f), \ parse_opt_commits, (intptr_t) "HEAD" \ } #define OPT_CONTAINS(v, h) _OPT_CONTAINS_OR_WITH("contains", v, h, PARSE_OPT_NONEG) |