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>
SZEDER Gábor committed
Mar 19, 2023 at 17:56 UTC
aa0275a2c030c9c03f7934340ce1496d8796954e
1 file changed
+3
-3
parse-options.h
+3
-3
@@ -381,9 +381,9 @@ int parse_opt_tracking_mode(const struct option *, const char *, int);
381
{ OPTION_CALLBACK, (s), (l), (v), (a), (h), (f), parse_opt_passthru }
382
#define OPT_PASSTHRU_ARGV(s, l, v, a, h, f) \
383
{ OPTION_CALLBACK, (s), (l), (v), (a), (h), (f), parse_opt_passthru_argv }
384
-#define _OPT_CONTAINS_OR_WITH(name, variable, help, flag) \
385
- { OPTION_CALLBACK, 0, name, (variable), N_("commit"), (help), \
386
- PARSE_OPT_LASTARG_DEFAULT | flag, \
384
+#define _OPT_CONTAINS_OR_WITH(l, v, h, f) \
385
+ { OPTION_CALLBACK, 0, (l), (v), N_("commit"), (h), \
386
+ PARSE_OPT_LASTARG_DEFAULT | (f), \
387
parse_opt_commits, (intptr_t) "HEAD" \
388
}
389
#define OPT_CONTAINS(v, h) _OPT_CONTAINS_OR_WITH("contains", v, h, PARSE_OPT_NONEG)