Style: Update a bunch of old assert() and assertA() calls.

SVN-Revision: 1887

diff --git a/libarchive/test/test_acl_pax.c b/libarchive/test/test_acl_pax.c
index a8cf5addc5ae33b0cb03d2f418fc7469241eaa42..d57b6028da787011de3fd33dde3eb52e402b040b 100644 (file)
--- 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 c5367d69c00c0b19dd69477035a06d305c799fe3..99b74f12b5893254c36f87cd26ef7dc1e5aec5d9 100644 (file)
--- 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 0523ec362c352520218da99fc9abe3d9a0c1670c..669c6032ffdc1bf403394d0f9a565f6f3b591e82 100644 (file)
--- 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 5f1ac935c1ec8e267e41c914f6cdf6d4b64ea199..5d1a771cfe1dfd00a511b08b662c48db33ef9cc9 100644 (file)
--- 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 850d77738d8147f94e0fa369abb4c35ebb5c70a3..4ec0e801eca9e037737de56f92dcd0305e791c52 100644 (file)
--- 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 5696e0d356f6f5384d2ee7ad54fd02e399685f30..da8499448ba4203a76f0ad9ca4d9e8312f9c2c22 100644 (file)
--- 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 efea38d2c532656c784a41ed5e103ca00b7513ce..35939d0711fed31ea33b58e90387d6e3b3e99acc 100644 (file)
--- 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 b5dbade08a9690de8535093f5e569a09f9a9b5dd..39a7a3d2f2e8d770fb8bfc94784e41dcedcc5d84 100644 (file)
--- 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 598c6256ad14107d2651cb0dc21a24942d9e293f..d7022c919f73893e6840d086daa18e1d6c865af5 100644 (file)
--- 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 c368de62cf2770b7c6caef1ccb26d3a456738cfc..01538b5692b86bb4fb491b7a281cead331dd840b 100644 (file)
--- 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 d726587cf0775de90e003207402073035da65323..0dc91ac8b3594c707e20a544d3a41a99e15d4553 100644 (file)
--- 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 72eda862685cb55d56c7fe35aa318c33e9c69c0e..5a5ed2504268039eebf9dcbd34c467417bacc3a7 100644 (file)
--- 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 3ec472dab2bbbc4c8b8bda0b47d6ffd7ba0898fa..da4f6124e9d1785c742e88cf542e84f885c5af07 100644 (file)
--- 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 a2c5307b7aa5a8872d9f53d5881906be900177ca..3efe2a38b95f89026bcfb859f4d369f67649ad95 100644 (file)
--- 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 765cf37f1c2d6e2c3e845661b81fe55354e2db6c..e5a8d4eed0b9a657474f80ae31a8b50136a08b15 100644 (file)
--- 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 365f8e7a8de932e27abea97eb8058fcc5749cf25..42fe9a847af69a0b455cdd7d377fb910cb92898b 100644 (file)
--- 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 cb5a969d6210d3d8ade131ca6d13a2feace37119..029d3d2f81111b5678b43bd6e176cf06029bccaa 100644 (file)
--- 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 71bce93dfe91d3ae9e024d48e5ec7e719d14c390..22dd12d516f4fe9a3fb46d9194cea41343f4706c 100644 (file)
--- 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 633959af96d5b293c045c1d4ba1ba7eb7dc3ec13..ec665aeeae22519f4aa25624fea1c1b96fdb0b9e 100644 (file)
--- 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 d59b3464030d94780b19ff43f4a35ee4f1c9091a..ef300226eedb75045e41b42c148a4bff7f6aa2e6 100644 (file)
--- 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 05271cdd89ef2880eac51b1a6d952904a42c5803..7fcceb9cd4093181f11bf5cec6436ebee98fb9b4 100644 (file)
--- 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 34cf28e68336c9f4b1e8411f9a08a9b6c13c2147..a1a48f5f9ac660e9b813ab1c1405d08237820607 100644 (file)
--- 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 a6966776081942f9a31378e22fa47717c6279f8f..872918a55c27ecc79dd15a87ad895cdaf6c798a4 100644 (file)
--- 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 8ad697f79fd399043a8b3cf37d7aa4b3f937a791..00a40bc123aa599cb7eabbb74cf8b90212267aa0 100644 (file)
--- 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 a2be60178655ea41156d2f8b32a595f9bb8ce11d..6083aa519cb9db4a8a3887d1e999c191286483e3 100644 (file)
--- 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 02aaa82ec5f5a4b79ed4a51c292433bece328b90..740d9bd7ba8e73938649b9522252f649fc9c93d0 100644 (file)
--- 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 85b7967214240c0bbaa9bd47dd1236e6a2c53c0a..f786f6d4ffc80ea1aedbab11716908918d6402d3 100644 (file)
--- 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 166a77294978d59cee81e9b3a712fca5361bbb5f..470801222af713dd7614ffb0433725b06f61fa83 100644 (file)
--- 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 bc22a2d314f19b150be747e0d2ec1ad1948a11ad..9ca4d6eea1f5a6b17f928e65ea277982f5bd6516 100644 (file)
--- 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 f273ed991ab93e8196e7f47dfa365d5a7752acf1..280fea2f25410103153c9bbccf690b9db5df51a9 100644 (file)
--- 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 f0db4fa21a6d371ef7f549a32b93a941bc5587cb..9970367030aa60cd684217cd4c5ebed9ff9b3a25 100644 (file)
--- 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 0497421902a8632b161dc014993fb58d255729dc..2842e07c5be1c62de79a23a36a660db56a3d13ec 100644 (file)
--- 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 ee6954022aa2f2178022afe2b39da15379f0c4c2..f92bd9885ebb05a0dc2a6e167ba2137b10b3c2c8 100644 (file)
--- 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 ec55c8db6467031de45cb2aaac3d3c25371a58aa..920f405c20c5afc497fbe9a811f04cb816412dfb 100644 (file)
--- 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 0b456910daeb5badfb9b273436280087bdc7bb27..895fed8c6ff0657dc1ab7b1f65b73753c4e15da5 100644 (file)
--- 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 0e032c71c46c66aff38f37b3c8f9b5945633e9ae..4593610eabec0e44ccf54c7578c71307774f2597 100644 (file)
--- 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 88db2e66898453220e53f1d0dafa7e36bc19bc57..bd4d2bbb6d376d665b14a2d1606bd4c92e0c6345 100644 (file)
--- 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 df62d3c5df968335d4c3457e745f2845bf98ac29..8ca1aa707deb596a68b7b1bc8c69a86ab064ac7c 100644 (file)
--- 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 a1a7c90fdf8ce390c8724b1ab0b4656b4324cb73..f1244bf79d5f7a6d895972ee20517373da9648a5 100644 (file)
--- 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 e20cd3164d0bd76a6059846bb237ecce47a203a1..0f0815006d3f1c52539c4d56301e00524a226e32 100644 (file)
--- 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 1a5d6ad4843750268da278457e34a7cecec27914..a2a4316b6fbe53306d33901393f31ee882d1a98c 100644 (file)
--- 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 8ac8fcd94ecda9dde0e5f1e68f479ebc6cf8134a..d61689e06ce519f69603ef52950821a10c6f35c7 100644 (file)
--- 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 48c70822a8dbf6a7e319630056be629ee5574191..953bf6567515f3a8e5f1ea5a60fd4f5d07688367 100644 (file)
--- 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 0d3887aae6c00134b81f3bbc83022047504b5057..62167e2066bac79a91392380b935fccfcf2eff1b 100644 (file)
--- 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 8e9e6933a603a15328ff99623eefa2e4c624b221..e45513639b787cd41a1e58444defd4f13adc41ad 100644 (file)
--- 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 0d363a9780140110f40eb169db22cbb2e011b1ac..38aaa14f364d12df66bbc02f36c1eafe5397102b 100644 (file)
--- 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 8a89bb6923ece343abc1e5b959f2d8192cbc1403..dd2f10cc10ed7dd7f0389194589b248feb75466b 100644 (file)
--- 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 afc1273fd7f612924941861506fcc4165c383a74..b8fd2e728399b259afac1ca4f3eb642c38e43900 100644 (file)
--- 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 1f8d431d08e78eeedca7b7eb750be5676b5ebc84..d40026b33df40dbff71ac705bba4efe60f6f0a98 100644 (file)
--- 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 971cad57c59bfe738657b63f87437b2ed8dd6299..939bfa844f34967da19c6db597fc3dd33bc0aa26 100644 (file)
--- 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 459664e234795eceb1aea95b5a889aaa1aaac628..7e9e684782847d662ccdf068bd4d2d12d23212b9 100644 (file)
--- 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 4a61a76eb6af390c1d94079bdc0a9962cfda2b5f..f01c90afa4e8c662c590bef5412d334f2fb3f276 100644 (file)
--- 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 67102b183f0366c8d0ed5ec5981c2938134a7290..e9bead4362cd0dcf62ac34bfea9508ef54569a0e 100644 (file)
--- 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);
        }