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

[Fabian Groffen]

commit:     0e6d9d14f58fc388b4dca9ce19845f69a553b957
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 08:02:31 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 08:02:31 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=0e6d9d14

quse: fix new Coverity complaints

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

 quse.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/quse.c b/quse.c
index dca2f1c..4a8b89b 100644
--- a/quse.c
+++ b/quse.c
@@ -432,7 +432,7 @@ quse_results_cb(tree_pkg_ctx *pkg_ctx, void *priv)
        }
 
        if (!state->do_licence) {
-               if ((q = tree_pkg_meta_get(pkg_ctx, IUSE)) == NULL)
+               if ((s = tree_pkg_meta_get(pkg_ctx, IUSE)) == NULL)
                        return 0;
 
                if (state->do_describe) {
@@ -454,14 +454,14 @@ quse_results_cb(tree_pkg_ctx *pkg_ctx, void *priv)
                                use = add_set(p, use);
                }
        } else {
-               if ((q = tree_pkg_meta_get(pkg_ctx, LICENSE)) == NULL)
+               if ((s = tree_pkg_meta_get(pkg_ctx, LICENSE)) == NULL)
                        return 0;
        }
 
        maxlen = 0;
        cnt = 0;
        match = false;
-       p = q;  /* set to IUSE or LICENSE above */
+       p = q = s;  /* set to IUSE or LICENSE above */
        buf[0] = '\0';
        v = buf;
        w = buf + sizeof(buf);
@@ -631,7 +631,7 @@ quse_results_cb(tree_pkg_ctx *pkg_ctx, void *priv)
 
        if (use != NULL)
                free_set(use);
-       if (state->do_describe)
+       if (state->do_describe && !state->do_licence)
                close(portdirfd);
 
        return EXIT_SUCCESS;