tree-walk: lose base_offset that is never used in tree_entry_interesting

The tree_entry_interesting() function takes base_offset, allowing
its callers to potentially pass a non-zero number to skip the early
part of the path string.

The feature is never exercised and we do not even know what bugs are
lurking there, as all callers pass 0 to the parameter.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/grep.c b/builtin/grep.c
index b86c754defbc59654a6e455b2115487ba01f084f..a36fea03a88387d80ed354ed00769adf05d56eaa 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -639,7 +639,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
                        strbuf_addstr(&name, base->buf + tn_len);
                        match = tree_entry_interesting(repo->index,
                                                       &entry, &name,
-                                                      0, pathspec);
+                                                      pathspec);
                        strbuf_setlen(&name, name_base_len);
 
                        if (match == all_entries_not_interesting)

diff --git a/list-objects.c b/list-objects.c
index eecca721ac0826ef09071e6c3119a231d693771a..97dfef69b4e0666c715b509918d438e1cdea4c2a 100644 (file)
--- a/list-objects.c
+++ b/list-objects.c
@@ -102,7 +102,7 @@ static void process_tree_contents(struct traversal_context *ctx,
        while (tree_entry(&desc, &entry)) {
                if (match != all_entries_interesting) {
                        match = tree_entry_interesting(ctx->revs->repo->index,
-                                                      &entry, base, 0,
+                                                      &entry, base,
                                                       &ctx->revs->diffopt.pathspec);
                        if (match == all_entries_not_interesting)
                                break;

diff --git a/tree-diff.c b/tree-diff.c
index 20bb15f38d9471b9de64fa6bafd620fd18b61901..a01f36f68500bd1f118175369da152c3f093f73e 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -316,7 +316,7 @@ static void skip_uninteresting(struct tree_desc *t, struct strbuf *base,
 
        while (t->size) {
                match = tree_entry_interesting(opt->repo->index, &t->entry,
-                                              base, 0, &opt->pathspec);
+                                              base, &opt->pathspec);
                if (match) {
                        if (match == all_entries_not_interesting)
                                t->size = 0;

diff --git a/tree-walk.c b/tree-walk.c
index d3c48e06df05b707af9f753fd4a3d4641173c00c..28d59936ade22eaa4acf2f3786b5b854bb7f53d6 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -435,7 +435,7 @@ static inline int prune_traversal(struct index_state *istate,
        if (still_interesting < 0)
                return still_interesting;
        return tree_entry_interesting(istate, e, base,
-                                     0, info->pathspec);
+                                     info->pathspec);
 }
 
 int traverse_trees(struct index_state *istate,
@@ -1223,10 +1223,11 @@ interesting:
  */
 enum interesting tree_entry_interesting(struct index_state *istate,
                                        const struct name_entry *entry,
-                                       struct strbuf *base, int base_offset,
+                                       struct strbuf *base,
                                        const struct pathspec *ps)
 {
        enum interesting positive, negative;
+       const int base_offset = 0;
        positive = do_match(istate, entry, base, base_offset, ps, 0);
 
        /*

diff --git a/tree-walk.h b/tree-walk.h
index 01a9d8eb4422edbdfa1cf3609623aa2fab66cb4d..74cdceb3fed258eb7216ebec1fe8a86aef0fa264 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -224,7 +224,7 @@ enum interesting {
 
 enum interesting tree_entry_interesting(struct index_state *istate,
                                        const struct name_entry *,
-                                       struct strbuf *, int,
+                                       struct strbuf *,
                                        const struct pathspec *ps);
 
 #endif

diff --git a/tree.c b/tree.c
index 0dd2029a8a2905338ac7d7cd9062bd9662a2e9f0..fcce9c0d8854cb6c8408e5a9842489c18f47faa5 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -32,7 +32,7 @@ int read_tree_at(struct repository *r,
        while (tree_entry(&desc, &entry)) {
                if (retval != all_entries_interesting) {
                        retval = tree_entry_interesting(r->index, &entry,
-                                                       base, 0, pathspec);
+                                                       base, pathspec);
                        if (retval == all_entries_not_interesting)
                                break;
                        if (retval == entry_not_interesting)