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 DC216138346 for ; Sun, 5 Jan 2020 16:08:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9AEEE0991; Sun, 5 Jan 2020 16:08:34 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 B77B6E0991 for ; Sun, 5 Jan 2020 16:08:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C998E34DDCF for ; Sun, 5 Jan 2020 16:08:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0374B9 for ; Sun, 5 Jan 2020 16:08:30 +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: <1578240480.98b3632c7e28b4f7d5eebb7b7ffc255adabe81b7.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: libq/ X-VCS-Repository: proj/portage-utils X-VCS-Files: libq/tree.c libq/tree.h X-VCS-Directories: libq/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 98b3632c7e28b4f7d5eebb7b7ffc255adabe81b7 X-VCS-Branch: master Date: Sun, 5 Jan 2020 16:08:30 +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: f6f9c2e9-f3e8-4b74-a306-d2bc26c2417c X-Archives-Hash: e90942c5303ad99d3a3885632f52dfaa commit: 98b3632c7e28b4f7d5eebb7b7ffc255adabe81b7 Author: Fabian Groffen gentoo org> AuthorDate: Sun Jan 5 16:08:00 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Jan 5 16:08:00 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=98b3632c libq/tree: make some unused functions private (static) Signed-off-by: Fabian Groffen gentoo.org> libq/tree.c | 8 ++++---- libq/tree.h | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/libq/tree.c b/libq/tree.c index bb3aa69..0b01f14 100644 --- a/libq/tree.c +++ b/libq/tree.c @@ -27,6 +27,8 @@ #include static int tree_pkg_compar(const void *l, const void *r); +static tree_pkg_ctx * tree_next_pkg_int(tree_cat_ctx *cat_ctx); +static void tree_close_meta(tree_pkg_meta *cache); static tree_ctx * tree_open_int(const char *sroot, const char *tdir, bool quiet) @@ -363,8 +365,6 @@ tree_pkg_compar(const void *l, const void *r) return atom_compar_cb(al, ar); } -static tree_pkg_ctx * -tree_next_pkg_int(tree_cat_ctx *cat_ctx); static tree_pkg_ctx * tree_next_pkg_int(tree_cat_ctx *cat_ctx) { @@ -926,7 +926,7 @@ tree_read_file_binpkg(tree_pkg_ctx *pkg_ctx) return m; } -tree_pkg_meta * +static tree_pkg_meta * tree_pkg_read(tree_pkg_ctx *pkg_ctx) { tree_ctx *ctx = pkg_ctx->cat_ctx->ctx; @@ -963,7 +963,7 @@ tree_pkg_read(tree_pkg_ctx *pkg_ctx) return NULL; } -void +static void tree_close_meta(tree_pkg_meta *cache) { if (cache == NULL) diff --git a/libq/tree.h b/libq/tree.h index c941172..6627e80 100644 --- a/libq/tree.h +++ b/libq/tree.h @@ -121,8 +121,6 @@ tree_cat_ctx *tree_open_cat(tree_ctx *ctx, const char *name); void tree_close_cat(tree_cat_ctx *cat_ctx); tree_pkg_ctx *tree_open_pkg(tree_cat_ctx *cat_ctx, const char *name); tree_pkg_ctx *tree_next_pkg(tree_cat_ctx *cat_ctx); -tree_pkg_meta *tree_pkg_read(tree_pkg_ctx *pkg_ctx); -void tree_close_meta(tree_pkg_meta *cache); char *tree_pkg_meta_get_int(tree_pkg_ctx *pkg_ctx, size_t offset, const char *key); #define tree_pkg_meta_get(P,X) \ tree_pkg_meta_get_int(P, offsetof(tree_pkg_meta, Q_##X), #X) @@ -135,7 +133,6 @@ int tree_foreach_pkg(tree_ctx *ctx, tree_pkg_cb callback, void *priv, tree_foreach_pkg(ctx, cb, priv, false, query); #define tree_foreach_pkg_sorted(ctx, cb, priv, query) \ tree_foreach_pkg(ctx, cb, priv, true, query); -struct dirent *tree_get_next_dir(DIR *dir); set *tree_get_atoms(tree_ctx *ctx, bool fullcpv, set *satoms); depend_atom *tree_get_atom(tree_pkg_ctx *pkg_ctx, bool complete);