diff options
author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2013-04-13 02:37:56 +0200 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2013-06-03 05:33:47 +0200 |
commit | 5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8 (patch) | |
tree | e8d7720c44591267568694051313747df2b53b14 /lib/libalpm/package.c | |
parent | 0c41663c7b5a9d73ea49c20b74149d12f0fcd26c (diff) | |
download | pacman-5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8.tar.gz pacman-5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8.tar.xz |
alpm_filelist: remove resolved_path
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/package.c')
-rw-r--r-- | lib/libalpm/package.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 098c8677..cfdbb3f8 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -606,9 +606,6 @@ int _alpm_pkg_dup(alpm_pkg_t *pkg, alpm_pkg_t **new_ptr) } } newpkg->files.count = pkg->files.count; - /* deliberately do not copy resolved_path as this is only used - * during conflict checking and the sorting of list does not readily - * allow keeping its efficient memory usage when copying */ } /* internal */ @@ -657,22 +654,9 @@ void _alpm_pkg_free(alpm_pkg_t *pkg) free_deplist(pkg->replaces); FREELIST(pkg->groups); if(pkg->files.count) { - size_t i, j, k; - if(pkg->files.resolved_path) { - for(i = 0, j = 0; i < pkg->files.count; i++) { - for(k = j; k <= pkg->files.count; k++) { - if(pkg->files.resolved_path[i] == pkg->files.files[k].name) { - pkg->files.files[k].name = NULL; - j = k + 1; - break; - } - } - free(pkg->files.resolved_path[i]); - } - free(pkg->files.resolved_path); - } - for(j = 0; j < pkg->files.count; j++) { - FREE(pkg->files.files[j].name); + size_t i; + for(i = 0; i < pkg->files.count; i++) { + FREE(pkg->files.files[i].name); } free(pkg->files.files); } |