summaryrefslogtreecommitdiffstats
path: root/Source/cmArchiveWrite.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/cmArchiveWrite.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/cmArchiveWrite.cxx')
-rw-r--r--Source/cmArchiveWrite.cxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 234af79..9f56324 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -89,49 +89,49 @@ cmArchiveWrite::cmArchiveWrite(
switch (c)
{
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);
return;
}
break;
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);
return;
}
break;
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);
return;
}
break;
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);
return;
}
break;
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);
return;
}
break;
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);
return;
}
@@ -176,8 +176,8 @@ cmArchiveWrite::cmArchiveWrite(
//----------------------------------------------------------------------------
cmArchiveWrite::~cmArchiveWrite()
{
- archive_read_finish(this->Disk);
- archive_write_finish(this->Archive);
+ archive_read_free(this->Disk);
+ archive_write_free(this->Archive);
}
//----------------------------------------------------------------------------