Re: [PATCH 6/6] apply, ls-files: simplify "-z" parsing
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:08:03
Jeff King [off-list ref] writes:
As a short option, we cannot handle negation. Thus a callback handling "unset" is overkill, and we can just use OPT_SET_INT instead to handle setting the option. Signed-off-by: Jeff King <redacted> --- I left this one for last, because it's the most questionable. Unlike the previous "-z" case, we're setting the actual character, so the logic is inverted: turning on the option sets it to 0, and turning it off restore '\n'. This means OPT_SET_INT would do the wrong thing for the "unset" case, as it would put a "0" into the option. You can't trigger that now, but if somebody were to add a long option (e.g., "--nul"), then "--no-nul" would do the wrong thing. I'm on the fence on whether the simplification is worth it, or if we should leave the callbacks as future-proofing.
If done as two patch series where one does this and the other flips polarity of the variable (!!line_termination === !nul_term_line), would that make the result both simpler to read and future-proof? Of course, a patch adding a "--nul" can be the one that does the polarity flipping, so in that sense, this simplification is probably OK, as long as there is some comment that warns a time-bomb you just planted here ;-)
quoted hunk
builtin/apply.c | 15 ++------------- builtin/ls-files.c | 13 ++----------- 2 files changed, 4 insertions(+), 24 deletions(-)diff --git a/builtin/apply.c b/builtin/apply.c index deb1364..565f3fd 100644 --- a/builtin/apply.c +++ b/builtin/apply.c@@ -4464,16 +4464,6 @@ static int option_parse_p(const struct option *opt, return 0; } -static int option_parse_z(const struct option *opt, - const char *arg, int unset) -{ - if (unset) - line_termination = '\n'; - else - line_termination = 0; - return 0; -} - static int option_parse_space_change(const struct option *opt, const char *arg, int unset) {@@ -4546,9 +4536,8 @@ int cmd_apply(int argc, const char **argv, const char *prefix_) N_( "attempt three-way merge if a patch does not apply")), OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor, N_("build a temporary index based on embedded index information")), - { OPTION_CALLBACK, 'z', NULL, NULL, NULL, - N_("paths are separated with NUL character"), - PARSE_OPT_NOARG, option_parse_z }, + OPT_SET_INT('z', NULL, &line_termination, + N_("paths are separated with NUL character"), '\0'), OPT_INTEGER('C', NULL, &p_context, N_("ensure at least <n> lines of context match")), { OPTION_CALLBACK, 0, "whitespace", &whitespace_option, N_("action"),diff --git a/builtin/ls-files.c b/builtin/ls-files.c index b6a7cb0..59bad9b 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c@@ -359,14 +359,6 @@ static const char * const ls_files_usage[] = { NULL }; -static int option_parse_z(const struct option *opt, - const char *arg, int unset) -{ - line_terminator = unset ? '\n' : '\0'; - - return 0; -} - static int option_parse_exclude(const struct option *opt, const char *arg, int unset) {@@ -408,9 +400,8 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) struct exclude_list *el; struct string_list exclude_list = STRING_LIST_INIT_NODUP; struct option builtin_ls_files_options[] = { - { OPTION_CALLBACK, 'z', NULL, NULL, NULL, - N_("paths are separated with NUL character"), - PARSE_OPT_NOARG, option_parse_z }, + OPT_SET_INT('z', NULL, &line_terminator, + N_("paths are separated with NUL character"), '\0'), OPT_BOOL('t', NULL, &show_tag, N_("identify the file status with tags")), OPT_BOOL('v', NULL, &show_valid_bit,