development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dm/tree-walk' into next

Browse source 
* dm/tree-walk:
  tree-walk: micro-optimization in tree_entry_interesting
  tree-walk: drop unused parameter from match_dir_prefix
This commit is contained in:
Junio C Hamano 2011-10-06 15:41:57 -07:00
parent 9236f5e71f 1b74092373
commit 76e90c3381
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tree-walk.c
View file

@ -549,7 +549,7 @@ static int match_entry(const struct name_entry *entry, int pathlen,
return 0;
}
static int match_dir_prefix(const char *base, int baselen,
static int match_dir_prefix(const char *base,
const char *match, int matchlen)
{
if (strncmp(base, match, matchlen))
@ -606,7 +606,7 @@ int tree_entry_interesting(const struct name_entry *entry,
if (baselen >= matchlen) {
/* If it doesn't match, move along... */
if (!match_dir_prefix(base_str, baselen, match, matchlen))
if (!match_dir_prefix(base_str, match, matchlen))
goto match_wildcards;
if (!ps->recursive || ps->max_depth == -1)
@ -618,8 +618,8 @@ int tree_entry_interesting(const struct name_entry *entry,
ps->max_depth);
}
/* Does the base match? */
if (!strncmp(base_str, match, baselen)) {
/* Either there must be no base, or the base must match. */
if (baselen == 0 || !strncmp(base_str, match, baselen)) {
if (match_entry(entry, pathlen,
match + baselen, matchlen - baselen,
&never_interesting))