kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'libarchive-modern-apis' 

e7f93715 Use modern libarchive APIs
This commit is contained in:
Brad King 2015-08-25 15:13:31 -04:00 committed by CMake Topic Stage
parent 90eb6de68f e7f937155f
commit 96dafff97f
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/cmArchiveWrite.cxx
View File

@ -89,49 +89,49 @@ cmArchiveWrite::cmArchiveWrite(
switch (c) switch (c)
{ {
case CompressNone: case CompressNone:
if(archive_write_set_compression_none(this->Archive) != ARCHIVE_OK) if(archive_write_add_filter_none(this->Archive) != ARCHIVE_OK)
{ {
this->Error = "archive_write_set_compression_none: "; this->Error = "archive_write_add_filter_none: ";
this->Error += cm_archive_error_string(this->Archive); this->Error += cm_archive_error_string(this->Archive);
return; return;
} }
break; break;
case CompressCompress: case CompressCompress:
if(archive_write_set_compression_compress(this->Archive) != ARCHIVE_OK) if(archive_write_add_filter_compress(this->Archive) != ARCHIVE_OK)
{ {
this->Error = "archive_write_set_compression_compress: "; this->Error = "archive_write_add_filter_compress: ";
this->Error += cm_archive_error_string(this->Archive); this->Error += cm_archive_error_string(this->Archive);
return; return;
} }
break; break;
case CompressGZip: case CompressGZip:
if(archive_write_set_compression_gzip(this->Archive) != ARCHIVE_OK) if(archive_write_add_filter_gzip(this->Archive) != ARCHIVE_OK)
{ {
this->Error = "archive_write_set_compression_gzip: "; this->Error = "archive_write_add_filter_gzip: ";
this->Error += cm_archive_error_string(this->Archive); this->Error += cm_archive_error_string(this->Archive);
return; return;
} }
break; break;
case CompressBZip2: case CompressBZip2:
if(archive_write_set_compression_bzip2(this->Archive) != ARCHIVE_OK) if(archive_write_add_filter_bzip2(this->Archive) != ARCHIVE_OK)
{ {
this->Error = "archive_write_set_compression_bzip2: "; this->Error = "archive_write_add_filter_bzip2: ";
this->Error += cm_archive_error_string(this->Archive); this->Error += cm_archive_error_string(this->Archive);
return; return;
} }
break; break;
case CompressLZMA: case CompressLZMA:
if(archive_write_set_compression_lzma(this->Archive) != ARCHIVE_OK) if(archive_write_add_filter_lzma(this->Archive) != ARCHIVE_OK)
{ {
this->Error = "archive_write_set_compression_lzma: "; this->Error = "archive_write_add_filter_lzma: ";
this->Error += cm_archive_error_string(this->Archive); this->Error += cm_archive_error_string(this->Archive);
return; return;
} }
break; break;
case CompressXZ: case CompressXZ:
if(archive_write_set_compression_xz(this->Archive) != ARCHIVE_OK) if(archive_write_add_filter_xz(this->Archive) != ARCHIVE_OK)
{ {
this->Error = "archive_write_set_compression_xz: "; this->Error = "archive_write_add_filter_xz: ";
this->Error += cm_archive_error_string(this->Archive); this->Error += cm_archive_error_string(this->Archive);
return; return;
} }
@ -176,8 +176,8 @@ cmArchiveWrite::cmArchiveWrite(
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmArchiveWrite::~cmArchiveWrite() cmArchiveWrite::~cmArchiveWrite()
{ {
archive_read_finish(this->Disk); archive_read_free(this->Disk);
archive_write_finish(this->Archive); archive_write_free(this->Archive);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

4
Source/cmSystemTools.cxx
View File

@ -1704,7 +1704,7 @@ bool extract_tar(const char* outFileName, bool verbose,
static_cast<void>(localeRAII); static_cast<void>(localeRAII);
struct archive* a = archive_read_new(); struct archive* a = archive_read_new();
struct archive *ext = archive_write_disk_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); archive_read_support_format_all(a);
struct archive_entry *entry; struct archive_entry *entry;
int r = cm_archive_read_open_file(a, outFileName, 10240); 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_write_free(ext);
archive_read_close(a); archive_read_close(a);
archive_read_finish(a); archive_read_free(a);
return r == ARCHIVE_EOF || r == ARCHIVE_OK; return r == ARCHIVE_EOF || r == ARCHIVE_OK;
} }
} }