commit c18d206ea923da6e421752b7f9064322226dd1cc
from: Stefan Sperling <stsp@stsp.name>
date: Mon Jan 28 22:17:39 2019 UTC

simplify in_same_subdir()

commit - 8598730929acbd421b4bdda80a291e9c757f039b
commit + c18d206ea923da6e421752b7f9064322226dd1cc
blob - 8e0ead830c45f52b6816b1f15e2db29413ec3019
blob + ae241b03118c3f7d51be35b73cc378a70b389b96
--- lib/fileindex.c
+++ lib/fileindex.c
@@ -551,10 +551,8 @@ static int
 in_same_subdir(struct got_fileindex_entry *ie, const char *ie_name,
     const char *parent_path, size_t parent_len)
 {
-	if (!got_path_is_child(ie->path, parent_path, parent_len))
-		return 0;
-
-	return strchr(ie_name, '/') == NULL;
+	return (got_path_is_child(ie->path, parent_path, parent_len) &&
+	    strchr(ie_name, '/') == NULL);
 }
 
 /*