[PATCH v3 1/6] cache_tree_find(): remove redundant checks

From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Mar 5, 2014, 17:26 UTC
Message-ID: <1394040390-7954-2-git-send-email-mhagger@alum.mit.edu>
In-Reply-To: <1394040390-7954-1-git-send-email-mhagger@alum.mit.edu>

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 <dak@gnu.org>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 cache-tree.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cache-tree.c b/cache-tree.c
index 0bbec43..4d439bd 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;
 	}

-- 
1.9.0