From 77c23f6cf80de498172e39f3f249036e864a2c2b Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sun, 7 Feb 2010 17:49:11 -0500 Subject: [PATCH] Style: Update a bunch of old assert() and assertA() calls. SVN-Revision: 1887 --- libarchive/test/test_acl_pax.c | 8 ++-- libarchive/test/test_bad_fd.c | 4 +- libarchive/test/test_empty_write.c | 12 +++--- libarchive/test/test_pax_filename_encoding.c | 16 ++++---- libarchive/test/test_read_data_large.c | 12 +++--- libarchive/test/test_read_extract.c | 8 ++-- libarchive/test/test_read_format_ar.c | 4 +- libarchive/test/test_read_format_cpio_bin.c | 4 +- .../test/test_read_format_cpio_bin_bz2.c | 2 +- libarchive/test/test_read_format_cpio_odc.c | 4 +- libarchive/test/test_read_format_empty.c | 4 +- .../test/test_read_format_gtar_sparse.c | 6 +-- .../test/test_read_format_iso_multi_extent.c | 4 +- .../test/test_read_format_isojoliet_bz2.c | 4 +- .../test/test_read_format_isojoliet_long.c | 4 +- .../test/test_read_format_isojoliet_rr.c | 4 +- libarchive/test/test_read_format_isorr_bz2.c | 4 +- libarchive/test/test_read_format_isorr_ce.c | 4 +- .../test/test_read_format_isorr_new_bz2.c | 4 +- .../test/test_read_format_isorr_rr_moved.c | 4 +- .../test/test_read_format_isozisofs_bz2.c | 4 +- libarchive/test/test_read_format_tar.c | 8 ++-- libarchive/test/test_read_format_xar.c | 4 +- libarchive/test/test_read_format_zip.c | 4 +- libarchive/test/test_read_large.c | 6 +-- libarchive/test/test_read_pax_truncated.c | 40 +++++++++---------- libarchive/test/test_read_position.c | 6 +-- libarchive/test/test_read_truncated.c | 12 +++--- libarchive/test/test_tar_filenames.c | 8 ++-- libarchive/test/test_tar_large.c | 8 ++-- libarchive/test/test_ustar_filenames.c | 8 ++-- libarchive/test/test_write_compress.c | 6 +-- libarchive/test/test_write_compress_bzip2.c | 18 ++++----- libarchive/test/test_write_compress_gzip.c | 6 +-- libarchive/test/test_write_compress_lzma.c | 6 +-- libarchive/test/test_write_compress_program.c | 4 +- libarchive/test/test_write_compress_xz.c | 6 +-- libarchive/test/test_write_disk_failures.c | 2 +- libarchive/test/test_write_disk_perms.c | 2 +- libarchive/test/test_write_disk_secure.c | 2 +- libarchive/test/test_write_format_ar.c | 12 +++--- libarchive/test/test_write_format_cpio.c | 8 ++-- .../test/test_write_format_cpio_empty.c | 4 +- libarchive/test/test_write_format_cpio_newc.c | 2 +- libarchive/test/test_write_format_cpio_odc.c | 2 +- libarchive/test/test_write_format_mtree.c | 6 +-- .../test/test_write_format_shar_empty.c | 4 +- libarchive/test/test_write_format_tar.c | 8 ++-- libarchive/test/test_write_format_tar_empty.c | 8 ++-- libarchive/test/test_write_format_tar_ustar.c | 2 +- libarchive/test/test_write_format_zip_empty.c | 4 +- .../test_write_format_zip_no_compression.c | 4 +- libarchive/test/test_write_open_memory.c | 4 +- 53 files changed, 172 insertions(+), 172 deletions(-) diff --git a/libarchive/test/test_acl_pax.c b/libarchive/test/test_acl_pax.c index a8cf5addc..d57b6028d 100644 --- a/libarchive/test/test_acl_pax.c +++ b/libarchive/test/test_acl_pax.c @@ -440,8 +440,8 @@ DEFINE_TEST(test_acl_pax) 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_finish(a)); /* Write out the data we generated to a file for manual inspection. */ assert(NULL != (f = fopen("testout", "wb"))); @@ -499,6 +499,6 @@ DEFINE_TEST(test_acl_pax) assert((archive_entry_mode(ae) & 0777) == 0142); /* Close the archive. */ - assertA(0 == archive_read_close(a)); - assertA(0 == archive_read_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); } diff --git a/libarchive/test/test_bad_fd.c b/libarchive/test/test_bad_fd.c index c5367d69c..99b74f12b 100644 --- a/libarchive/test/test_bad_fd.c +++ b/libarchive/test/test_bad_fd.c @@ -32,6 +32,6 @@ DEFINE_TEST(test_bad_fd) assert((a = archive_read_new()) != NULL); assertA(0 == archive_read_support_compression_all(a)); assertA(ARCHIVE_FATAL == archive_read_open_fd(a, -1, 1024)); - assertA(0 == archive_read_close(a)); - assertA(0 == archive_read_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); } diff --git a/libarchive/test/test_empty_write.c b/libarchive/test/test_empty_write.c index 0523ec362..669c6032f 100644 --- a/libarchive/test/test_empty_write.c +++ b/libarchive/test/test_empty_write.c @@ -60,8 +60,8 @@ DEFINE_TEST(test_empty_write) assertEqualIntA(a, 0, archive_write_data(a, "", 0)); /* 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_finish(a)); } /* @@ -90,8 +90,8 @@ DEFINE_TEST(test_empty_write) assertEqualIntA(a, 0, archive_write_data(a, "", 0)); /* 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_finish(a)); } /* @@ -115,6 +115,6 @@ DEFINE_TEST(test_empty_write) assertEqualIntA(a, 0, archive_write_data(a, "", 0)); /* 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_finish(a)); } diff --git a/libarchive/test/test_pax_filename_encoding.c b/libarchive/test/test_pax_filename_encoding.c index 5f1ac935c..5d1a771cf 100644 --- a/libarchive/test/test_pax_filename_encoding.c +++ b/libarchive/test/test_pax_filename_encoding.c @@ -151,8 +151,8 @@ test_pax_filename_encoding_2(void) assertEqualInt(ARCHIVE_WARN, archive_write_header(a, entry)); archive_entry_free(entry); - assertEqualInt(0, archive_write_close(a)); - assertEqualInt(0, archive_write_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* * Now read the entries back. @@ -177,8 +177,8 @@ test_pax_filename_encoding_2(void) assertEqualInt(0, archive_read_next_header(a, &entry)); assertEqualString(longname, archive_entry_pathname(entry)); - 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_finish(a)); } /* @@ -277,8 +277,8 @@ test_pax_filename_encoding_3(void) assertEqualInt(ARCHIVE_OK, archive_write_header(a, entry)); archive_entry_free(entry); - assertEqualInt(0, archive_write_close(a)); - assertEqualInt(0, archive_write_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* * Now read the entries back. @@ -321,8 +321,8 @@ test_pax_filename_encoding_3(void) assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &entry)); - 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_finish(a)); } DEFINE_TEST(test_pax_filename_encoding) diff --git a/libarchive/test/test_read_data_large.c b/libarchive/test/test_read_data_large.c index 850d77738..4ec0e801e 100644 --- a/libarchive/test/test_read_data_large.c +++ b/libarchive/test/test_read_data_large.c @@ -72,8 +72,8 @@ DEFINE_TEST(test_read_data_large) assertA((int)sizeof(buff2) == archive_write_data(a, buff2, sizeof(buff2))); /* 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_finish(a)); /* Check that archive_read_data can handle 10*10^6 at a pop. */ assert((a = archive_read_new()) != NULL); @@ -85,8 +85,8 @@ DEFINE_TEST(test_read_data_large) assertEqualIntA(a, sizeof(buff2),archive_read_data(a, buff3, sizeof(buff3))); failure("Read expected 10MB, but data read didn't match what was written"); assert(0 == memcmp(buff2, buff3, sizeof(buff3))); - 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_finish(a)); /* Check archive_read_data_into_fd */ assert((a = archive_read_new()) != NULL); @@ -101,8 +101,8 @@ DEFINE_TEST(test_read_data_large) #endif assert(tmpfilefd != 0); assertEqualIntA(a, 0, archive_read_data_into_fd(a, tmpfilefd)); - 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_finish(a)); close(tmpfilefd); f = fopen(tmpfilename, "rb"); diff --git a/libarchive/test/test_read_extract.c b/libarchive/test/test_read_extract.c index 5696e0d35..da8499448 100644 --- a/libarchive/test/test_read_extract.c +++ b/libarchive/test/test_read_extract.c @@ -111,8 +111,8 @@ 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_finish(a)); /* Extract the entries to disk. */ assert((a = archive_read_new()) != NULL); @@ -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_finish(a)); /* Test the entries on disk. */ /* This first entry was extracted with ARCHIVE_EXTRACT_PERM, diff --git a/libarchive/test/test_read_format_ar.c b/libarchive/test/test_read_format_ar.c index efea38d2c..35939d071 100644 --- a/libarchive/test/test_read_format_ar.c +++ b/libarchive/test/test_read_format_ar.c @@ -82,6 +82,6 @@ DEFINE_TEST(test_read_format_ar) /* Test EOF */ assertA(1 == 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_finish(a)); } diff --git a/libarchive/test/test_read_format_cpio_bin.c b/libarchive/test/test_read_format_cpio_bin.c index b5dbade08..39a7a3d2f 100644 --- a/libarchive/test/test_read_format_cpio_bin.c +++ b/libarchive/test/test_read_format_cpio_bin.c @@ -53,8 +53,8 @@ DEFINE_TEST(test_read_format_cpio_bin) assertA(0 == archive_read_next_header(a, &ae)); assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE); assertA(archive_format(a) == ARCHIVE_FORMAT_CPIO_BIN_LE); - 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_finish(a)); } diff --git a/libarchive/test/test_read_format_cpio_bin_bz2.c b/libarchive/test/test_read_format_cpio_bin_bz2.c index 598c6256a..d7022c919 100644 --- a/libarchive/test/test_read_format_cpio_bin_bz2.c +++ b/libarchive/test/test_read_format_cpio_bin_bz2.c @@ -51,7 +51,7 @@ DEFINE_TEST(test_read_format_cpio_bin_bz2) assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assert(archive_compression(a) == ARCHIVE_COMPRESSION_BZIP2); assert(archive_format(a) == ARCHIVE_FORMAT_CPIO_BIN_LE); - assert(0 == archive_read_close(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); } diff --git a/libarchive/test/test_read_format_cpio_odc.c b/libarchive/test/test_read_format_cpio_odc.c index c368de62c..01538b569 100644 --- a/libarchive/test/test_read_format_cpio_odc.c +++ b/libarchive/test/test_read_format_cpio_odc.c @@ -57,8 +57,8 @@ DEFINE_TEST(test_read_format_cpio_odc) assertEqualIntA(a, 0, archive_read_next_header(a, &ae)); assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE); assertA(archive_format(a) == ARCHIVE_FORMAT_CPIO_POSIX); - 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_finish(a)); } diff --git a/libarchive/test/test_read_format_empty.c b/libarchive/test/test_read_format_empty.c index d726587cf..0dc91ac8b 100644 --- a/libarchive/test/test_read_format_empty.c +++ b/libarchive/test/test_read_format_empty.c @@ -38,6 +38,6 @@ DEFINE_TEST(test_read_format_empty) assertA(ARCHIVE_EOF == archive_read_next_header(a, &ae)); assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE); assertA(archive_format(a) == ARCHIVE_FORMAT_EMPTY); - 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_finish(a)); } diff --git a/libarchive/test/test_read_format_gtar_sparse.c b/libarchive/test/test_read_format_gtar_sparse.c index 72eda8626..5a5ed2504 100644 --- a/libarchive/test/test_read_format_gtar_sparse.c +++ b/libarchive/test/test_read_format_gtar_sparse.c @@ -195,7 +195,7 @@ verify_archive_file(const char *name, struct archive_contents *ac) struct contents *cts = ac->contents; if (!assertEqualIntA(a, 0, archive_read_next_header(a, &ae))) { - assert(0 == archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); return; } failure("Name mismatch in archive %s", name); @@ -254,8 +254,8 @@ verify_archive_file(const char *name, struct archive_contents *ac) err = archive_read_next_header(a, &ae); assertEqualIntA(a, ARCHIVE_EOF, err); - 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_finish(a)); } diff --git a/libarchive/test/test_read_format_iso_multi_extent.c b/libarchive/test/test_read_format_iso_multi_extent.c index 3ec472dab..da4f6124e 100644 --- a/libarchive/test/test_read_format_iso_multi_extent.c +++ b/libarchive/test/test_read_format_iso_multi_extent.c @@ -87,8 +87,8 @@ DEFINE_TEST(test_read_format_iso_multi_extent) 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_finish(a)); } diff --git a/libarchive/test/test_read_format_isojoliet_bz2.c b/libarchive/test/test_read_format_isojoliet_bz2.c index a2c5307b7..3efe2a38b 100644 --- a/libarchive/test/test_read_format_isojoliet_bz2.c +++ b/libarchive/test/test_read_format_isojoliet_bz2.c @@ -128,7 +128,7 @@ DEFINE_TEST(test_read_format_isojoliet_bz2) assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_COMPRESS); /* 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_finish(a)); } diff --git a/libarchive/test/test_read_format_isojoliet_long.c b/libarchive/test/test_read_format_isojoliet_long.c index 765cf37f1..e5a8d4eed 100644 --- a/libarchive/test/test_read_format_isojoliet_long.c +++ b/libarchive/test/test_read_format_isojoliet_long.c @@ -135,7 +135,7 @@ DEFINE_TEST(test_read_format_isojoliet_long) assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_COMPRESS); /* 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_finish(a)); } diff --git a/libarchive/test/test_read_format_isojoliet_rr.c b/libarchive/test/test_read_format_isojoliet_rr.c index 365f8e7a8..42fe9a847 100644 --- a/libarchive/test/test_read_format_isojoliet_rr.c +++ b/libarchive/test/test_read_format_isojoliet_rr.c @@ -153,7 +153,7 @@ DEFINE_TEST(test_read_format_isojoliet_rr) 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_finish(a)); } diff --git a/libarchive/test/test_read_format_isorr_bz2.c b/libarchive/test/test_read_format_isorr_bz2.c index cb5a969d6..029d3d2f8 100644 --- a/libarchive/test/test_read_format_isorr_bz2.c +++ b/libarchive/test/test_read_format_isorr_bz2.c @@ -196,8 +196,8 @@ DEFINE_TEST(test_read_format_isorr_bz2) 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_finish(a)); } diff --git a/libarchive/test/test_read_format_isorr_ce.c b/libarchive/test/test_read_format_isorr_ce.c index 71bce93df..22dd12d51 100644 --- a/libarchive/test/test_read_format_isorr_ce.c +++ b/libarchive/test/test_read_format_isorr_ce.c @@ -216,8 +216,8 @@ DEFINE_TEST(test_read_format_isorr_ce) 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_finish(a)); } diff --git a/libarchive/test/test_read_format_isorr_new_bz2.c b/libarchive/test/test_read_format_isorr_new_bz2.c index 633959af9..ec665aeea 100644 --- a/libarchive/test/test_read_format_isorr_new_bz2.c +++ b/libarchive/test/test_read_format_isorr_new_bz2.c @@ -197,8 +197,8 @@ DEFINE_TEST(test_read_format_isorr_new_bz2) 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_finish(a)); } diff --git a/libarchive/test/test_read_format_isorr_rr_moved.c b/libarchive/test/test_read_format_isorr_rr_moved.c index d59b34640..ef300226e 100644 --- a/libarchive/test/test_read_format_isorr_rr_moved.c +++ b/libarchive/test/test_read_format_isorr_rr_moved.c @@ -263,8 +263,8 @@ DEFINE_TEST(test_read_format_isorr_rr_moved) 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_finish(a)); } diff --git a/libarchive/test/test_read_format_isozisofs_bz2.c b/libarchive/test/test_read_format_isozisofs_bz2.c index 05271cdd8..7fcceb9cd 100644 --- a/libarchive/test/test_read_format_isozisofs_bz2.c +++ b/libarchive/test/test_read_format_isozisofs_bz2.c @@ -180,8 +180,8 @@ DEFINE_TEST(test_read_format_isozisofs_bz2) 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_finish(a)); } diff --git a/libarchive/test/test_read_format_tar.c b/libarchive/test/test_read_format_tar.c index 34cf28e68..a1a48f5f9 100644 --- a/libarchive/test/test_read_format_tar.c +++ b/libarchive/test/test_read_format_tar.c @@ -75,8 +75,8 @@ static void verifyEmpty(void) failure("512 zero bytes should be recognized as a tar archive."); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR); - 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_finish(a)); } /* Single entry with a hardlink. */ @@ -443,8 +443,8 @@ static void verify(unsigned char *d, size_t s, /* Verify the only entry. */ f(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_finish(a)); free(buff); } diff --git a/libarchive/test/test_read_format_xar.c b/libarchive/test/test_read_format_xar.c index a69667760..872918a55 100644 --- a/libarchive/test/test_read_format_xar.c +++ b/libarchive/test/test_read_format_xar.c @@ -675,8 +675,8 @@ static void verify(unsigned char *d, size_t s, /* End of archive. */ assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae)); - assertA(0 == archive_read_close(a)); - assertA(0 == archive_read_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); free(buff); } diff --git a/libarchive/test/test_read_format_zip.c b/libarchive/test/test_read_format_zip.c index 8ad697f79..00a40bc12 100644 --- a/libarchive/test/test_read_format_zip.c +++ b/libarchive/test/test_read_format_zip.c @@ -80,9 +80,9 @@ DEFINE_TEST(test_read_format_zip) assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18)); assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE); assertA(archive_format(a) == ARCHIVE_FORMAT_ZIP); - assert(0 == archive_read_close(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); finish: - assert(0 == archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); } diff --git a/libarchive/test/test_read_large.c b/libarchive/test/test_read_large.c index a2be60178..6083aa519 100644 --- a/libarchive/test/test_read_large.c +++ b/libarchive/test/test_read_large.c @@ -58,7 +58,7 @@ DEFINE_TEST(test_read_large) assertA(0 == archive_write_header(a, entry)); archive_entry_free(entry); assertA((int)sizeof(testdata) == archive_write_data(a, testdata, sizeof(testdata))); - assertA(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); assert(NULL != (a = archive_read_new())); assertA(0 == archive_read_support_format_all(a)); @@ -66,7 +66,7 @@ DEFINE_TEST(test_read_large) assertA(0 == archive_read_open_memory(a, buff, sizeof(buff))); assertA(0 == archive_read_next_header(a, &entry)); assertA(0 == archive_read_data_into_buffer(a, testdatacopy, sizeof(testdatacopy))); - assertA(0 == archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); assert(0 == memcmp(testdata, testdatacopy, sizeof(testdata))); @@ -83,7 +83,7 @@ DEFINE_TEST(test_read_large) assert(0 < tmpfilefd); assertA(0 == archive_read_data_into_fd(a, tmpfilefd)); close(tmpfilefd); - assertA(0 == archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); f = fopen(tmpfilename, "rb"); assertEqualInt(sizeof(testdatacopy), diff --git a/libarchive/test/test_read_pax_truncated.c b/libarchive/test/test_read_pax_truncated.c index 02aaa82ec..740d9bd7b 100644 --- a/libarchive/test/test_read_pax_truncated.c +++ b/libarchive/test/test_read_pax_truncated.c @@ -60,8 +60,8 @@ DEFINE_TEST(test_read_pax_truncated) == archive_write_data(a, filedata, filedata_size)); /* 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_finish(a)); /* Now, read back a truncated version of the archive and * verify that we get an appropriate error. */ @@ -104,8 +104,8 @@ DEFINE_TEST(test_read_pax_truncated) archive_read_next_header(a, &ae)); } wrap_up: - 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_finish(a)); } @@ -145,8 +145,8 @@ DEFINE_TEST(test_read_pax_truncated) archive_read_next_header(a, &ae)); } wrap_up2: - 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_finish(a)); } /* Now, damage the archive in various ways and test the responses. */ @@ -161,8 +161,8 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_support_compression_all(a)); assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, 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_finish(a)); /* Damage the size field in the pax attributes. */ memcpy(buff2, buff, buff_size); @@ -172,8 +172,8 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_support_compression_all(a)); assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, 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_finish(a)); /* Damage the size field in the pax attributes. */ memcpy(buff2, buff, buff_size); @@ -185,8 +185,8 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_support_compression_all(a)); assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, 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_finish(a)); /* Damage the size field in the pax attributes. */ memcpy(buff2, buff, buff_size); @@ -199,8 +199,8 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_support_compression_all(a)); assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, 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_finish(a)); /* Damage the size field in the pax attributes. */ memcpy(buff2, buff, buff_size); @@ -211,8 +211,8 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_support_compression_all(a)); assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, 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_finish(a)); /* Damage the size field in the pax attributes. */ memcpy(buff2, buff, buff_size); @@ -222,8 +222,8 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_support_compression_all(a)); assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, 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_finish(a)); /* Damage the ustar header. */ memcpy(buff2, buff, buff_size); @@ -233,8 +233,8 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_support_compression_all(a)); assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_FATAL, 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_finish(a)); /* * TODO: Damage the ustar header in various ways and fixup the diff --git a/libarchive/test/test_read_position.c b/libarchive/test/test_read_position.c index 85b796721..f786f6d4f 100644 --- a/libarchive/test/test_read_position.c +++ b/libarchive/test/test_read_position.c @@ -58,8 +58,8 @@ DEFINE_TEST(test_read_position) assertA(data_sizes[i] == (size_t)archive_write_data(a, nulls, sizeof(nulls))); } - 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_finish(a)); /* Read the archive back. */ assert(NULL != (a = archive_read_new())); @@ -88,7 +88,7 @@ DEFINE_TEST(test_read_position) assertA(1 == archive_read_next_header(a, &ae)); assert(read_position == (intmax_t)archive_read_header_position(a)); - assertA(0 == archive_read_close(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); assert(read_position == (intmax_t)archive_read_header_position(a)); archive_read_finish(a); } diff --git a/libarchive/test/test_read_truncated.c b/libarchive/test/test_read_truncated.c index 166a77294..470801222 100644 --- a/libarchive/test/test_read_truncated.c +++ b/libarchive/test/test_read_truncated.c @@ -55,8 +55,8 @@ DEFINE_TEST(test_read_truncated) assertA((int)sizeof(buff2) == archive_write_data(a, buff2, sizeof(buff2))); /* 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_finish(a)); /* Now, read back a truncated version of the archive and * verify that we get an appropriate error. */ @@ -92,8 +92,8 @@ DEFINE_TEST(test_read_truncated) assertA(ARCHIVE_EOF == archive_read_next_header(a, &ae)); } wrap_up: - 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_finish(a)); } @@ -131,7 +131,7 @@ DEFINE_TEST(test_read_truncated) assertA(ARCHIVE_EOF == archive_read_next_header(a, &ae)); } wrap_up2: - 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_finish(a)); } } diff --git a/libarchive/test/test_tar_filenames.c b/libarchive/test/test_tar_filenames.c index bc22a2d31..9ca4d6eea 100644 --- a/libarchive/test/test_tar_filenames.c +++ b/libarchive/test/test_tar_filenames.c @@ -100,8 +100,8 @@ test_filename(const char *prefix, int dlen, int flen) 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_finish(a)); /* * Now, read the data back. @@ -134,8 +134,8 @@ test_filename(const char *prefix, int dlen, int flen) /* Verify the end of the archive. */ assert(1 == 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_finish(a)); } DEFINE_TEST(test_tar_filenames) diff --git a/libarchive/test/test_tar_large.c b/libarchive/test/test_tar_large.c index f273ed991..280fea2f2 100644 --- a/libarchive/test/test_tar_large.c +++ b/libarchive/test/test_tar_large.c @@ -255,8 +255,8 @@ DEFINE_TEST(test_tar_large) /* 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_finish(a)); /* * Open the same archive for reading. @@ -281,8 +281,8 @@ DEFINE_TEST(test_tar_large) assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); /* Close out the archive. */ - assertA(0 == archive_read_close(a)); - assertA(0 == archive_read_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); free(memdata.buff); free(filedata); diff --git a/libarchive/test/test_ustar_filenames.c b/libarchive/test/test_ustar_filenames.c index f0db4fa21..997036703 100644 --- a/libarchive/test/test_ustar_filenames.c +++ b/libarchive/test/test_ustar_filenames.c @@ -110,8 +110,8 @@ test_filename(const char *prefix, int dlen, int flen) archive_entry_free(ae); /* Close out the archive. */ - assertA(0 == archive_write_close(a)); - assertEqualInt(0, archive_write_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* * Now, read the data back. @@ -152,8 +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)); - assertEqualInt(0, archive_read_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); } DEFINE_TEST(test_ustar_filenames) diff --git a/libarchive/test/test_write_compress.c b/libarchive/test/test_write_compress.c index 049742190..2842e07c5 100644 --- a/libarchive/test/test_write_compress.c +++ b/libarchive/test/test_write_compress.c @@ -68,7 +68,7 @@ DEFINE_TEST(test_write_compress) assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* * Now, read the data back. @@ -86,8 +86,8 @@ DEFINE_TEST(test_write_compress) assertEqualString(path, archive_entry_pathname(ae)); assertEqualInt((int)datasize, archive_entry_size(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_finish(a)); free(data); free(buff); diff --git a/libarchive/test/test_write_compress_bzip2.c b/libarchive/test/test_write_compress_bzip2.c index ee6954022..f92bd9885 100644 --- a/libarchive/test/test_write_compress_bzip2.c +++ b/libarchive/test/test_write_compress_bzip2.c @@ -80,7 +80,7 @@ DEFINE_TEST(test_write_compress_bzip2) } archive_entry_free(ae); archive_write_close(a); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); assert((a = archive_read_new()) != NULL); assertA(0 == archive_read_support_format_all(a)); @@ -93,8 +93,8 @@ DEFINE_TEST(test_write_compress_bzip2) assertEqualString(path, archive_entry_pathname(ae)); assertEqualInt((int)datasize, archive_entry_size(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_finish(a)); /* * Repeat the cycle again, this time setting some compression @@ -125,7 +125,7 @@ DEFINE_TEST(test_write_compress_bzip2) archive_entry_free(ae); } archive_write_close(a); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* Curiously, this test fails; the test data above compresses * better at default compression than at level 9. */ @@ -146,8 +146,8 @@ DEFINE_TEST(test_write_compress_bzip2) assertEqualString(path, archive_entry_pathname(ae)); assertEqualInt((int)datasize, archive_entry_size(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_finish(a)); /* * Repeat again, with much lower compression. @@ -173,7 +173,7 @@ DEFINE_TEST(test_write_compress_bzip2) archive_entry_free(ae); } archive_write_close(a); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* Level 0 really does result in larger data. */ failure("Compression-level=0 wrote %d bytes; default wrote %d bytes", @@ -191,8 +191,8 @@ DEFINE_TEST(test_write_compress_bzip2) assertEqualString(path, archive_entry_pathname(ae)); assertEqualInt((int)datasize, archive_entry_size(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_finish(a)); /* * Test various premature shutdown scenarios to make sure we diff --git a/libarchive/test/test_write_compress_gzip.c b/libarchive/test/test_write_compress_gzip.c index ec55c8db6..920f405c2 100644 --- a/libarchive/test/test_write_compress_gzip.c +++ b/libarchive/test/test_write_compress_gzip.c @@ -80,7 +80,7 @@ DEFINE_TEST(test_write_compress_gzip) } archive_entry_free(ae); archive_write_close(a); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); assert((a = archive_read_new()) != NULL); assertA(0 == archive_read_support_format_all(a)); @@ -134,7 +134,7 @@ DEFINE_TEST(test_write_compress_gzip) archive_entry_free(ae); } archive_write_close(a); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* Curiously, this test fails; the test data above compresses * better at default compression than at level 9. */ @@ -190,7 +190,7 @@ DEFINE_TEST(test_write_compress_gzip) archive_entry_free(ae); } archive_write_close(a); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* Level 0 really does result in larger data. */ failure("Compression-level=0 wrote %d bytes; default wrote %d bytes", diff --git a/libarchive/test/test_write_compress_lzma.c b/libarchive/test/test_write_compress_lzma.c index 0b456910d..895fed8c6 100644 --- a/libarchive/test/test_write_compress_lzma.c +++ b/libarchive/test/test_write_compress_lzma.c @@ -79,7 +79,7 @@ DEFINE_TEST(test_write_compress_lzma) } archive_entry_free(ae); archive_write_close(a); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); assert((a = archive_read_new()) != NULL); assertA(0 == archive_read_support_format_all(a)); @@ -133,7 +133,7 @@ DEFINE_TEST(test_write_compress_lzma) archive_entry_free(ae); } archive_write_close(a); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); assert((a = archive_read_new()) != NULL); @@ -183,7 +183,7 @@ DEFINE_TEST(test_write_compress_lzma) archive_entry_free(ae); } archive_write_close(a); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* Level 0 really does result in larger data. */ failure("Compression-level=0 wrote %d bytes; default wrote %d bytes", diff --git a/libarchive/test/test_write_compress_program.c b/libarchive/test/test_write_compress_program.c index 0e032c71c..4593610ea 100644 --- a/libarchive/test/test_write_compress_program.c +++ b/libarchive/test/test_write_compress_program.c @@ -72,8 +72,8 @@ DEFINE_TEST(test_write_compress_program) assertA(8 == archive_write_data(a, "12345678", 9)); /* 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_finish(a)); /* * Now, read the data back through the built-in gzip support. diff --git a/libarchive/test/test_write_compress_xz.c b/libarchive/test/test_write_compress_xz.c index 88db2e668..bd4d2bbb6 100644 --- a/libarchive/test/test_write_compress_xz.c +++ b/libarchive/test/test_write_compress_xz.c @@ -80,7 +80,7 @@ DEFINE_TEST(test_write_compress_xz) } archive_entry_free(ae); archive_write_close(a); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); assert((a = archive_read_new()) != NULL); assertA(0 == archive_read_support_format_all(a)); @@ -134,7 +134,7 @@ DEFINE_TEST(test_write_compress_xz) archive_entry_free(ae); } archive_write_close(a); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* Curiously, this test fails; the test data above compresses * better at default compression than at level 9. */ @@ -191,7 +191,7 @@ DEFINE_TEST(test_write_compress_xz) archive_entry_free(ae); } archive_write_close(a); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* Level 0 really does result in larger data. */ failure("Compression-level=0 wrote %d bytes; default wrote %d bytes", diff --git a/libarchive/test/test_write_disk_failures.c b/libarchive/test/test_write_disk_failures.c index df62d3c5d..8ca1aa707 100644 --- a/libarchive/test/test_write_disk_failures.c +++ b/libarchive/test/test_write_disk_failures.c @@ -59,7 +59,7 @@ DEFINE_TEST(test_write_disk_failures) archive_entry_set_mtime(ae, 123456789, 0); assertEqualIntA(a, ARCHIVE_FAILED, archive_write_header(a, ae)); assertEqualIntA(a, 0, archive_write_finish_entry(a)); - assertEqualInt(0, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); archive_entry_free(ae); #endif } diff --git a/libarchive/test/test_write_disk_perms.c b/libarchive/test/test_write_disk_perms.c index a1a7c90fd..f1244bf79 100644 --- a/libarchive/test/test_write_disk_perms.c +++ b/libarchive/test/test_write_disk_perms.c @@ -365,7 +365,7 @@ DEFINE_TEST(test_write_disk_perms) assertEqualIntA(a,ARCHIVE_WARN,archive_write_finish_entry(a)); } - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); archive_entry_free(ae); /* Test the entries on disk. */ diff --git a/libarchive/test/test_write_disk_secure.c b/libarchive/test/test_write_disk_secure.c index e20cd3164..0f0815006 100644 --- a/libarchive/test/test_write_disk_secure.c +++ b/libarchive/test/test_write_disk_secure.c @@ -178,7 +178,7 @@ DEFINE_TEST(test_write_disk_secure) assert(S_ISDIR(st.st_mode)); archive_entry_free(ae); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* Test the entries on disk. */ assert(0 == lstat("dir", &st)); diff --git a/libarchive/test/test_write_format_ar.c b/libarchive/test/test_write_format_ar.c index 1a5d6ad48..a2a4316b6 100644 --- a/libarchive/test/test_write_format_ar.c +++ b/libarchive/test/test_write_format_ar.c @@ -98,7 +98,7 @@ DEFINE_TEST(test_write_format_ar) archive_entry_free(ae); archive_write_close(a); - assertEqualInt(0, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* * Now, read the data back. @@ -132,8 +132,8 @@ DEFINE_TEST(test_write_format_ar) assertEqualIntA(a, 8, archive_read_data(a, buff2, 17)); assertEqualMem(buff2, "88877766", 8); - assertEqualIntA(a, 0, archive_read_close(a)); - assertEqualInt(0, archive_read_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); /* * Then, we try to create a BSD format archive. @@ -162,7 +162,7 @@ DEFINE_TEST(test_write_format_ar) assertEqualIntA(a, 6, archive_write_data(a, "555555", 7)); archive_entry_free(ae); archive_write_close(a); - assertEqualInt(0, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* Now, Read the data back */ assert((a = archive_read_new()) != NULL); @@ -184,6 +184,6 @@ DEFINE_TEST(test_write_format_ar) /* Test EOF */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); - assertEqualIntA(a, 0, archive_read_close(a)); - assertEqualInt(0, archive_read_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); } diff --git a/libarchive/test/test_write_format_cpio.c b/libarchive/test/test_write_format_cpio.c index 8ac8fcd94..d61689e06 100644 --- a/libarchive/test/test_write_format_cpio.c +++ b/libarchive/test/test_write_format_cpio.c @@ -102,8 +102,8 @@ test_format(int (*set_format)(struct archive *)) /* 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_finish(a)); /* * Damage the second entry to test the search-ahead recovery. @@ -167,8 +167,8 @@ test_format(int (*set_format)(struct archive *)) /* Verify the end of the archive. */ assertEqualIntA(a, 1, 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_finish(a)); free(buff); } diff --git a/libarchive/test/test_write_format_cpio_empty.c b/libarchive/test/test_write_format_cpio_empty.c index 48c70822a..953bf6567 100644 --- a/libarchive/test/test_write_format_cpio_empty.c +++ b/libarchive/test/test_write_format_cpio_empty.c @@ -61,8 +61,8 @@ DEFINE_TEST(test_write_format_cpio_empty) assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used)); /* 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_finish(a)); failure("Empty cpio archive should be exactly 87 bytes, was %d.", used); assert(used == 87); diff --git a/libarchive/test/test_write_format_cpio_newc.c b/libarchive/test/test_write_format_cpio_newc.c index 0d3887aae..62167e206 100644 --- a/libarchive/test/test_write_format_cpio_newc.c +++ b/libarchive/test/test_write_format_cpio_newc.c @@ -111,7 +111,7 @@ DEFINE_TEST(test_write_format_cpio_newc) assertEqualIntA(a, 0, archive_write_header(a, entry)); archive_entry_free(entry); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* * Verify the archive format. diff --git a/libarchive/test/test_write_format_cpio_odc.c b/libarchive/test/test_write_format_cpio_odc.c index 8e9e6933a..e45513639 100644 --- a/libarchive/test/test_write_format_cpio_odc.c +++ b/libarchive/test/test_write_format_cpio_odc.c @@ -123,7 +123,7 @@ DEFINE_TEST(test_write_format_cpio_odc) /* Write of data to symlink should fail == zero bytes get written. */ assertEqualIntA(a, 0, archive_write_data(a, "1234567890", 10)); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* * Verify the archive format. diff --git a/libarchive/test/test_write_format_mtree.c b/libarchive/test/test_write_format_mtree.c index 0d363a978..38aaa14f3 100644 --- a/libarchive/test/test_write_format_mtree.c +++ b/libarchive/test/test_write_format_mtree.c @@ -86,7 +86,7 @@ test_write_format_mtree_sub(int use_set, int dironly) archive_entry_free(ae); } archive_write_close(a); - assertEqualInt(0, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); if (use_set) { const char *p; @@ -131,8 +131,8 @@ test_write_format_mtree_sub(int use_set, int dironly) if ((entries[i].mode & AE_IFMT) != S_IFDIR) assertEqualInt(8, archive_entry_size(ae)); } - assertEqualIntA(a, 0, archive_read_close(a)); - assertEqualInt(0, archive_read_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); } DEFINE_TEST(test_write_format_mtree) diff --git a/libarchive/test/test_write_format_shar_empty.c b/libarchive/test/test_write_format_shar_empty.c index 8a89bb692..dd2f10cc1 100644 --- a/libarchive/test/test_write_format_shar_empty.c +++ b/libarchive/test/test_write_format_shar_empty.c @@ -46,8 +46,8 @@ DEFINE_TEST(test_write_format_shar_empty) assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used)); /* 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_finish(a)); failure("Empty shar archive should be exactly 0 bytes, was %d.", used); assert(used == 0); diff --git a/libarchive/test/test_write_format_tar.c b/libarchive/test/test_write_format_tar.c index afc1273fd..b8fd2e728 100644 --- a/libarchive/test/test_write_format_tar.c +++ b/libarchive/test/test_write_format_tar.c @@ -71,8 +71,8 @@ DEFINE_TEST(test_write_format_tar) assertA(8 == archive_write_data(a, "12345678", 9)); /* 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_finish(a)); /* This calculation gives "the smallest multiple of * the block size that is at least 2048 bytes". */ @@ -101,7 +101,7 @@ DEFINE_TEST(test_write_format_tar) /* Verify the end of the archive. */ assert(1 == 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_finish(a)); } } diff --git a/libarchive/test/test_write_format_tar_empty.c b/libarchive/test/test_write_format_tar_empty.c index 1f8d431d0..d40026b33 100644 --- a/libarchive/test/test_write_format_tar_empty.c +++ b/libarchive/test/test_write_format_tar_empty.c @@ -45,8 +45,8 @@ DEFINE_TEST(test_write_format_tar_empty) assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used)); /* 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_finish(a)); assert(used == 1024); for (i = 0; i < used; i++) { @@ -63,8 +63,8 @@ DEFINE_TEST(test_write_format_tar_empty) assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used)); /* 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_finish(a)); assertEqualInt((int)used, 1024); for (i = 0; i < used; i++) { diff --git a/libarchive/test/test_write_format_tar_ustar.c b/libarchive/test/test_write_format_tar_ustar.c index 971cad57c..939bfa844 100644 --- a/libarchive/test/test_write_format_tar_ustar.c +++ b/libarchive/test/test_write_format_tar_ustar.c @@ -188,7 +188,7 @@ DEFINE_TEST(test_write_format_tar_ustar) archive_entry_set_nlink(entry, 1); assertEqualIntA(a, 0, archive_write_header(a, entry)); archive_entry_free(entry); - assert(0 == archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); /* * Verify the archive format. diff --git a/libarchive/test/test_write_format_zip_empty.c b/libarchive/test/test_write_format_zip_empty.c index 459664e23..7e9e68478 100644 --- a/libarchive/test/test_write_format_zip_empty.c +++ b/libarchive/test/test_write_format_zip_empty.c @@ -45,8 +45,8 @@ DEFINE_TEST(test_write_format_zip_empty) assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used)); /* Close out the archive without writing anything. */ - 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_finish(a)); /* Verify the correct format for an empy Zip archive. */ assertEqualInt(used, 22); diff --git a/libarchive/test/test_write_format_zip_no_compression.c b/libarchive/test/test_write_format_zip_no_compression.c index 4a61a76eb..f01c90afa 100644 --- a/libarchive/test/test_write_format_zip_no_compression.c +++ b/libarchive/test/test_write_format_zip_no_compression.c @@ -135,8 +135,8 @@ DEFINE_TEST(test_write_format_zip_no_compression) archive_entry_free(entry); /* Close 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_finish(a)); /* Remember the end of the archive in memory. */ buffend = buff + used; diff --git a/libarchive/test/test_write_open_memory.c b/libarchive/test/test_write_open_memory.c index 67102b183..e9bead436 100644 --- a/libarchive/test/test_write_open_memory.c +++ b/libarchive/test/test_write_open_memory.c @@ -63,8 +63,8 @@ DEFINE_TEST(test_write_open_memory) if (i < 1536) assertA(ARCHIVE_FATAL == archive_write_close(a)); else - assertA(0 == archive_write_close(a)); - assert(0 == archive_write_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); + assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); assert(buff[i] == 0xAE); assert(s <= i); } -- 2.47.3