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

use strchrnul() in place of strchr() and strlen()

Browse Source 
Avoid scanning strings twice, once with strchr() and then with
strlen(), by using strchrnul().

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Rohit Mani <rohit.mani@outlook.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Rohit Mani
2014-03-07 22:48:31 -08:00
committed by Junio C Hamano
parent 5f95c9f850
commit 2c5495f7b6
9 changed files with 34 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cache-tree.c
View File

@ -121,11 +121,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);
@ -143,7 +143,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);
@ -554,9 +553,7 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat
const char *slash;
struct cache_tree_sub *sub;
slash = strchr(path, '/');
if (!slash)
slash = path + strlen(path);
slash = strchrnul(path, '/');
/* between path and slash is the name of the
* subtree to look for.
*/
@ -564,10 +561,10 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat
if (!sub)
return NULL;
it = sub->cache_tree;
if (slash)
if (*slash)
while (*slash && *slash == '/')
slash++;
if (!slash || !*slash)
if (!*slash)
return it; /* prefix ended with slashes */
path = slash;
}