cache-tree: use ce_namelen() instead of strlen()

Use the name length field of cache entries instead of calculating its
value anew.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache-tree.c b/cache-tree.c
index 7da59b2aa0737adb73176e0c3b68d04395c9dd75..4274de75bacb292915d10bcb4991dce97b9c37c0 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -185,10 +185,12 @@ static int verify_cache(struct cache_entry **cache,
                 * the cache is sorted.  Also path can appear only once,
                 * which means conflicting one would immediately follow.
                 */
-               const char *this_name = cache[i]->name;
-               const char *next_name = cache[i+1]->name;
-               int this_len = strlen(this_name);
-               if (this_len < strlen(next_name) &&
+               const struct cache_entry *this_ce = cache[i];
+               const struct cache_entry *next_ce = cache[i + 1];
+               const char *this_name = this_ce->name;
+               const char *next_name = next_ce->name;
+               int this_len = ce_namelen(this_ce);
+               if (this_len < ce_namelen(next_ce) &&
                    strncmp(this_name, next_name, this_len) == 0 &&
                    next_name[this_len] == '/') {
                        if (10 < ++funny) {