diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-20 07:07:10 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-20 07:07:10 +0200 |
| commit | 0ee9ced4cbcff27823d4a1d5e0ef8a49dfc9dd8e (patch) | |
| tree | 0596e17d100cb1de355cfd89556ff118d95598a2 /src/util | |
| parent | eb2d607899117757971186845930242c4541bfb4 (diff) | |
| parent | 25b7df4dab61e908a0f86e3aad51f1f5c9ed2ccb (diff) | |
| download | pacman-0ee9ced4cbcff27823d4a1d5e0ef8a49dfc9dd8e.tar.gz pacman-0ee9ced4cbcff27823d4a1d5e0ef8a49dfc9dd8e.tar.xz | |
Merge branch 'public-structs'
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/pactree.c | 8 | ||||
| -rw-r--r-- | src/util/testdb.c | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/util/pactree.c b/src/util/pactree.c index 1dee61bf..6b29d935 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -290,7 +290,7 @@ static void walk_deps(pmpkg_t *pkg, int depth) for(i = alpm_pkg_get_depends(pkg); i; i = alpm_list_next(i)) { pmdepend_t *depend = alpm_list_getdata(i); pmpkg_t *provider = alpm_find_satisfier(alpm_db_get_pkgcache(db_local), - alpm_dep_get_name(depend)); + depend->name); if(provider) { const char *provname = alpm_pkg_get_name(provider); @@ -299,15 +299,15 @@ static void walk_deps(pmpkg_t *pkg, int depth) /* if we've already seen this package, don't print in "unique" output * and don't recurse */ if(!unique) { - print(alpm_pkg_get_name(pkg), provname, alpm_dep_get_name(depend), depth); + print(alpm_pkg_get_name(pkg), provname, depend->name, depth); } } else { - print(alpm_pkg_get_name(pkg), provname, alpm_dep_get_name(depend), depth); + print(alpm_pkg_get_name(pkg), provname, depend->name, depth); walk_deps(provider, depth + 1); } } else { /* unresolvable package */ - print(alpm_pkg_get_name(pkg), NULL, alpm_dep_get_name(depend), depth); + print(alpm_pkg_get_name(pkg), NULL, depend->name, depth); } } } diff --git a/src/util/testdb.c b/src/util/testdb.c index 0bd78202..4937480d 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -101,9 +101,8 @@ static int checkdeps(alpm_list_t *pkglist) data = alpm_checkdeps(handle, pkglist, NULL, pkglist, 0); for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); - pmdepend_t *dep = alpm_miss_get_dep(miss); - char *depstring = alpm_dep_compute_string(dep); - printf("missing dependency for %s : %s\n", alpm_miss_get_target(miss), + char *depstring = alpm_dep_compute_string(miss->depend); + printf("missing dependency for %s : %s\n", miss->target, depstring); free(depstring); ret++; @@ -120,8 +119,8 @@ static int checkconflicts(alpm_list_t *pkglist) data = alpm_checkconflicts(handle, pkglist); for(i = data; i; i = i->next) { pmconflict_t *conflict = alpm_list_getdata(i); - printf("%s conflicts with %s\n", alpm_conflict_get_package1(conflict), - alpm_conflict_get_package2(conflict)); + printf("%s conflicts with %s\n", + conflict->package1, conflict->package2); ret++; } FREELIST(data); |