Simplify tree-walk.c using the strnncmp() function and remove the
name_compare() function.
Signed-off-by: Jeremiah Mahler <jmmahler@xxxxxxxxx>
---
tree-walk.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/tree-walk.c b/tree-walk.c
index 4dc86c7..efbd3b7 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)
{
/*
@@ -174,7 +164,7 @@ static int check_entry_match(const char *a, int a_len, const char *b, int b_len)
* scanning further.
*/
- int cmp = name_compare(a, a_len, b, b_len);
+ int cmp = strnncmp(a, a_len, b, b_len);
/* Most common case first -- reading sync'd trees */
if (!cmp)
@@ -369,7 +359,7 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
first_len = len;
continue;
}
- if (name_compare(e->path, len, first, first_len) < 0) {
+ if (strnncmp(e->path, len, first, first_len) < 0) {
first = e->path;
first_len = len;
}
@@ -383,7 +373,7 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
if (!e->path)
continue;
len = tree_entry_len(e);
- if (name_compare(e->path, len, first, first_len))
+ if (strnncmp(e->path, len, first, first_len))
entry_clear(e);
}
}
--
2.0.0.695.g38ee9a9
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html