diff options
Diffstat (limited to 'archivers/libarchive/files/libarchive/test/test_read_format_isorr_rr_moved.c')
| -rw-r--r-- | archivers/libarchive/files/libarchive/test/test_read_format_isorr_rr_moved.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/archivers/libarchive/files/libarchive/test/test_read_format_isorr_rr_moved.c b/archivers/libarchive/files/libarchive/test/test_read_format_isorr_rr_moved.c index d59b3464030..693caef621f 100644 --- a/archivers/libarchive/files/libarchive/test/test_read_format_isorr_rr_moved.c +++ b/archivers/libarchive/files/libarchive/test/test_read_format_isorr_rr_moved.c @@ -65,12 +65,12 @@ DEFINE_TEST(test_read_format_isorr_rr_moved) struct archive *a; const void *p; size_t size; - off_t offset; + int64_t offset; int i; extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualInt(0, archive_read_support_compression_all(a)); + assertEqualInt(0, archive_read_support_filter_all(a)); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); @@ -80,6 +80,9 @@ DEFINE_TEST(test_read_format_isorr_rr_moved) for (i = 0; i < 13; ++i) { assertEqualInt(0, archive_read_next_header(a, &ae)); + assertEqualInt(archive_entry_is_encrypted(ae), 0); + assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED); + if (strcmp(".", archive_entry_pathname(ae)) == 0) { /* '.' root directory. */ assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); @@ -259,12 +262,12 @@ DEFINE_TEST(test_read_format_isorr_rr_moved) assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae)); /* Verify archive format. */ - assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_COMPRESS); + assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660_ROCKRIDGE); /* Close the archive. */ - assertEqualInt(0, archive_read_close(a)); - assertEqualInt(0, archive_read_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } |