apply: remove prefix_length member from apply_state

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>

diff --git a/apply.c b/apply.c
index 0e2caeab9cc523364e0cfbb8cbbb5aba1a0a58ee..4f67896b65066dd5691607a9984bde566855542b 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -79,7 +79,6 @@ int init_apply_state(struct apply_state *state,
 {
        memset(state, 0, sizeof(*state));
        state->prefix = prefix;
 {
        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;
        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.
                 */
                 * 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++;
                        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;
                }
        }
                                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" */
        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;
        }
 
                        return 0;
        }
 

diff --git a/apply.h b/apply.h
index b3d6783d55344de5aaa3d4b81a22abed0b6972fb..d9b395770364b5495fc1136248efd64bd3a5e66d 100644 (file)
--- a/apply.h
+++ b/apply.h
@@ -35,7 +35,6 @@ enum apply_verbosity {
 
 struct apply_state {
        const char *prefix;
 
 struct apply_state {
        const char *prefix;

-       int prefix_length;

 
        /* These are lock_file related */
        struct lock_file *lock_file;
 
        /* These are lock_file related */
        struct lock_file *lock_file;