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

Merge branch 'rs/diff-parseopts'

Browse Source 
The way the diff machinery prepares the options array for the
parse_options API has been refactored to avoid resource leaks.

* rs/diff-parseopts:
  diff: remove parseopts member from struct diff_options
  diff: use add_diff_options() in diff_opt_parse()
  diff: factor out add_diff_options()
This commit is contained in:
Junio C Hamano 2022-12-19 11:46:17 +09:00
commit ab91f6b7c4
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/range-diff.c
View File

@ -47,7 +47,7 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
repo_diff_setup(the_repository, &diffopt); repo_diff_setup(the_repository, &diffopt);
options = parse_options_concat(range_diff_options, diffopt.parseopts); options = add_diff_options(range_diff_options, &diffopt);
argc = parse_options(argc, argv, prefix, options, argc = parse_options(argc, argv, prefix, options,
builtin_range_diff_usage, PARSE_OPT_KEEP_DASHDASH); builtin_range_diff_usage, PARSE_OPT_KEEP_DASHDASH);

3
diff-no-index.c
View File

@ -255,8 +255,7 @@ int diff_no_index(struct rev_info *revs,
}; };
struct option *options; struct option *options;
options = parse_options_concat(no_index_options, options = add_diff_options(no_index_options, &revs->diffopt);
revs->diffopt.parseopts);
argc = parse_options(argc, argv, revs->prefix, options, argc = parse_options(argc, argv, revs->prefix, options,
diff_no_index_usage, 0); diff_no_index_usage, 0);
if (argc != 2) { if (argc != 2) {

19
diff.c
View File

@ -4615,8 +4615,6 @@ static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
builtin_checkdiff(name, other, attr_path, p->one, p->two, o); builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
} }
static void prep_parse_options(struct diff_options *options);
void repo_diff_setup(struct repository *r, struct diff_options *options) void repo_diff_setup(struct repository *r, struct diff_options *options)
{ {
memcpy(options, &default_diff_options, sizeof(*options)); memcpy(options, &default_diff_options, sizeof(*options));
@ -4662,8 +4660,6 @@ void repo_diff_setup(struct repository *r, struct diff_options *options)
options->color_moved = diff_color_moved_default; options->color_moved = diff_color_moved_default;
options->color_moved_ws_handling = diff_color_moved_ws_default; options->color_moved_ws_handling = diff_color_moved_ws_default;
prep_parse_options(options);
} }
static const char diff_status_letters[] = { static const char diff_status_letters[] = {
@ -4821,8 +4817,6 @@ void diff_setup_done(struct diff_options *options)
options->filter = ~filter_bit[DIFF_STATUS_FILTER_AON]; options->filter = ~filter_bit[DIFF_STATUS_FILTER_AON];
options->filter &= ~options->filter_not; options->filter &= ~options->filter_not;
} }
FREE_AND_NULL(options->parseopts);
} }
int parse_long_opt(const char *opt, const char **argv, int parse_long_opt(const char *opt, const char **argv,
@ -5419,7 +5413,8 @@ static int diff_opt_rotate_to(const struct option *opt, const char *arg, int uns
return 0; return 0;
} }
static void prep_parse_options(struct diff_options *options) struct option *add_diff_options(const struct option *opts,
struct diff_options *options)
{ {
struct option parseopts[] = { struct option parseopts[] = {
OPT_GROUP(N_("Diff output format options")), OPT_GROUP(N_("Diff output format options")),
@ -5689,22 +5684,25 @@ static void prep_parse_options(struct diff_options *options)
OPT_END() OPT_END()
}; };
ALLOC_ARRAY(options->parseopts, ARRAY_SIZE(parseopts)); return parse_options_concat(opts, parseopts);
memcpy(options->parseopts, parseopts, sizeof(parseopts));
} }
int diff_opt_parse(struct diff_options *options, int diff_opt_parse(struct diff_options *options,
const char **av, int ac, const char *prefix) const char **av, int ac, const char *prefix)
{ {
struct option no_options[] = { OPT_END() };
struct option *parseopts = add_diff_options(no_options, options);
if (!prefix) if (!prefix)
prefix = ""; prefix = "";
ac = parse_options(ac, av, prefix, options->parseopts, NULL, ac = parse_options(ac, av, prefix, parseopts, NULL,
PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_DASHDASH |
PARSE_OPT_KEEP_UNKNOWN_OPT | PARSE_OPT_KEEP_UNKNOWN_OPT |
PARSE_OPT_NO_INTERNAL_HELP | PARSE_OPT_NO_INTERNAL_HELP |
PARSE_OPT_ONE_SHOT | PARSE_OPT_ONE_SHOT |
PARSE_OPT_STOP_AT_NON_OPTION); PARSE_OPT_STOP_AT_NON_OPTION);
free(parseopts);
return ac; return ac;
} }
@ -6513,7 +6511,6 @@ void diff_free(struct diff_options *options)
diff_free_file(options); diff_free_file(options);
diff_free_ignore_regex(options); diff_free_ignore_regex(options);
clear_pathspec(&options->pathspec); clear_pathspec(&options->pathspec);
FREE_AND_NULL(options->parseopts);
} }
void diff_flush(struct diff_options *options) void diff_flush(struct diff_options *options)

2
diff.h
View File

@ -394,7 +394,6 @@ struct diff_options {
unsigned color_moved_ws_handling; unsigned color_moved_ws_handling;
struct repository *repo; struct repository *repo;
struct option *parseopts;
struct strmap *additional_path_headers; struct strmap *additional_path_headers;
int no_free; int no_free;
@ -539,6 +538,7 @@ int git_diff_ui_config(const char *var, const char *value, void *cb);
#define diff_setup(diffopts) repo_diff_setup(the_repository, diffopts) #define diff_setup(diffopts) repo_diff_setup(the_repository, diffopts)
#endif #endif
void repo_diff_setup(struct repository *, struct diff_options *); void repo_diff_setup(struct repository *, struct diff_options *);
struct option *add_diff_options(const struct option *, struct diff_options *);
int diff_opt_parse(struct diff_options *, const char **, int, const char *); int diff_opt_parse(struct diff_options *, const char **, int, const char *);
void diff_setup_done(struct diff_options *); void diff_setup_done(struct diff_options *);
int git_config_rename(const char *var, const char *value); int git_config_rename(const char *var, const char *value);