From 4adb0b5dc62a38ee7b57bc3ac6a86ac4ea1a4237 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sat, 5 May 2012 20:52:17 -0500 Subject: [PATCH] pkg: clean up pkg_traverse() logic --- main.c | 6 +++--- pkg.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index 5f238cf..6d9366e 100644 --- a/main.c +++ b/main.c @@ -304,7 +304,7 @@ pkg_queue_walk(pkg_queue_t *head) want_cflags = 0; want_libs = 0; - pkg_traverse(&world, print_modversion, NULL, 3, global_traverse_flags); + pkg_traverse(&world, print_modversion, NULL, 2, global_traverse_flags); } if (want_variables) @@ -313,7 +313,7 @@ pkg_queue_walk(pkg_queue_t *head) want_cflags = 0; want_libs = 0; - pkg_traverse(&world, print_variables, NULL, 3, global_traverse_flags); + pkg_traverse(&world, print_variables, NULL, 2, global_traverse_flags); } if (want_requires) @@ -371,7 +371,7 @@ pkg_queue_walk(pkg_queue_t *head) if (want_variable) { wanted_something++; - pkg_traverse(&world, print_variable, NULL, 3, global_traverse_flags); + pkg_traverse(&world, print_variable, NULL, 2, global_traverse_flags); } if (wanted_something) diff --git a/pkg.c b/pkg.c index bc29b7d..0ed3f43 100644 --- a/pkg.c +++ b/pkg.c @@ -349,7 +349,7 @@ static inline void pkg_walk_list(pkg_dependency_t *deplist, void (*pkg_traverse_func)(pkg_t *package, void *data), void *data, - int maxdepth, + int depth, unsigned int flags) { unsigned int eflags; @@ -366,7 +366,7 @@ pkg_walk_list(pkg_dependency_t *deplist, if (eflags != PKG_ERRF_OK) return pkg_report_graph_error(pkgdep, node, eflags); - pkg_traverse(pkgdep, pkg_traverse_func, data, maxdepth - 1, flags); + pkg_traverse(pkgdep, pkg_traverse_func, data, depth - 1, flags); } } @@ -385,10 +385,10 @@ pkg_traverse(pkg_t *root, if (maxdepth == 0) return; - pkg_walk_list(root->requires, pkg_traverse_func, data, maxdepth - 1, flags); + pkg_walk_list(root->requires, pkg_traverse_func, data, maxdepth, flags); if (flags & PKGF_SEARCH_PRIVATE) - pkg_walk_list(root->requires_private, pkg_traverse_func, data, maxdepth - 1, flags); + pkg_walk_list(root->requires_private, pkg_traverse_func, data, maxdepth, flags); if (pkg_traverse_func != NULL) pkg_traverse_func(root, data);