From: Jeremiah Mahler Date: Tue, 17 Jun 2014 07:34:39 GMT Subject: [PATCH v2 3/3] unpack-trees: simplify via strnncmp() Message-ID: <38ee9a9fac6aa861d18d6f756f48dc9df1ac19b1.1402990051.git.jmmahler@gmail.com> In-Reply-To: Simplify unpack-trees.c using the strnncmp() function and remove the name_compare() function. Signed-off-by: Jeremiah Mahler --- unpack-trees.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 4a9cdf2..9a71b5a 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -629,17 +629,6 @@ static int unpack_failed(struct unpack_trees_options *o, const char *message) return -1; } -/* NEEDSWORK: give this a better name and share with tree-walk.c */ -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); -} - /* * The tree traversal is looking at name p. If we have a matching entry, * return it. If name p is a directory in the index, do not return @@ -678,7 +667,7 @@ static int find_cache_pos(struct traverse_info *info, ce_len = ce_slash - ce_name; else ce_len = ce_namelen(ce) - pfxlen; - cmp = name_compare(p->path, p_len, ce_name, ce_len); + cmp = strnncmp(p->path, p_len, ce_name, ce_len); /* * Exact match; if we have a directory we need to * delay returning it. -- 2.0.0.695.g38ee9a9