path: root/tree-walk.c
diff options
authorJeremiah Mahler <>2014-06-20 02:06:44 (GMT)
committerJunio C Hamano <>2014-06-20 17:12:14 (GMT)
commitccdd4a0f3c7c550526a980e93156f25a956497bc (patch)
tree84db06d840bf4600a30e6a6a2d784a12a09baa71 /tree-walk.c
parentbe99ec97c8a1f94e723c6cc5331eff921ae49ed3 (diff)
cleanup duplicate name_compare() functions
We often represent our strings as a counted string, i.e. a pair of the pointer to the beginning of the string and its length, and the string may not be NUL terminated to that length. To compare a pair of such counted strings, unpack-trees.c and read-cache.c implement their own name_compare() functions identically. In addition, the cache_name_compare() function in read-cache.c is nearly identical. The only difference is when one string is the prefix of the other string, in which case name_compare() returns -1/+1 to show which one is longer, and cache_name_compare() returns the difference of the lengths to show the same information. Unify these three functions by using the implementation from cache_name_compare(). This does not make any difference to the existing and future callers, as they must be paying attention only to the sign of the returned value (and not the magnitude) because the original implementations of these two functions return values returned by memcmp(3) when the one string is not a prefix of the other string, and the only thing memcmp(3) guarantees its callers is the sign of the returned value, not the magnitude. Signed-off-by: Jeremiah Mahler <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'tree-walk.c')
1 files changed, 0 insertions, 10 deletions
diff --git a/tree-walk.c b/tree-walk.c
index 4dc86c7..5dd9a71 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -144,16 +144,6 @@ struct tree_desc_x {
struct tree_desc_skip *skip;
-static int name_compare(const char *a, int a_len,
- const char *b, int b_len)
- int len = (a_len < b_len) ? a_len : b_len;
- int cmp = memcmp(a, b, len);
- if (cmp)
- return cmp;
- return (a_len - b_len);
static int check_entry_match(const char *a, int a_len, const char *b, int b_len)