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

Merge branch 'rs/apply-lose-prefix-length' into maint

Browse Source 
Code clean-up.

* rs/apply-lose-prefix-length:
  apply: remove prefix_length member from apply_state
This commit is contained in:
Junio C Hamano 2017-09-10 17:03:01 +09:00
commit c7759cd60a
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apply.c
View File

@ -80,7 +80,6 @@ int init_apply_state(struct apply_state *state,
{
memset(state, 0, sizeof(*state));
state->prefix = prefix;
state->prefix_length = state->prefix ? strlen(state->prefix) : 0;
state->lock_file = lock_file;
state->newfd = -1;
state->apply = 1;
@ -787,11 +786,11 @@ static int guess_p_value(struct apply_state *state, const char *nameline)
* Does it begin with "a/$our-prefix" and such? Then this is
* very likely to apply to our directory.
*/
if (!strncmp(name, state->prefix, state->prefix_length))
if (starts_with(name, state->prefix))
val = count_slashes(state->prefix);
else {
cp++;
if (!strncmp(cp, state->prefix, state->prefix_length))
if (starts_with(cp, state->prefix))
val = count_slashes(state->prefix) + 1;
}
}
@ -2108,10 +2107,9 @@ static int use_patch(struct apply_state *state, struct patch *p)
int i;
/* Paths outside are not touched regardless of "--include" */
if (0 < state->prefix_length) {
int pathlen = strlen(pathname);
if (pathlen <= state->prefix_length ||
memcmp(state->prefix, pathname, state->prefix_length))
if (state->prefix && *state->prefix) {
const char *rest;
if (!skip_prefix(pathname, state->prefix, &rest) || !*rest)
return 0;
}

1
apply.h
View File

@ -35,7 +35,6 @@ enum apply_verbosity {
struct apply_state {
const char *prefix;
int prefix_length;
/* These are lock_file related */
struct lock_file *lock_file;