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

apply: remove prefix_length member from apply_state

Browse Source 
Use a NULL-and-NUL check to see if we have a prefix and consistently use
C string functions on it instead of storing its length in a member of
struct apply_state.  This avoids strlen() calls and simplifies the code.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2017-08-09 17:54:46 +02:00 committed by Junio C Hamano
parent 95d6787973
commit 881529c846
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

@ -79,7 +79,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;
@ -795,11 +794,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;
}
}
@ -2078,10 +2077,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;