diff options
author | Dan McGee <dan@archlinux.org> | 2011-06-20 00:07:10 -0500 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-06-20 00:07:10 -0500 |
commit | 0ee9ced4cbcff27823d4a1d5e0ef8a49dfc9dd8e (patch) | |
tree | 0596e17d100cb1de355cfd89556ff118d95598a2 /src/pacman/query.c | |
parent | eb2d607899117757971186845930242c4541bfb4 (diff) | |
parent | 25b7df4dab61e908a0f86e3aad51f1f5c9ed2ccb (diff) |
Merge branch 'public-structs'
Diffstat (limited to 'src/pacman/query.c')
-rw-r--r-- | src/pacman/query.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/pacman/query.c b/src/pacman/query.c index 06fd704a..aa779075 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -304,14 +304,11 @@ static int query_group(alpm_list_t *targets) if(targets == NULL) { for(j = alpm_db_get_grpcache(db_local); j; j = alpm_list_next(j)) { pmgrp_t *grp = alpm_list_getdata(j); - const alpm_list_t *p, *packages; - const char *grpname; + const alpm_list_t *p; - grpname = alpm_grp_get_name(grp); - packages = alpm_grp_get_pkgs(grp); - - for(p = packages; p; p = alpm_list_next(p)) { - printf("%s %s\n", grpname, alpm_pkg_get_name(alpm_list_getdata(p))); + for(p = grp->packages; p; p = alpm_list_next(p)) { + pmpkg_t *pkg = alpm_list_getdata(p); + printf("%s %s\n", grp->name, alpm_pkg_get_name(pkg)); } } } else { @@ -320,8 +317,8 @@ static int query_group(alpm_list_t *targets) grpname = alpm_list_getdata(i); grp = alpm_db_readgrp(db_local, grpname); if(grp) { - const alpm_list_t *p, *packages = alpm_grp_get_pkgs(grp); - for(p = packages; p; p = alpm_list_next(p)) { + const alpm_list_t *p; + for(p = grp->packages; p; p = alpm_list_next(p)) { if(!config->quiet) { printf("%s %s\n", grpname, alpm_pkg_get_name(alpm_list_getdata(p))); |