mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rm/strchrnul-not-strlen'

Browse Source 
* rm/strchrnul-not-strlen:
  use strchrnul() in place of strchr() and strlen()
This commit is contained in:
Junio C Hamano
2014-03-18 13:51:18 -07:00
parent 884377c128 2c5495f7b6
commit 6f75e48323
9 changed files with 31 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cache-tree.c
View File

@ -117,11 +117,11 @@ void cache_tree_invalidate_path(struct cache_tree *it, const char *path)
if (!it)
return;
slash = strchr(path, '/');
slash = strchrnul(path, '/');
namelen = slash - path;
it->entry_count = -1;
if (!slash) {
if (!*slash) {
int pos;
namelen = strlen(path);
pos = subtree_pos(it, path, namelen);
if (0 <= pos) {
cache_tree_free(&it->down[pos]->cache_tree);
@ -139,7 +139,6 @@ void cache_tree_invalidate_path(struct cache_tree *it, const char *path)
}
return;
}
namelen = slash - path;
down = find_subtree(it, path, namelen, 0);
if (down)
cache_tree_invalidate_path(down->cache_tree, slash + 1);