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

[Fabian Groffen]

commit:     4f72dc4273f0b0ed5dcf7960ddf5c492b39b0df9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 09:38:06 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun May 12 09:38:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=4f72dc42

qsize: use tree_get_atom

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

 qsize.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/qsize.c b/qsize.c
index 1ae942d..5e9daaa 100644
--- a/qsize.c
+++ b/qsize.c
@@ -100,8 +100,6 @@ static int
 qsize_cb(tree_pkg_ctx *pkg_ctx, void *priv)
 {
        struct qsize_opt_state *state = priv;
-       const char *catname = pkg_ctx->cat_ctx->name;
-       const char *pkgname = pkg_ctx->name;
        size_t i;
        depend_atom *atom;
        FILE *fp;
@@ -113,14 +111,12 @@ qsize_cb(tree_pkg_ctx *pkg_ctx, void *priv)
        if (array_cnt(state->atoms)) {
                depend_atom *qatom;
 
-               snprintf(state->buf, state->buflen, "%s/%s", catname, pkgname);
-               qatom = atom_explode(state->buf);
+               qatom = tree_get_atom(pkg_ctx, 0);
                array_for_each(state->atoms, i, atom)
                        if (atom_compare(atom, qatom) == EQUAL) {
                                showit = true;
                                break;
                        }
-               atom_implode(qatom);
        } else
                showit = true;
        if (!showit)
@@ -164,9 +160,10 @@ qsize_cb(tree_pkg_ctx *pkg_ctx, void *priv)
        state->num_all_ignored += num_ignored;
 
        if (!state->summary_only) {
-               printf("%s%s/%s%s%s: %'zu files, %'zu non-files, ", BOLD,
-                      catname, BLUE, pkgname, NORM,
-                      num_files, num_nonfiles);
+               atom = tree_get_atom(pkg_ctx, 0);
+               printf("%s: %'zu files, %'zu non-files, ",
+                               atom_format("%[CATEGORY]%[PF]", atom, 0),
+                               num_files, num_nonfiles);
                if (num_ignored)
                        printf("%'zu names-ignored, ", num_ignored);
                printf("%s %s\n",