diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/pacman/package.c | 9 | ||||
-rw-r--r-- | src/pacman/query.c | 19 |
2 files changed, 16 insertions, 12 deletions
diff --git a/src/pacman/package.c b/src/pacman/package.c index afbac6b7..45afded2 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -230,15 +230,16 @@ void dump_pkg_backups(alpm_pkg_t *pkg) void dump_pkg_files(alpm_pkg_t *pkg, int quiet) { const char *pkgname, *root; - alpm_list_t *i, *pkgfiles; + alpm_filelist_t *pkgfiles; + size_t i; pkgname = alpm_pkg_get_name(pkg); pkgfiles = alpm_pkg_get_files(pkg); root = alpm_option_get_root(config->handle); - for(i = pkgfiles; i; i = alpm_list_next(i)) { - const alpm_file_t *file = alpm_list_getdata(i); - if(!quiet){ + for(i = 0; i < pkgfiles->count; i++) { + const alpm_file_t *file = pkgfiles->files + i; + if(!quiet) { fprintf(stdout, "%s %s%s\n", pkgname, root, file->name); } else { fprintf(stdout, "%s%s\n", root, file->name); diff --git a/src/pacman/query.c b/src/pacman/query.c index 251c4dd6..163c3319 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -191,12 +191,13 @@ static int query_fileowner(alpm_list_t *targets) free(dname); for(i = alpm_db_get_pkgcache(db_local); i && !found; i = alpm_list_next(i)) { - alpm_list_t *j; alpm_pkg_t *info = alpm_list_getdata(i); + alpm_filelist_t *filelist = alpm_pkg_get_files(info); + size_t i; - for(j = alpm_pkg_get_files(info); j && !found; j = alpm_list_next(j)) { + for(i = 0; i < filelist->count; i++) { + const alpm_file_t *file = filelist->files + i; char *ppath, *pdname; - const alpm_file_t *file = alpm_list_getdata(j); const char *pkgfile = file->name; /* avoid the costly resolve_path usage if the basenames don't match */ @@ -402,11 +403,12 @@ static int filter(alpm_pkg_t *pkg) * loop through files to check if they exist. */ static int check(alpm_pkg_t *pkg) { - alpm_list_t *i; - const char *root; + const char *root, *pkgname; int allfiles = 0, errors = 0; size_t rootlen; char f[PATH_MAX]; + alpm_filelist_t *filelist; + size_t i; root = alpm_option_get_root(config->handle); rootlen = strlen(root); @@ -417,10 +419,11 @@ static int check(alpm_pkg_t *pkg) } strcpy(f, root); - const char *pkgname = alpm_pkg_get_name(pkg); - for(i = alpm_pkg_get_files(pkg); i; i = alpm_list_next(i)) { + pkgname = alpm_pkg_get_name(pkg); + filelist = alpm_pkg_get_files(pkg); + for(i = 0; i < filelist->count; i++) { + const alpm_file_t *file = filelist->files + i; struct stat st; - const alpm_file_t *file = alpm_list_getdata(i); const char *path = file->name; if(rootlen + 1 + strlen(path) > PATH_MAX) { |