summaryrefslogtreecommitdiffstats
path: root/Source/cmSystemTools.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-08-25 19:13:31 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-08-25 19:13:31 (GMT)
commit96dafff97fb4674db3c47b89902722edef45fc65 (patch)
treeeee1b402990937b6e0224cdd5e42336d12958639 /Source/cmSystemTools.cxx
parent90eb6de68ff809b39515a1ac2cff823e86c205e2 (diff)
parente7f937155f6f8b117d6292b3ffe6cf63c8eda9c0 (diff)
downloadCMake-96dafff97fb4674db3c47b89902722edef45fc65.zip
CMake-96dafff97fb4674db3c47b89902722edef45fc65.tar.gz
CMake-96dafff97fb4674db3c47b89902722edef45fc65.tar.bz2
Merge topic 'libarchive-modern-apis'
e7f93715 Use modern libarchive APIs
Diffstat (limited to 'Source/cmSystemTools.cxx')
-rw-r--r--Source/cmSystemTools.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index c6c9f53..3f03b51 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1704,7 +1704,7 @@ bool extract_tar(const char* outFileName, bool verbose,
static_cast<void>(localeRAII);
struct archive* a = archive_read_new();
struct archive *ext = archive_write_disk_new();
- archive_read_support_compression_all(a);
+ archive_read_support_filter_all(a);
archive_read_support_format_all(a);
struct archive_entry *entry;
int r = cm_archive_read_open_file(a, outFileName, 10240);
@@ -1791,7 +1791,7 @@ bool extract_tar(const char* outFileName, bool verbose,
}
archive_write_free(ext);
archive_read_close(a);
- archive_read_finish(a);
+ archive_read_free(a);
return r == ARCHIVE_EOF || r == ARCHIVE_OK;
}
}