From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 361E9138334 for ; Sat, 11 May 2019 07:14:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 225DEE0871; Sat, 11 May 2019 07:14:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 080FFE0871 for ; Sat, 11 May 2019 07:14:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E92C834402C for ; Sat, 11 May 2019 07:14:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC4C75D0 for ; Sat, 11 May 2019 07:14:48 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1557506450.c7e04780a3161d6e8785c175680751839f9d768b.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qgrep.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: c7e04780a3161d6e8785c175680751839f9d768b X-VCS-Branch: master Date: Sat, 11 May 2019 07:14:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: abd56257-7676-400c-8880-ccb072573b29 X-Archives-Hash: ebf3481f8e6d97162f351e334eace06f commit: c7e04780a3161d6e8785c175680751839f9d768b Author: Fabian Groffen gentoo org> AuthorDate: Fri May 10 16:40:50 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri May 10 16:40:50 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=c7e04780 qgrep: use tree_get_atom Signed-off-by: Fabian Groffen gentoo.org> qgrep.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/qgrep.c b/qgrep.c index 8e240f3..2db61df 100644 --- a/qgrep.c +++ b/qgrep.c @@ -391,9 +391,7 @@ qgrep_cache_cb(tree_pkg_ctx *pkg_ctx, void *priv) int ret; int pfd; - snprintf(buf, sizeof(buf), "%s/%s", - pkg_ctx->cat_ctx->name, pkg_ctx->name); - patom = atom_explode(buf); + patom = tree_get_atom(pkg_ctx, false); if (patom == NULL) return EXIT_FAILURE; @@ -403,10 +401,8 @@ qgrep_cache_cb(tree_pkg_ctx *pkg_ctx, void *priv) if (atom_compare(patom, *d) == EQUAL) break; } - if (*d == NULL) { - atom_implode(patom); + if (*d == NULL) return EXIT_FAILURE; - } } /* need to construct path in portdir to ebuild, pass it to grep */ @@ -423,6 +419,7 @@ qgrep_cache_cb(tree_pkg_ctx *pkg_ctx, void *priv) label = NULL; if (data->show_name) { + /* this is a super-optimisation, should get it from the full atom */ char *repo = data->show_repo ? cctx->repo : NULL; snprintf(name, sizeof(name), "%s%s/%s%s%s%s%s%s", BOLD, patom->CATEGORY, BLUE, patom->P, GREEN, @@ -434,8 +431,6 @@ qgrep_cache_cb(tree_pkg_ctx *pkg_ctx, void *priv) ret = qgrep_grepat(pfd, buf, label, data); - atom_implode(patom); - return ret; } @@ -450,9 +445,7 @@ qgrep_vdb_cb(tree_pkg_ctx *pkg_ctx, void *priv) int ret; int pfd; - snprintf(buf, sizeof(buf), "%s/%s", - pkg_ctx->cat_ctx->name, pkg_ctx->name); - patom = atom_explode(buf); + patom = tree_get_atom(pkg_ctx, false); if (patom == NULL) return EXIT_FAILURE; @@ -487,8 +480,6 @@ qgrep_vdb_cb(tree_pkg_ctx *pkg_ctx, void *priv) ret = qgrep_grepat(pfd, buf, label, data); - atom_implode(patom); - return ret; }