From 1f270e3a1a31c74b5731a7a638e80b16c81fd1a7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 7 Oct 2013 10:22:45 +0200 Subject: [PATCH] xbps-query: adapt to the new libxbps API. --- bin/xbps-query/list.c | 2 +- bin/xbps-query/ownedby.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bin/xbps-query/list.c b/bin/xbps-query/list.c index 6941dc04..28e08665 100644 --- a/bin/xbps-query/list.c +++ b/bin/xbps-query/list.c @@ -159,7 +159,7 @@ repo_list_uri_cb(struct xbps_repo *repo, void *arg _unused, bool *done _unused) printf("%5zd %s", repo->idx ? (ssize_t)xbps_dictionary_count(repo->idx) : -1, repo->uri); - if (xbps_repository_is_remote(repo->uri)) { + if (repo->is_remote) { printf(" (RSA %s, %s)", repo->is_signed ? "signed" : "unsigned", repo->is_verified ? "verified" : "unverified"); diff --git a/bin/xbps-query/ownedby.c b/bin/xbps-query/ownedby.c index 42259b9b..851cf506 100644 --- a/bin/xbps-query/ownedby.c +++ b/bin/xbps-query/ownedby.c @@ -158,18 +158,16 @@ static int repo_ownedby_cb(struct xbps_repo *repo, void *arg, bool *done _unused) { xbps_array_t allkeys; - xbps_dictionary_t filesd; struct ffdata *ffd = arg; int rv; - filesd = xbps_repo_get_plist(repo, XBPS_REPOIDX_FILES); - if (filesd == NULL) + xbps_repo_open_idxfiles(repo); + if (repo->idxfiles == NULL) return 0; ffd->repouri = repo->uri; - allkeys = xbps_dictionary_all_keys(filesd); - rv = xbps_array_foreach_cb(repo->xhp, allkeys, filesd, repo_match_cb, ffd); - xbps_object_release(filesd); + allkeys = xbps_dictionary_all_keys(repo->idxfiles); + rv = xbps_array_foreach_cb(repo->xhp, allkeys, repo->idxfiles, repo_match_cb, ffd); xbps_object_release(allkeys); return rv;