directory: don't require a "directory" visitor

.. to recurse. A visitor may not have one, but still be interested in a recursive search.

directory: don't require a "directory" visitor
2ff35c8b · Max Kellermann · 169db88c · 2ff35c8b
Commit 2ff35c8b authored Sep 13, 2011 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

directory.c src/directory.c +6 -6

No files found.
--- a/src/directory.c
+++ b/src/directory.c
@@ -188,12 +188,12 @@ directory_walk(struct directory *directory,
 				return false;
 	}
-	if (visitor->directory != NULL) {
+	const struct dirvec *dv = &directory->children;
-		const struct dirvec *dv = &directory->children;
+	for (size_t i = 0; i < dv->nr; ++i) {
-		for (size_t i = 0; i < dv->nr; ++i)
+		struct directory *child = dv->base[i];
-			if (!directory_walk(dv->base[i], visitor, ctx,
-					    error_r))
+		if (!directory_walk(child, visitor, ctx, error_r))
-				return false;
+			return false;
 	}
 	return true;