diff options
Diffstat (limited to 'contrib/libarchive/libarchive/test/test_ustar_filenames.c')
| -rw-r--r-- | contrib/libarchive/libarchive/test/test_ustar_filenames.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/contrib/libarchive/libarchive/test/test_ustar_filenames.c b/contrib/libarchive/libarchive/test/test_ustar_filenames.c index 130a31ec61ce..8afe4d113e90 100644 --- a/contrib/libarchive/libarchive/test/test_ustar_filenames.c +++ b/contrib/libarchive/libarchive/test/test_ustar_filenames.c @@ -110,19 +110,15 @@ test_filename(const char *prefix, int dlen, int flen) archive_entry_free(ae); /* Close out the archive. */ - assertA(0 == archive_write_close(a)); -#if ARCHIVE_VERSION_NUMBER < 2000000 - archive_write_finish(a); -#else - assertEqualInt(0, archive_write_finish(a)); -#endif + assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Now, read the data back. */ 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, used)); if (flen <= 100) { @@ -156,12 +152,8 @@ test_filename(const char *prefix, int dlen, int flen) /* Verify the end of the archive. */ failure("This fails if entries were written that should not have been written. dlen=%d, flen=%d", dlen, flen); assertEqualInt(1, archive_read_next_header(a, &ae)); - assert(0 == archive_read_close(a)); -#if ARCHIVE_VERSION_NUMBER < 2000000 - archive_read_finish(a); -#else - assertEqualInt(0, archive_read_finish(a)); -#endif + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } DEFINE_TEST(test_ustar_filenames) |