summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/util.c
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2013-01-29 02:23:25 +0100
committerAllan McRae <allan@archlinux.org>2013-01-29 04:37:32 +0100
commite1e4bbb79ddd23e46b8d3a01168f4eb410308d5b (patch)
treeaf5e7d24e30a953b3e1e46a76e0b90804a12ebe6 /lib/libalpm/util.c
parent2a57c2068c3ea744608c364f9cacedd3f0c14849 (diff)
downloadpacman-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/util.c')
-rw-r--r--lib/libalpm/util.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 5960be6a..f4c33a0d 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -49,6 +49,7 @@
/* libalpm */
#include "util.h"
#include "log.h"
+#include "libarchive-compat.h"
#include "alpm.h"
#include "alpm_list.h"
#include "handle.h"
@@ -240,7 +241,7 @@ int _alpm_open_archive(alpm_handle_t *handle, const char *path,
RET_ERR(handle, ALPM_ERR_LIBARCHIVE, -1);
}
- archive_read_support_compression_all(*archive);
+ _alpm_archive_read_support_filter_all(*archive);
archive_read_support_format_all(*archive);
_alpm_log(handle, ALPM_LOG_DEBUG, "opening archive %s\n", path);
@@ -271,7 +272,7 @@ int _alpm_open_archive(alpm_handle_t *handle, const char *path,
return fd;
error:
- archive_read_finish(*archive);
+ _alpm_archive_read_free(*archive);
*archive = NULL;
if(fd >= 0) {
CLOSE(fd);
@@ -392,7 +393,7 @@ int _alpm_unpack(alpm_handle_t *handle, const char *path, const char *prefix,
cleanup:
umask(oldmask);
- archive_read_finish(archive);
+ _alpm_archive_read_free(archive);
CLOSE(fd);
if(cwdfd >= 0) {
if(fchdir(cwdfd) != 0) {