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

builtin/apply: move 'limit_by_name' global into 'struct apply_state'

Browse Source 
To libify the apply functionality the 'limit_by_name' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2016-05-24 10:11:07 +02:00 committed by Junio C Hamano
parent b802355863
commit 82f0dfca54
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
builtin/apply.c
View File

@ -52,6 +52,9 @@ struct apply_state {
const char *patch_input_file; const char *patch_input_file;
int line_termination; int line_termination;
unsigned int p_context; unsigned int p_context;
/* Exclude and include path parameters */
struct string_list limit_by_name;
}; };
static int newfd = -1; static int newfd = -1;
@ -1958,13 +1961,14 @@ static void prefix_patch(struct apply_state *state, struct patch *p)
* include/exclude * include/exclude
*/ */
static struct string_list limit_by_name;
static int has_include; static int has_include;
static void add_name_limit(const char *name, int exclude) static void add_name_limit(struct apply_state *state,
const char *name,
int exclude)
{ {
struct string_list_item *it; struct string_list_item *it;
it = string_list_append(&limit_by_name, name); it = string_list_append(&state->limit_by_name, name);
it->util = exclude ? NULL : (void *) 1; it->util = exclude ? NULL : (void *) 1;
} }
@ -1982,8 +1986,8 @@ static int use_patch(struct apply_state *state, struct patch *p)
} }
/* See if it matches any of exclude/include rule */ /* See if it matches any of exclude/include rule */
for (i = 0; i < limit_by_name.nr; i++) { for (i = 0; i < state->limit_by_name.nr; i++) {
struct string_list_item *it = &limit_by_name.items[i]; struct string_list_item *it = &state->limit_by_name.items[i];
if (!wildmatch(it->string, pathname, 0, NULL)) if (!wildmatch(it->string, pathname, 0, NULL))
return (it->util != NULL); return (it->util != NULL);
} }
@ -4520,14 +4524,16 @@ static void git_apply_config(void)
static int option_parse_exclude(const struct option *opt, static int option_parse_exclude(const struct option *opt,
const char *arg, int unset) const char *arg, int unset)
{ {
add_name_limit(arg, 1); struct apply_state *state = opt->value;
add_name_limit(state, arg, 1);
return 0; return 0;
} }
static int option_parse_include(const struct option *opt, static int option_parse_include(const struct option *opt,
const char *arg, int unset) const char *arg, int unset)
{ {
add_name_limit(arg, 0); struct apply_state *state = opt->value;
add_name_limit(state, arg, 0);
has_include = 1; has_include = 1;
return 0; return 0;
} }
@ -4587,7 +4593,7 @@ static void init_apply_state(struct apply_state *state, const char *prefix)
static void clear_apply_state(struct apply_state *state) static void clear_apply_state(struct apply_state *state)
{ {
/* empty for now */ string_list_clear(&state->limit_by_name, 0);
} }
int cmd_apply(int argc, const char **argv, const char *prefix) int cmd_apply(int argc, const char **argv, const char *prefix)
@ -4603,10 +4609,10 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
const char *whitespace_option = NULL; const char *whitespace_option = NULL;
struct option builtin_apply_options[] = { struct option builtin_apply_options[] = {
{ OPTION_CALLBACK, 0, "exclude", NULL, N_("path"), { OPTION_CALLBACK, 0, "exclude", &state, N_("path"),
N_("don't apply changes matching the given path"), N_("don't apply changes matching the given path"),
0, option_parse_exclude }, 0, option_parse_exclude },
{ OPTION_CALLBACK, 0, "include", NULL, N_("path"), { OPTION_CALLBACK, 0, "include", &state, N_("path"),
N_("apply changes matching the given path"), N_("apply changes matching the given path"),
0, option_parse_include }, 0, option_parse_include },
{ OPTION_CALLBACK, 'p', NULL, NULL, N_("num"), { OPTION_CALLBACK, 'p', NULL, NULL, N_("num"),