[gentoo-commits] proj/portage-utils:master commit in: libq/, /

["Fabian Groffen" <grobian@gentoo.org>]

commit:     264be8b792d2ddd131d1a52cc1773c60c52a1a51
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 10:03:47 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 10:03:47 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=264be8b7

libq/tree: rename tree_get_vdb_atoms to tree_get_atoms

in qmerge take advantage of tree_get_atoms to fold the packages for all
trees (overlays) next to vdb contents into one using the same code that
builds the vdb list

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 libq/tree.c | 20 ++++++++------------
 libq/tree.h |  2 +-
 qmerge.c    | 12 +++++++++---
 qpkg.c      | 28 +++++++++-------------------
 4 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/libq/tree.c b/libq/tree.c
index f4314d0..99e864b 100644
--- a/libq/tree.c
+++ b/libq/tree.c
@@ -1042,14 +1042,14 @@ tree_get_atom(tree_pkg_ctx *pkg_ctx, bool complete)
 	return pkg_ctx->atom;
 }
 
-struct get_vdb_atoms_state {
+struct get_atoms_state {
 	set *cpf;
 	bool fullcpv;
 };
 
-static int tree_get_vdb_atoms_cb(tree_pkg_ctx *pkg_ctx, void *priv)
+static int tree_get_atoms_cb(tree_pkg_ctx *pkg_ctx, void *priv)
 {
-	struct get_vdb_atoms_state *state = (struct get_vdb_atoms_state *)priv;
+	struct get_atoms_state *state = (struct get_atoms_state *)priv;
 	depend_atom *atom = tree_get_atom(pkg_ctx, false);
 
 	if (state->fullcpv) {
@@ -1063,18 +1063,14 @@ static int tree_get_vdb_atoms_cb(tree_pkg_ctx *pkg_ctx, void *priv)
 }
 
 set *
-tree_get_vdb_atoms(const char *sroot, const char *svdb, int fullcpv)
+tree_get_atoms(tree_ctx *ctx, bool fullcpv, set *satoms)
 {
-	tree_ctx *ctx;
-	struct get_vdb_atoms_state state = {
-		.cpf = NULL,
-		.fullcpv = fullcpv != 0
+	struct get_atoms_state state = {
+		.cpf = satoms,
+		.fullcpv = fullcpv
 	};
 
-	ctx = tree_open_vdb(sroot, svdb);
-	if (!ctx)
-		return NULL;
-	tree_foreach_pkg_fast(ctx, tree_get_vdb_atoms_cb, &state, NULL);
+	tree_foreach_pkg_fast(ctx, tree_get_atoms_cb, &state, NULL);
 	tree_close(ctx);
 
 	return state.cpf;

diff --git a/libq/tree.h b/libq/tree.h
index 36554be..c2a30f1 100644
--- a/libq/tree.h
+++ b/libq/tree.h
@@ -135,7 +135,7 @@ int tree_foreach_pkg(tree_ctx *ctx,
 #define tree_foreach_pkg_sorted(ctx, cb, priv) \
 	tree_foreach_pkg(ctx, cb, priv, NULL, true, NULL, NULL);
 struct dirent *tree_get_next_dir(DIR *dir);
-set *tree_get_vdb_atoms(const char *sroot, const char *svdb, int fullcpv);
+set *tree_get_atoms(tree_ctx *ctx, bool fullcpv, set *satoms);
 depend_atom *tree_get_atom(tree_pkg_ctx *pkg_ctx, bool complete);
 
 #endif

diff --git a/qmerge.c b/qmerge.c
index cb4342c..a3686ac 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -2350,9 +2350,15 @@ qmerge_add_set(char *buf, set *q)
 	if (strcmp(buf, "world") == 0)
 		return qmerge_add_set_file(CONFIG_EPREFIX, "/var/lib/portage",
 				"world", q);
-	else if (strcmp(buf, "all") == 0)
-		return tree_get_vdb_atoms(portroot, portvdb, 0);
-	else if (strcmp(buf, "system") == 0)
+	else if (strcmp(buf, "all") == 0) {
+		tree_ctx *ctx = tree_open_vdb(portroot, portvdb);
+		set *ret = NULL;
+		if (ctx != NULL) {
+			ret = tree_get_atoms(ctx, false, NULL);
+			tree_close(ctx);
+		}
+		return ret;
+	} else if (strcmp(buf, "system") == 0)
 		return q_profile_walk("packages", qmerge_add_set_system, q);
 	else if (buf[0] == '@')
 		/* TODO: use configroot */

diff --git a/qpkg.c b/qpkg.c
index 4063af2..2c5a6c3 100644
--- a/qpkg.c
+++ b/qpkg.c
@@ -123,21 +123,6 @@ qpkg_clean_dir(char *dirp, set *vdb)
 	return num_all_bytes;
 }
 
-static int
-qpkg_cb(tree_pkg_ctx *pkg_ctx, void *priv)
-{
-	set *vdb = (set *)priv;
-	char buf[_Q_PATH_MAX];
-
-	if (tree_get_atom(pkg_ctx, false) == NULL)
-		return 0;
-
-	snprintf(buf, sizeof(buf), "%s/%s", pkg_ctx->cat_ctx->name, pkg_ctx->name);
-	vdb = add_set(buf, vdb);
-
-	return 1;
-}
-
 /* figure out what dirs we want to process for cleaning and display results. */
 static int
 qpkg_clean(char *dirp)
@@ -146,23 +131,28 @@ qpkg_clean(char *dirp)
 	size_t disp_units = 0;
 	uint64_t num_all_bytes;
 	struct dirent **dnames;
-	set *vdb;
+	set *vdb = NULL;
+	tree_ctx *t;
 
 	if (chdir(dirp) != 0)
 		return 1;
 	if ((count = scandir(".", &dnames, filter_hidden, alphasort)) < 0)
 		return 1;
 
-	vdb = tree_get_vdb_atoms(portroot, portvdb, 1);
+	t = tree_open_vdb(portroot, portvdb);
+	if (t != NULL) {
+		vdb = tree_get_atoms(t, true, vdb);
+		tree_close(t);
+	}
 
 	if (eclean) {
 		size_t n;
 		const char *overlay;
 
 		array_for_each(overlays, n, overlay) {
-			tree_ctx *t = tree_open(portroot, overlay);
+			t = tree_open(portroot, overlay);
 			if (t != NULL) {
-				tree_foreach_pkg_fast(t, qpkg_cb, vdb, NULL);
+				vdb = tree_get_atoms(t, true, vdb);
 				tree_close(t);
 			}
 		}