diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2013-01-29 02:23:25 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-01-29 04:37:32 +0100 |
| commit | e1e4bbb79ddd23e46b8d3a01168f4eb410308d5b (patch) | |
| tree | af5e7d24e30a953b3e1e46a76e0b90804a12ebe6 /lib/libalpm/be_local.c | |
| parent | 2a57c2068c3ea744608c364f9cacedd3f0c14849 (diff) | |
| download | pacman-e1e4bbb79ddd23e46b8d3a01168f4eb410308d5b.tar.gz pacman-e1e4bbb79ddd23e46b8d3a01168f4eb410308d5b.tar.xz | |
Use libarchive compat header for relevant symbols
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/be_local.c')
| -rw-r--r-- | lib/libalpm/be_local.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 0f60b6d8..564e1097 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -35,6 +35,7 @@ /* libalpm */ #include "db.h" #include "alpm_list.h" +#include "libarchive-compat.h" #include "log.h" #include "util.h" #include "alpm.h" @@ -241,11 +242,11 @@ static struct archive *_cache_mtree_open(alpm_pkg_t *pkg) archive_read_support_filter_gzip(mtree); archive_read_support_format_mtree(mtree); - if((r = archive_read_open_file(mtree, mtfile, ALPM_BUFFER_SIZE))) { + if((r = _alpm_archive_read_open_file(mtree, mtfile, ALPM_BUFFER_SIZE))) { _alpm_log(pkg->handle, ALPM_LOG_ERROR, _("error while reading file %s: %s\n"), mtfile, archive_error_string(mtree)); pkg->handle->pm_errno = ALPM_ERR_LIBARCHIVE; - archive_read_finish(mtree); + _alpm_archive_read_free(mtree); goto error; } @@ -279,7 +280,7 @@ static int _cache_mtree_next(const alpm_pkg_t UNUSED *pkg, static int _cache_mtree_close(const alpm_pkg_t UNUSED *pkg, struct archive *mtree) { - return archive_read_finish(mtree); + return _alpm_archive_read_free(mtree); } static int _cache_force_load(alpm_pkg_t *pkg) |