xbps-query: adapt to the new libxbps API.
This commit is contained in:
@ -159,7 +159,7 @@ repo_list_uri_cb(struct xbps_repo *repo, void *arg _unused, bool *done _unused)
|
|||||||
printf("%5zd %s",
|
printf("%5zd %s",
|
||||||
repo->idx ? (ssize_t)xbps_dictionary_count(repo->idx) : -1,
|
repo->idx ? (ssize_t)xbps_dictionary_count(repo->idx) : -1,
|
||||||
repo->uri);
|
repo->uri);
|
||||||
if (xbps_repository_is_remote(repo->uri)) {
|
if (repo->is_remote) {
|
||||||
printf(" (RSA %s, %s)",
|
printf(" (RSA %s, %s)",
|
||||||
repo->is_signed ? "signed" : "unsigned",
|
repo->is_signed ? "signed" : "unsigned",
|
||||||
repo->is_verified ? "verified" : "unverified");
|
repo->is_verified ? "verified" : "unverified");
|
||||||
|
@ -158,18 +158,16 @@ static int
|
|||||||
repo_ownedby_cb(struct xbps_repo *repo, void *arg, bool *done _unused)
|
repo_ownedby_cb(struct xbps_repo *repo, void *arg, bool *done _unused)
|
||||||
{
|
{
|
||||||
xbps_array_t allkeys;
|
xbps_array_t allkeys;
|
||||||
xbps_dictionary_t filesd;
|
|
||||||
struct ffdata *ffd = arg;
|
struct ffdata *ffd = arg;
|
||||||
int rv;
|
int rv;
|
||||||
|
|
||||||
filesd = xbps_repo_get_plist(repo, XBPS_REPOIDX_FILES);
|
xbps_repo_open_idxfiles(repo);
|
||||||
if (filesd == NULL)
|
if (repo->idxfiles == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ffd->repouri = repo->uri;
|
ffd->repouri = repo->uri;
|
||||||
allkeys = xbps_dictionary_all_keys(filesd);
|
allkeys = xbps_dictionary_all_keys(repo->idxfiles);
|
||||||
rv = xbps_array_foreach_cb(repo->xhp, allkeys, filesd, repo_match_cb, ffd);
|
rv = xbps_array_foreach_cb(repo->xhp, allkeys, repo->idxfiles, repo_match_cb, ffd);
|
||||||
xbps_object_release(filesd);
|
|
||||||
xbps_object_release(allkeys);
|
xbps_object_release(allkeys);
|
||||||
|
|
||||||
return rv;
|
return rv;
|
||||||
|
Reference in New Issue
Block a user