diff options
| author | mm <mm@FreeBSD.org> | 2012-02-08 12:53:14 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-02-08 12:53:14 +0000 |
| commit | 2f6e434fe4c652da1969314fa57ae21936cec85d (patch) | |
| tree | 28a8e9d81eb7ed48e286dfc384e2e0ffccc238b5 /libarchive/test/test_read_format_raw.c | |
| parent | 5ae64fdbb237eec1fbe1362330190b974b1a1061 (diff) | |
| download | FreeBSD-src-2f6e434fe4c652da1969314fa57ae21936cec85d.zip FreeBSD-src-2f6e434fe4c652da1969314fa57ae21936cec85d.tar.gz | |
Update vendor libarchive dist to new "release" branch (post 3.0.3)
Git branch: release
Git commit: 9af87742342aa4f37a22ec12c4cc1c82e00ffa2f
Obtained from: https://github.com/libarchive/libarchive.git
Diffstat (limited to 'libarchive/test/test_read_format_raw.c')
| -rw-r--r-- | libarchive/test/test_read_format_raw.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libarchive/test/test_read_format_raw.c b/libarchive/test/test_read_format_raw.c index cd5f00e..a23b9c5 100644 --- a/libarchive/test/test_read_format_raw.c +++ b/libarchive/test/test_read_format_raw.c @@ -39,14 +39,14 @@ DEFINE_TEST(test_read_format_raw) /* First, try pulling data out of an uninterpretable file. */ extract_reference_file(reffile1); assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_raw(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, reffile1, 512)); /* First (and only!) Entry */ - assertA(0 == archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualString("data", archive_entry_pathname(ae)); /* Most fields should be unset (unknown) */ assert(!archive_entry_size_is_set(ae)); @@ -59,20 +59,20 @@ DEFINE_TEST(test_read_format_raw) /* Test EOF */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* Second, try the same with a compressed file. */ extract_reference_file(reffile2); assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_raw(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, reffile2, 1)); /* First (and only!) Entry */ - assertA(0 == archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualString("data", archive_entry_pathname(ae)); /* Most fields should be unset (unknown) */ assert(!archive_entry_size_is_set(ae)); @@ -85,5 +85,5 @@ DEFINE_TEST(test_read_format_raw) /* Test EOF */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } |
