diff options
Diffstat (limited to 'archivers/libarchive/files/libarchive/test/test_read_extract.c')
| -rw-r--r-- | archivers/libarchive/files/libarchive/test/test_read_extract.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/archivers/libarchive/files/libarchive/test/test_read_extract.c b/archivers/libarchive/files/libarchive/test/test_read_extract.c index 5696e0d356f..c537e4f936c 100644 --- a/archivers/libarchive/files/libarchive/test/test_read_extract.c +++ b/archivers/libarchive/files/libarchive/test/test_read_extract.c @@ -45,7 +45,7 @@ DEFINE_TEST(test_read_extract) /* Create a new archive in memory containing various types of entries. */ assert((a = archive_write_new()) != NULL); assertA(0 == archive_write_set_format_ustar(a)); - assertA(0 == archive_write_set_compression_none(a)); + assertA(0 == archive_write_add_filter_none(a)); assertA(0 == archive_write_open_memory(a, buff, BUFF_SIZE, &used)); /* A directory to be restored with EXTRACT_PERM. */ ++numEntries; @@ -111,13 +111,13 @@ DEFINE_TEST(test_read_extract) archive_entry_free(ae); } /* Close out the archive. */ - assertA(0 == archive_write_close(a)); - assertA(0 == archive_write_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Extract the entries to disk. */ assert((a = archive_read_new()) != NULL); assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_open_memory(a, buff, BUFF_SIZE)); /* Restore first entry with _EXTRACT_PERM. */ failure("Error reading first entry", i); @@ -132,8 +132,8 @@ DEFINE_TEST(test_read_extract) assertA(0 == archive_read_extract(a, ae, 0)); } assertA(ARCHIVE_EOF == archive_read_next_header(a, &ae)); - assert(0 == archive_read_close(a)); - assert(0 == archive_read_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* Test the entries on disk. */ /* This first entry was extracted with ARCHIVE_EXTRACT_PERM, |