From 72c378d8a618b9a57e4edf12700c51b0af86f124 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Wed, 5 Mar 2014 18:26:25 +0100 Subject: [PATCH 1/6] cache_tree_find(): remove redundant checks slash is initialized to a value that cannot be NULL. So remove the guards against slash == NULL later in the loop. Suggested-by: David Kastrup Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- cache-tree.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cache-tree.c b/cache-tree.c index 0bbec43216..4d439bd915 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -564,10 +564,9 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat if (!sub) return NULL; it = sub->cache_tree; - if (slash) - while (*slash && *slash == '/') - slash++; - if (!slash || !*slash) + while (*slash && *slash == '/') + slash++; + if (!*slash) return it; /* prefix ended with slashes */ path = slash; } From 17e22ddc1c34858beece1b090b392d7c73d1c0a3 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Wed, 5 Mar 2014 18:26:26 +0100 Subject: [PATCH 2/6] cache_tree_find(): find the end of path component using strchrnul() Suggested-by: Junio Hamano Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- cache-tree.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cache-tree.c b/cache-tree.c index 4d439bd915..d00f4ef7c2 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -554,9 +554,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. */ From 79192b87ad6a57e2b2a6219f0a17e85ece759c0f Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Wed, 5 Mar 2014 18:26:27 +0100 Subject: [PATCH 3/6] cache_tree_find(): fix comment formatting Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- cache-tree.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cache-tree.c b/cache-tree.c index d00f4ef7c2..408ee57a50 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -555,8 +555,9 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat struct cache_tree_sub *sub; slash = strchrnul(path, '/'); - /* between path and slash is the name of the - * subtree to look for. + /* + * Between path and slash is the name of the subtree + * to look for. */ sub = find_subtree(it, path, slash - path, 0); if (!sub) From 03b0403b4a957bb52f5266ac071869da32a3be0a Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Wed, 5 Mar 2014 18:26:28 +0100 Subject: [PATCH 4/6] cache_tree_find(): remove redundant check If *slash == '/', then it is necessarily non-NUL. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- cache-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache-tree.c b/cache-tree.c index 408ee57a50..39ad8c9941 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -563,7 +563,7 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat if (!sub) return NULL; it = sub->cache_tree; - while (*slash && *slash == '/') + while (*slash == '/') slash++; if (!*slash) return it; /* prefix ended with slashes */ From 8b7e5f79723b0f2e1d3dca4e959ad2a2041e9453 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Wed, 5 Mar 2014 18:26:29 +0100 Subject: [PATCH 5/6] cache_tree_find(): remove early return There is no need for an early return it; from the loop if slash points at the end of the string, because that is exactly what will happen when the while condition fails at the start of the next iteration. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- cache-tree.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/cache-tree.c b/cache-tree.c index 39ad8c9941..17db9f9045 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -565,8 +565,6 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat it = sub->cache_tree; while (*slash == '/') slash++; - if (!*slash) - return it; /* prefix ended with slashes */ path = slash; } return it; From 3491047e14532f4c01e3459d59d914d9598721c5 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Wed, 5 Mar 2014 18:26:30 +0100 Subject: [PATCH 6/6] cache_tree_find(): use path variable when passing over slashes The search for the end of the slashes is part of the update of the path variable for the next iteration as opposed to an update of the slash variable. So iterate using path rather than slash. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- cache-tree.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cache-tree.c b/cache-tree.c index 17db9f9045..7f8d74dbcd 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -563,9 +563,10 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat if (!sub) return NULL; it = sub->cache_tree; - while (*slash == '/') - slash++; + path = slash; + while (*path == '/') + path++; } return it; }