tests: Use assertEqualIntA for archive_*_close

In case of errors, assertEqualIntA offers more information by accessing
archive's errno and error message.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>

diff --git a/libarchive/test/test_archive_read_close_twice.c b/libarchive/test/test_archive_read_close_twice.c
index 2f5ee77f117e9a0616fd7e9fe2f33b4932b3c02e..4320ae6705658439fcfc07c3dba225188c5e9f1c 100644 (file)
--- a/libarchive/test/test_archive_read_close_twice.c
+++ b/libarchive/test/test_archive_read_close_twice.c
@@ -29,11 +29,11 @@ DEFINE_TEST(test_archive_read_close_twice)
 {
        struct archive* a = archive_read_new();
 
-       assertEqualInt(0, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(0, archive_errno(a));
        assertEqualString(NULL, archive_error_string(a));
 
-       assertEqualInt(0, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(0, archive_errno(a));
        assertEqualString(NULL, archive_error_string(a));
 

diff --git a/libarchive/test/test_archive_read_close_twice_open_fd.c b/libarchive/test/test_archive_read_close_twice_open_fd.c
index 62a6a90df1facdd62539bf8677666eaab411e57d..852038dde3f47497813925b6c0eaf012f7191471 100644 (file)
--- a/libarchive/test/test_archive_read_close_twice_open_fd.c
+++ b/libarchive/test/test_archive_read_close_twice_open_fd.c
@@ -34,11 +34,11 @@ DEFINE_TEST(test_archive_read_close_twice_open_fd)
        assertEqualInt(0, archive_errno(a));
        assertEqualString(NULL, archive_error_string(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(0, archive_errno(a));
        assertEqualString(NULL, archive_error_string(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(0, archive_errno(a));
        assertEqualString(NULL, archive_error_string(a));
 

diff --git a/libarchive/test/test_archive_read_close_twice_open_filename.c b/libarchive/test/test_archive_read_close_twice_open_filename.c
index 4824319b42bf4ba5a07e0db6b5e61919a618367c..0be64091d77d18978f9fee2e28a35911643453e9 100644 (file)
--- a/libarchive/test/test_archive_read_close_twice_open_filename.c
+++ b/libarchive/test/test_archive_read_close_twice_open_filename.c
@@ -36,11 +36,11 @@ DEFINE_TEST(test_archive_read_close_twice_open_filename)
        assertEqualInt(0, archive_errno(a));
        assertEqualString(NULL, archive_error_string(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(0, archive_errno(a));
        assertEqualString(NULL, archive_error_string(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(0, archive_errno(a));
        assertEqualString(NULL, archive_error_string(a));
 

diff --git a/libarchive/test/test_archive_write_add_filter.c b/libarchive/test/test_archive_write_add_filter.c
index 2dfd2478c4a1ee9d8d1b5f3f345d6ff780e05fd6..3a549d57230b828ffa9ba2a43200e8f682bd0829 100644 (file)
--- a/libarchive/test/test_archive_write_add_filter.c
+++ b/libarchive/test/test_archive_write_add_filter.c
@@ -131,7 +131,7 @@ test_add_filter_by_code(int filter_code,
        assertEqualIntA(a, filter_code, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_USTAR, archive_format(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
        free(buff);
 }

diff --git a/libarchive/test/test_archive_write_add_filter_by_name.c b/libarchive/test/test_archive_write_add_filter_by_name.c
index 9d7e58d6f635c42276e484d608f11f9ca372ce24..f0785203039b9470bfffdfeda6d0eb0b7bd5c88d 100644 (file)
--- a/libarchive/test/test_archive_write_add_filter_by_name.c
+++ b/libarchive/test/test_archive_write_add_filter_by_name.c
@@ -129,7 +129,7 @@ test_filter_by_name(const char *filter_name, int filter_code,
        assertEqualIntA(a, filter_code, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_USTAR, archive_format(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
        free(buff);
 }

diff --git a/libarchive/test/test_archive_write_set_format_by_name.c b/libarchive/test/test_archive_write_set_format_by_name.c
index 07942f6bffc88e30baefc44904955a8879ef6955..f8ca04db36e40c980f9e07fce53e1b661c687927 100644 (file)
--- a/libarchive/test/test_archive_write_set_format_by_name.c
+++ b/libarchive/test/test_archive_write_set_format_by_name.c
@@ -130,7 +130,7 @@ test_format_by_name(const char *format_name, const char *compression_type,
                    archive_filter_code(a, 0));
                assertEqualIntA(a, format_id, archive_format(a));
 
-               assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+               assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
                assertEqualInt(ARCHIVE_OK, archive_read_free(a));
        }
        free(buff);

diff --git a/libarchive/test/test_archive_write_set_format_filter_by_ext.c b/libarchive/test/test_archive_write_set_format_filter_by_ext.c
index fe6c350e48e74c90bb1b76867753c597965b336a..849a9c5a078d9e7f632cabe9e92282b7d56139d2 100644 (file)
--- a/libarchive/test/test_archive_write_set_format_filter_by_ext.c
+++ b/libarchive/test/test_archive_write_set_format_filter_by_ext.c
@@ -137,7 +137,7 @@ test_format_filter_by_ext(const char *output_file,
                    archive_filter_code(a, 0));
                assertEqualIntA(a, format_id, archive_format(a) & ARCHIVE_FORMAT_BASE_MASK );
 
-               assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+               assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
                assertEqualInt(ARCHIVE_OK, archive_read_free(a));
        }
        free(buff);

diff --git a/libarchive/test/test_compat_cpio.c b/libarchive/test/test_compat_cpio.c
index 12512881112b217adbcb430db5665e23092f1de4..1c139c77f95558364b6900115e9a3f957130f7db 100644 (file)
--- a/libarchive/test/test_compat_cpio.c
+++ b/libarchive/test/test_compat_cpio.c
@@ -92,7 +92,7 @@ test_compat_cpio_1(void)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_compat_gtar.c b/libarchive/test/test_compat_gtar.c
index ba42e726cf78a7c3610a6ca582ac9b0f155b8353..fe3cfec9077d4b2de5060f8b5db3b65bc96b489f 100644 (file)
--- a/libarchive/test/test_compat_gtar.c
+++ b/libarchive/test/test_compat_gtar.c
@@ -101,7 +101,7 @@ test_compat_gtar_1(void)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -141,7 +141,7 @@ test_compat_gtar_2(void)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_compat_gtar_large.c b/libarchive/test/test_compat_gtar_large.c
index 633b20c0a9f8b488843a33103635224a227ceef3..b9a467b1c95fd83f7b0df7794670197ab4380e62 100644 (file)
--- a/libarchive/test/test_compat_gtar_large.c
+++ b/libarchive/test/test_compat_gtar_large.c
@@ -218,7 +218,7 @@ DEFINE_TEST(test_compat_gtar_large)
        /* Verify that the reader actually read to the end of data */
        assertEqualInt(reader.zero_blocks_remaining, 0);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
        free(reader.zero_block);
 }

diff --git a/libarchive/test/test_compat_gzip.c b/libarchive/test/test_compat_gzip.c
index 20fce7af432db47456c236c5c0d679ba718c143d..475c1367457591f31635c302de3c7b76300d11be 100644 (file)
--- a/libarchive/test/test_compat_gzip.c
+++ b/libarchive/test/test_compat_gzip.c
@@ -77,7 +77,7 @@ verify(const char *name)
        assertEqualString(archive_filter_name(a, 0), "gzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_compat_lz4.c b/libarchive/test/test_compat_lz4.c
index 8ab9208b0918b79d138c48b09b783ac3df4eb3bd..3678cd0a0c70706400f36858d918a1fe675e15ac 100644 (file)
--- a/libarchive/test/test_compat_lz4.c
+++ b/libarchive/test/test_compat_lz4.c
@@ -78,7 +78,7 @@ verify(const char *name, const char *n[])
        assertEqualString(archive_filter_name(a, 0), "lz4");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_compat_lzip.c b/libarchive/test/test_compat_lzip.c
index cd246b943b22461f43e575cb8a47f71ebd0ba647..9a8196f61d49b576548bd80e792516bda8f5a726 100644 (file)
--- a/libarchive/test/test_compat_lzip.c
+++ b/libarchive/test/test_compat_lzip.c
@@ -124,7 +124,7 @@ compat_lzip(const char *name)
        assertEqualString(archive_filter_name(a, 0), "lzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -165,7 +165,7 @@ compat_lzip_3(const char *name)
        assertEqualString(archive_filter_name(a, 0), "lzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_RAW);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -202,7 +202,7 @@ compat_lzip_4(const char *name)
        assertEqualString(archive_filter_name(a, 0), "lzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_compat_lzma.c b/libarchive/test/test_compat_lzma.c
index b9cad55514a1d3e71e19f564926acce191e3ba85..af988e1f2b5400831fefbb8235c08c413d62a42c 100644 (file)
--- a/libarchive/test/test_compat_lzma.c
+++ b/libarchive/test/test_compat_lzma.c
@@ -133,7 +133,7 @@ compat_lzma(const char *name)
        assertEqualString(archive_filter_name(a, 0), "lzma");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_compat_lzop.c b/libarchive/test/test_compat_lzop.c
index 2da4e8eb6dc2ae760d34ede8dd7c14493ee4f9fe..a70d658244c405b74935fd6dd8721128321155ea 100644 (file)
--- a/libarchive/test/test_compat_lzop.c
+++ b/libarchive/test/test_compat_lzop.c
@@ -70,7 +70,7 @@ DEFINE_TEST(test_compat_lzop)
        assertEqualString(archive_filter_name(a, 0), "lzop");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
        /*
@@ -101,7 +101,7 @@ DEFINE_TEST(test_compat_lzop)
        assertEqualString(archive_filter_name(a, 0), "lzop");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
        /*
@@ -125,6 +125,6 @@ DEFINE_TEST(test_compat_lzop)
        assertEqualString(archive_filter_name(a, 0), "lzop");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_compat_mac.c b/libarchive/test/test_compat_mac.c
index 976f04a473f63510d8ea6d2dbb6a017e5f83a803..9532d079affc09f7526f1134c96fdebe8033e16d 100644 (file)
--- a/libarchive/test/test_compat_mac.c
+++ b/libarchive/test/test_compat_mac.c
@@ -130,7 +130,7 @@ test_compat_mac_1(void)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -201,7 +201,7 @@ test_compat_mac_2(void)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_compat_perl_archive_tar.c b/libarchive/test/test_compat_perl_archive_tar.c
index 94abe3f056a31efb86b9c3cebfb51c172d2b00f7..1574f7bc8ffb35b811149412f6ccf417c115d803 100644 (file)
--- a/libarchive/test/test_compat_perl_archive_tar.c
+++ b/libarchive/test/test_compat_perl_archive_tar.c
@@ -60,6 +60,6 @@ DEFINE_TEST(test_compat_perl_archive_tar)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_compat_plexus_archiver_tar.c b/libarchive/test/test_compat_plexus_archiver_tar.c
index 419e84b1c4c9b1ac427b964cc672517d3f27301d..8346fb555e535bbfed04d345c0f6c317932d7087 100644 (file)
--- a/libarchive/test/test_compat_plexus_archiver_tar.c
+++ b/libarchive/test/test_compat_plexus_archiver_tar.c
@@ -63,6 +63,6 @@ DEFINE_TEST(test_compat_plexus_archiver_tar)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_compat_solaris_pax_sparse.c b/libarchive/test/test_compat_solaris_pax_sparse.c
index 94e3e9189bc21deb12d7d278eaffda11b86c4216..1d3c2beb5579d4d1e66ff4696b46ef5d20cfb85d 100644 (file)
--- a/libarchive/test/test_compat_solaris_pax_sparse.c
+++ b/libarchive/test/test_compat_solaris_pax_sparse.c
@@ -100,7 +100,7 @@ test_compat_solaris_pax_sparse_1(void)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -172,7 +172,7 @@ test_compat_solaris_pax_sparse_2(void)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_compat_tar_directory.c b/libarchive/test/test_compat_tar_directory.c
index 3d086f1da7bc2bfdd03ab80ba57b200a448fa651..92278fdc6c43b5517b63a12f444916fa069942d5 100644 (file)
--- a/libarchive/test/test_compat_tar_directory.c
+++ b/libarchive/test/test_compat_tar_directory.c
@@ -64,7 +64,7 @@ test_compat_tar_directory_1(void)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_compat_tar_hardlink.c b/libarchive/test/test_compat_tar_hardlink.c
index b8517440aea53e4b0b636b1c2aaefb437594ae8a..4f4c8904ac5b1922cfeeb759eedbf69162e63262 100644 (file)
--- a/libarchive/test/test_compat_tar_hardlink.c
+++ b/libarchive/test/test_compat_tar_hardlink.c
@@ -91,7 +91,7 @@ test_compat_tar_hardlink_1(void)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_compat_xz.c b/libarchive/test/test_compat_xz.c
index f904583782d225ed05c4d0f564bafdb7f3858ef7..3170b149c6053c053c61a08800c64abf3e1fd986 100644 (file)
--- a/libarchive/test/test_compat_xz.c
+++ b/libarchive/test/test_compat_xz.c
@@ -72,7 +72,7 @@ compat_xz(const char *name)
        assertEqualString(archive_filter_name(a, 0), "xz");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_compat_zip.c b/libarchive/test/test_compat_zip.c
index 81c21c9ab8c2f6718f1875bba3792a0c420005b9..1f120692eccc25e25625a7e192e7c32db77768dc 100644 (file)
--- a/libarchive/test/test_compat_zip.c
+++ b/libarchive/test/test_compat_zip.c
@@ -58,7 +58,7 @@ DEFINE_TEST(test_compat_zip_1)
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ZIP);
 
 finish:
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -89,7 +89,7 @@ DEFINE_TEST(test_compat_zip_2)
        assertEqualString("file2", archive_entry_pathname(ae));
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_compat_zstd.c b/libarchive/test/test_compat_zstd.c
index 34b8edeb924da45ae1e45d2604bc31aa8e096169..8785aa39e2c3e041401bf4d908b7c97437ab7954 100644 (file)
--- a/libarchive/test/test_compat_zstd.c
+++ b/libarchive/test/test_compat_zstd.c
@@ -67,7 +67,7 @@ compat_zstd(const char *name)
        assertEqualString(archive_filter_name(a, 0), "zstd");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_disk_directory_traversals.c b/libarchive/test/test_read_disk_directory_traversals.c
index 7597f4b6f6eb45b13d04b39a7edfe12a93d0c7cf..718818c36b530c79dd41e154b68eb26f4735c598 100644 (file)
--- a/libarchive/test/test_read_disk_directory_traversals.c
+++ b/libarchive/test/test_read_disk_directory_traversals.c
@@ -230,7 +230,7 @@ test_basic(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header2(a, ae));
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        /*
         * Test that call archive_read_disk_open_w, wchar_t version.
@@ -358,7 +358,7 @@ test_basic(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header2(a, ae));
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        /*
         * Test that call archive_read_disk_open with a regular file.
@@ -381,7 +381,7 @@ test_basic(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header2(a, ae));
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
@@ -427,7 +427,7 @@ test_basic(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header2(a, ae));
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        /*
         * Test for a full-path beginning with "//?/"
@@ -458,7 +458,7 @@ test_basic(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header2(a, ae));
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        free(fullpath);
 
        /*
@@ -515,7 +515,7 @@ test_basic(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header2(a, ae));
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        free(fullpath);
 
 #endif
@@ -658,7 +658,7 @@ test_symlink_hybrid(void)
        /* There is no entry. */
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header2(a, ae));
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        /*
         * Specified file is a directory and it has symbolic files.
@@ -722,7 +722,7 @@ test_symlink_hybrid(void)
        /* There is no entry. */
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header2(a, ae));
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        /* Destroy the disk object. */
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
        archive_entry_free(ae);
@@ -827,7 +827,7 @@ test_symlink_logical(void)
        /* There is no entry. */
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        /*
         * Specified file is a directory and it has symbolic files.
@@ -953,7 +953,7 @@ test_symlink_logical(void)
        /* There is no entry. */
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        /* Destroy the disk object. */
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -1131,7 +1131,7 @@ test_restore_atime(void)
        assertFileAtime("at/fe", 886611, 0);
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        /*
         * Test2: Traversals with archive_read_disk_set_atime_restored().
@@ -1197,7 +1197,7 @@ test_restore_atime(void)
        assertFileAtime("at/fe", 886611, 0);
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        /*
         * Test3: Traversals with archive_read_disk_set_atime_restored() but
@@ -1254,7 +1254,7 @@ test_restore_atime(void)
        }
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        /*
         * Test4: Traversals with ARCHIVE_READDISK_RESTORE_ATIME and
@@ -1406,7 +1406,7 @@ test_callbacks(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header2(a, ae));
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        /* Reset name filter */
        assertEqualIntA(a, ARCHIVE_OK,
@@ -1539,7 +1539,7 @@ test_nodump(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header2(a, ae));
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        /*
         * Test2: Traversals with ARCHIVE_READDISK_HONOR_NODUMP
@@ -1671,7 +1671,7 @@ test_parent(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header2(a, ae));
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        assertChdir("../..");
 
@@ -1720,7 +1720,7 @@ test_parent(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header2(a, ae));
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        /*
         * Test3: Traverse lock/dir1/.
@@ -1767,7 +1767,7 @@ test_parent(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header2(a, ae));
 
        /* Close the disk object. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        /*
         * Test4: Traverse lock/lock2/dir1 from inside lock.
@@ -1842,7 +1842,7 @@ test_parent(void)
                    archive_read_next_header2(a, ae));
 
                /* Close the disk object. */
-               assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+               assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        }
 
        assertChdir("..");

diff --git a/libarchive/test/test_read_filter_compress.c b/libarchive/test/test_read_filter_compress.c
index 03a1d5fbe9c093c531779635ba1288083955d164..d03fdc9d63447b173aaa09e93cbf6906c04fc8cb 100644 (file)
--- a/libarchive/test/test_read_filter_compress.c
+++ b/libarchive/test/test_read_filter_compress.c
@@ -35,7 +35,7 @@ DEFINE_TEST(test_read_filter_compress_truncated)
        assertEqualIntA(a, ARCHIVE_FATAL,
            archive_read_open_memory(a, data, sizeof(data)));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -59,7 +59,7 @@ DEFINE_TEST(test_read_filter_compress_empty2)
        assertEqualString(archive_filter_name(a, 0), "compress (.Z)");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_EMPTY);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -75,6 +75,6 @@ DEFINE_TEST(test_read_filter_compress_invalid)
        assertEqualIntA(a, ARCHIVE_FATAL,
            archive_read_open_memory(a, data, sizeof(data)));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_filter_grzip.c b/libarchive/test/test_read_filter_grzip.c
index 43bd5bca2658caee91b6ffa5373575e9998f7b25..7e58a621007f524b4b0df3fc0529cb53923e643a 100644 (file)
--- a/libarchive/test/test_read_filter_grzip.c
+++ b/libarchive/test/test_read_filter_grzip.c
@@ -62,6 +62,6 @@ DEFINE_TEST(test_read_filter_grzip)
        assertEqualString(archive_filter_name(a, 0), "grzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_filter_gzip_recursive.c b/libarchive/test/test_read_filter_gzip_recursive.c
index 51b614b6c023bf9ececec62f62e0edd1d505c980..56889820e6664d04583cd63549421018318580f9 100644 (file)
--- a/libarchive/test/test_read_filter_gzip_recursive.c
+++ b/libarchive/test/test_read_filter_gzip_recursive.c
@@ -45,6 +45,6 @@ DEFINE_TEST(test_read_filter_gzip_recursive)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_GZIP);
        assertEqualString(archive_filter_name(a, 0), "gzip");
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_filter_lrzip.c b/libarchive/test/test_read_filter_lrzip.c
index 47388da0fb899c70d2f2af8ba40179b346c93781..5caeb0fe5781d1ebba3ed1ae922f9b38fda33db1 100644 (file)
--- a/libarchive/test/test_read_filter_lrzip.c
+++ b/libarchive/test/test_read_filter_lrzip.c
@@ -62,6 +62,6 @@ DEFINE_TEST(test_read_filter_lrzip)
        assertEqualString(archive_filter_name(a, 0), "lrzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_filter_lzop.c b/libarchive/test/test_read_filter_lzop.c
index acce6a4c205292bcae47eb75db3e8eb1eb491612..1d4d4f9352a5b20c9e82191993116c8356d2c1c5 100644 (file)
--- a/libarchive/test/test_read_filter_lzop.c
+++ b/libarchive/test/test_read_filter_lzop.c
@@ -72,6 +72,6 @@ DEFINE_TEST(test_read_filter_lzop)
        assertEqualString(archive_filter_name(a, 0), "lzop");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_filter_lzop_multiple_parts.c b/libarchive/test/test_read_filter_lzop_multiple_parts.c
index 82eaf35394738f0463753ab1b0cd4687c978fb27..677f729a7133a8f4537c0923b61fd3d47f3d19e0 100644 (file)
--- a/libarchive/test/test_read_filter_lzop_multiple_parts.c
+++ b/libarchive/test/test_read_filter_lzop_multiple_parts.c
@@ -71,6 +71,6 @@ DEFINE_TEST(test_read_filter_lzop_multiple_parts)
        assertEqualString(archive_filter_name(a, 0), "lzop");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_filter_uudecode_raw.c b/libarchive/test/test_read_filter_uudecode_raw.c
index 6f02dc5de14765b4cd2246c639e93905754da481..99f5b43f60cb8569c57abff964ce24e57e10eb4e 100644 (file)
--- a/libarchive/test/test_read_filter_uudecode_raw.c
+++ b/libarchive/test/test_read_filter_uudecode_raw.c
@@ -41,7 +41,7 @@ DEFINE_TEST(test_read_filter_uudecode_raw)
        assertEqualInt((AE_IFREG | 0755), archive_entry_mode(ae));
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -62,6 +62,6 @@ DEFINE_TEST(test_read_filter_uudecode_base64_raw)
        assertEqualInt((AE_IFREG | 0600), archive_entry_mode(ae));
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_7zip.c b/libarchive/test/test_read_format_7zip.c
index 1a22f52af74c78dd59344d14eb8e3e285b9dae6c..6f5ae3671a8c1bfa73fb196fdd0d6a0da3d9a629 100644 (file)
--- a/libarchive/test/test_read_format_7zip.c
+++ b/libarchive/test/test_read_format_7zip.c
@@ -82,7 +82,7 @@ test_copy(int use_open_fd)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
        if (fd != -1)
                close(fd);
@@ -115,7 +115,7 @@ test_empty_archive(void)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -156,7 +156,7 @@ test_empty_file(void)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -199,7 +199,7 @@ test_plain_header(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -284,7 +284,7 @@ test_extract_all_files(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -369,7 +369,7 @@ test_extract_all_files_zstd(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -419,7 +419,7 @@ test_extract_file_zstd_bcj_nobjc(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -498,7 +498,7 @@ test_extract_last_file(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -629,7 +629,7 @@ test_extract_all_files2(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -685,7 +685,7 @@ test_delta_lzma(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -741,7 +741,7 @@ test_bcj(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -798,7 +798,7 @@ test_ppmd(void)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -847,7 +847,7 @@ test_symname(void)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -1081,7 +1081,7 @@ test_arm_filter(const char *refname)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -1155,7 +1155,7 @@ test_arm64_filter(const char *refname)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -1404,7 +1404,7 @@ DEFINE_TEST(test_read_format_7zip_sfx_elf64trunc)
        assertEqualIntA(a, ARCHIVE_FATAL, archive_read_next_header(a, &ae));
        assertEqualInt(0, archive_file_count(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -1486,7 +1486,7 @@ test_riscv_filter(const char *refname)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 #endif
@@ -1546,7 +1546,7 @@ test_sparc_filter(const char *refname)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
        free(buff);
@@ -1619,7 +1619,7 @@ test_powerpc_filter(const char *refname)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
        free(buff);

diff --git a/libarchive/test/test_read_format_7zip_encryption_data.c b/libarchive/test/test_read_format_7zip_encryption_data.c
index faf0bce2e53cbe51506527610ecd77d761456822..c8c8ff06b153aa19bc3472499b2004849db85c14 100644 (file)
--- a/libarchive/test/test_read_format_7zip_encryption_data.c
+++ b/libarchive/test/test_read_format_7zip_encryption_data.c
@@ -63,7 +63,7 @@ DEFINE_TEST(test_read_format_7zip_encryption_data)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_7zip_encryption_header.c b/libarchive/test/test_read_format_7zip_encryption_header.c
index d0c48044ea5ef2fe1f823be26b6437748acaaa98..409c11e1aae0a45509e06c698977e7de3cc6403d 100644 (file)
--- a/libarchive/test/test_read_format_7zip_encryption_header.c
+++ b/libarchive/test/test_read_format_7zip_encryption_header.c
@@ -65,7 +65,7 @@ DEFINE_TEST(test_read_format_7zip_encryption_header)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_7zip_encryption_partially.c b/libarchive/test/test_read_format_7zip_encryption_partially.c
index 0d3f9149b924478c0e1b77aacaf03de3cf44a65f..ac168a35343b84fadace9b7545fbe5fa345f2643 100644 (file)
--- a/libarchive/test/test_read_format_7zip_encryption_partially.c
+++ b/libarchive/test/test_read_format_7zip_encryption_partially.c
@@ -76,6 +76,6 @@ DEFINE_TEST(test_read_format_7zip_encryption_partially)
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_7zip_issue2765.c b/libarchive/test/test_read_format_7zip_issue2765.c
index 7c45c313b31564b9a68e46df499add7ad6a03713..3232a87ef9f2d635b959f9f2420b3a086a870276 100644 (file)
--- a/libarchive/test/test_read_format_7zip_issue2765.c
+++ b/libarchive/test/test_read_format_7zip_issue2765.c
@@ -46,6 +46,6 @@ DEFINE_TEST(test_read_format_7zip_issue2765)
        assertEqualInt(0, archive_file_count(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_7zip_packinfo_digests.c b/libarchive/test/test_read_format_7zip_packinfo_digests.c
index e46a17b3b1daa1fd6d6c7c0caebaaf4b987e10a2..75f90f2df8996f3d6b6fbe1d5f4a8b50fcf8d50e 100644 (file)
--- a/libarchive/test/test_read_format_7zip_packinfo_digests.c
+++ b/libarchive/test/test_read_format_7zip_packinfo_digests.c
@@ -82,7 +82,7 @@ DEFINE_TEST(test_read_format_7zip_packinfo_digests)
                    archive_format(a));
 
                /* Close the archive. */
-               assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+               assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        }
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_cab.c b/libarchive/test/test_read_format_cab.c
index f5ce21cbf19b5551f330a2c399fb6cfa9d3c224d..0adf24c7c67f671e8c938656df567b4ab7167d33 100644 (file)
--- a/libarchive/test/test_read_format_cab.c
+++ b/libarchive/test/test_read_format_cab.c
@@ -266,7 +266,7 @@ verify(const char *refname, enum comp_type comp)
 
        /* Close the archive. */
 finish:
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -332,7 +332,7 @@ verify2(const char *refname, enum comp_type comp)
        assertEqualIntA(a, ARCHIVE_FORMAT_CAB, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -387,7 +387,7 @@ verify3(const char *refname, enum comp_type comp)
        assertEqualIntA(a, ARCHIVE_FORMAT_CAB, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_cab_filename.c b/libarchive/test/test_read_format_cab_filename.c
index efab3ccd69f10e9f5db2eb634a99d5eb3d5641a3..8c0d170428964232edde32861a53ff342afc2987 100644 (file)
--- a/libarchive/test/test_read_format_cab_filename.c
+++ b/libarchive/test/test_read_format_cab_filename.c
@@ -79,7 +79,7 @@ test_read_format_cab_filename_CP932_eucJP(const char *refname)
 
        /* Close the archive. */
 cleanup:
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -157,7 +157,7 @@ test_read_format_cab_filename_CP932_UTF8(const char *refname)
 
        /* Close the archive. */
 cleanup:
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_cpio_afio.c b/libarchive/test/test_read_format_cpio_afio.c
index 5d2b4b4c8134c4999837c311679b66f33a0b0b65..be386e1f40c3fa1b524c288f646cc842b18976aa 100644 (file)
--- a/libarchive/test/test_read_format_cpio_afio.c
+++ b/libarchive/test/test_read_format_cpio_afio.c
@@ -102,7 +102,7 @@ DEFINE_TEST(test_read_format_cpio_afio)
        assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
        assertA(archive_filter_code(a, 0) == ARCHIVE_FILTER_NONE);
        assertA(archive_format(a) == ARCHIVE_FORMAT_CPIO_AFIO_LARGE);
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
        free(p);

diff --git a/libarchive/test/test_read_format_cpio_bin_gz.c b/libarchive/test/test_read_format_cpio_bin_gz.c
index 47545f91324887b1c999c84618a163b1f7e86b93..1372a7b5111cc0698ce19c3df20f2a7c60ca8139 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_gz.c
+++ b/libarchive/test/test_read_format_cpio_bin_gz.c
@@ -55,7 +55,7 @@ DEFINE_TEST(test_read_format_cpio_bin_gz)
        assertEqualInt(archive_entry_is_encrypted(ae), 0);
        assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE);
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_cpio_filename.c b/libarchive/test/test_read_format_cpio_filename.c
index 2beeb60d8d112018eed08b1423a8bce6cfde3efb..011fdf0027d361471f572ca86317859f529dd035 100644 (file)
--- a/libarchive/test/test_read_format_cpio_filename.c
+++ b/libarchive/test/test_read_format_cpio_filename.c
@@ -76,7 +76,7 @@ DEFINE_TEST(test_read_format_cpio_filename_eucJP_UTF8)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -182,7 +182,7 @@ DEFINE_TEST(test_read_format_cpio_filename_UTF8_eucJP)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -235,7 +235,7 @@ DEFINE_TEST(test_read_format_cpio_filename_UTF8_UTF8_jp)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 #endif
 }
@@ -288,7 +288,7 @@ DEFINE_TEST(test_read_format_cpio_filename_CP866_KOI8R)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -340,7 +340,7 @@ DEFINE_TEST(test_read_format_cpio_filename_CP866_UTF8)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -393,7 +393,7 @@ DEFINE_TEST(test_read_format_cpio_filename_KOI8R_CP866)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -445,7 +445,7 @@ DEFINE_TEST(test_read_format_cpio_filename_KOI8R_UTF8)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -498,7 +498,7 @@ DEFINE_TEST(test_read_format_cpio_filename_UTF8_KOI8R)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -551,7 +551,7 @@ DEFINE_TEST(test_read_format_cpio_filename_UTF8_CP866)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -603,7 +603,7 @@ DEFINE_TEST(test_read_format_cpio_filename_UTF8_UTF8_ru)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 #endif
 }
@@ -654,7 +654,7 @@ DEFINE_TEST(test_read_format_cpio_filename_eucJP_CP932)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -706,7 +706,7 @@ DEFINE_TEST(test_read_format_cpio_filename_UTF8_CP932)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -759,7 +759,7 @@ DEFINE_TEST(test_read_format_cpio_filename_CP866_CP1251)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -812,7 +812,7 @@ DEFINE_TEST(test_read_format_cpio_filename_CP866_CP1251_win)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -864,7 +864,7 @@ DEFINE_TEST(test_read_format_cpio_filename_KOI8R_CP1251)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -917,7 +917,7 @@ DEFINE_TEST(test_read_format_cpio_filename_UTF8_CP1251)
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c b/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c
index cff64d72c1eda04691b7fdd2213c7026f8c3b79f..1c421df1e329abd40dacf6e6d8460c1416b5e682 100644 (file)
--- a/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c
+++ b/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c
@@ -123,7 +123,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_bzip2_rpm)
        assertEqualString(archive_filter_name(a, 0), "bzip2");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_cpio_svr4_gzip.c b/libarchive/test/test_read_format_cpio_svr4_gzip.c
index ae201de00f68710bd78c4bed09b76622e29fac79..7fa22611e5e96be21d2b9c48d08d6be089159548 100644 (file)
--- a/libarchive/test/test_read_format_cpio_svr4_gzip.c
+++ b/libarchive/test/test_read_format_cpio_svr4_gzip.c
@@ -55,7 +55,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip)
            ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);
        assertEqualInt(archive_entry_is_encrypted(ae), 0);
        assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c b/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c
index 345760c1014ffb676b96660875b4c194684ffaa8..6062c48cd127644ed43e3748287ff6fc815c4798 100644 (file)
--- a/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c
+++ b/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c
@@ -123,7 +123,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip_rpm)
        assertEqualString(archive_filter_name(a, 0), "gzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);
  
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_gtar_filename.c b/libarchive/test/test_read_format_gtar_filename.c
index cf9c30991b28cfb97df41f2b6412e7f2e04f78ae..75cc2b6af237746a85c3741e4b89fc8005b2b995 100644 (file)
--- a/libarchive/test/test_read_format_gtar_filename.c
+++ b/libarchive/test/test_read_format_gtar_filename.c
@@ -74,7 +74,7 @@ DEFINE_TEST(test_read_format_gtar_filename_eucJP_UTF8)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_GNUTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -127,7 +127,7 @@ DEFINE_TEST(test_read_format_gtar_filename_CP866_KOI8R)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_GNUTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -179,7 +179,7 @@ DEFINE_TEST(test_read_format_gtar_filename_CP866_UTF8)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_GNUTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -232,7 +232,7 @@ DEFINE_TEST(test_read_format_gtar_filename_KOI8R_CP866)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_GNUTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -284,7 +284,7 @@ DEFINE_TEST(test_read_format_gtar_filename_KOI8R_UTF8)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_GNUTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -335,7 +335,7 @@ DEFINE_TEST(test_read_format_gtar_filename_eucJP_CP932)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_GNUTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -388,7 +388,7 @@ DEFINE_TEST(test_read_format_gtar_filename_CP866_CP1251)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_GNUTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -441,7 +441,7 @@ DEFINE_TEST(test_read_format_gtar_filename_CP866_CP1251_win)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_GNUTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -493,7 +493,7 @@ DEFINE_TEST(test_read_format_gtar_filename_KOI8R_CP1251)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_GNUTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_gtar_gz.c b/libarchive/test/test_read_format_gtar_gz.c
index bc712b9e6e4468b7f1c721744aa3cfddd64f6926..8d99e493b0ca17b2831d13724b4a9c15810e1f27 100644 (file)
--- a/libarchive/test/test_read_format_gtar_gz.c
+++ b/libarchive/test/test_read_format_gtar_gz.c
@@ -55,7 +55,7 @@ DEFINE_TEST(test_read_format_gtar_gz)
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
        assertEqualInt(archive_entry_is_encrypted(ae), 0);
        assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_gtar_redundant_L.c b/libarchive/test/test_read_format_gtar_redundant_L.c
index 167445c074f39c57aec925a8ee9bebc016e4c50e..24bdead35230e3fb73bbb82ae8f8b640da295415 100644 (file)
--- a/libarchive/test/test_read_format_gtar_redundant_L.c
+++ b/libarchive/test/test_read_format_gtar_redundant_L.c
@@ -35,6 +35,6 @@ DEFINE_TEST(test_read_format_gtar_redundant_L)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_GNUTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_gtar_sparse_skip_entry.c b/libarchive/test/test_read_format_gtar_sparse_skip_entry.c
index 6b1d6556aa64511a432d4f246698954585228ffe..eaf015be2d37e465acb718d68b9f2e0b50ca842d 100644 (file)
--- a/libarchive/test/test_read_format_gtar_sparse_skip_entry.c
+++ b/libarchive/test/test_read_format_gtar_sparse_skip_entry.c
@@ -74,7 +74,7 @@ DEFINE_TEST(test_read_format_gtar_sparse_skip_entry)
            archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
 
@@ -117,7 +117,7 @@ DEFINE_TEST(test_read_format_gtar_sparse_skip_entry)
            archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_huge_rpm.c b/libarchive/test/test_read_format_huge_rpm.c
index 729c1e188d28f4d97ffe0f4d25f454b0ad769460..072545174da327a123d8cd52cbc187a831cbb51b 100644 (file)
--- a/libarchive/test/test_read_format_huge_rpm.c
+++ b/libarchive/test/test_read_format_huge_rpm.c
@@ -44,7 +44,7 @@ DEFINE_TEST(test_read_format_huge_rpm)
        assertEqualString("rpm", archive_filter_name(a, 0));
        assertEqualInt(ARCHIVE_FORMAT_EMPTY, archive_format(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_lha.c b/libarchive/test/test_read_format_lha.c
index 93e79183e5c3ce58797fd7a0fc02fc9277398bf1..b323cb3c86a5ceb3a94d87cc61b45daf08ffbaa2 100644 (file)
--- a/libarchive/test/test_read_format_lha.c
+++ b/libarchive/test/test_read_format_lha.c
@@ -266,7 +266,7 @@ verify(const char *refname, int posix)
        assertEqualIntA(a, ARCHIVE_FORMAT_LHA, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_lha_bugfix_0.c b/libarchive/test/test_read_format_lha_bugfix_0.c
index bbdcb81569b614c55bd6be01a5d21afb9b23c5c0..342dd1ef3c70780f7d0677d54f6f4dec6d95fed3 100644 (file)
--- a/libarchive/test/test_read_format_lha_bugfix_0.c
+++ b/libarchive/test/test_read_format_lha_bugfix_0.c
@@ -69,7 +69,7 @@ DEFINE_TEST(test_read_format_lha_bugfix_0)
        assertEqualIntA(a, ARCHIVE_FORMAT_LHA, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_lha_filename.c b/libarchive/test/test_read_format_lha_filename.c
index d726f6245d7d68cf21a3f5bb5ffdbbda87f8db16..22c303aa4b3e682927a58ff4131babe48927c8a8 100644 (file)
--- a/libarchive/test/test_read_format_lha_filename.c
+++ b/libarchive/test/test_read_format_lha_filename.c
@@ -85,7 +85,7 @@ test_read_format_lha_filename_CP932_eucJP(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_LHA, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -145,7 +145,7 @@ test_read_format_lha_filename_CP932_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_LHA, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -195,7 +195,7 @@ test_read_format_lha_filename_CP932_Windows(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_LHA, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 #else

diff --git a/libarchive/test/test_read_format_lha_filename_utf16.c b/libarchive/test/test_read_format_lha_filename_utf16.c
index d0710799bba41bd87bc3810b60cd0d6d438537f5..f700ec3c3ebbf7994d536022b00e587b0e39c03d 100644 (file)
--- a/libarchive/test/test_read_format_lha_filename_utf16.c
+++ b/libarchive/test/test_read_format_lha_filename_utf16.c
@@ -127,7 +127,7 @@ test_read_format_lha_filename_UTF16_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_LHA, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_mtree.c b/libarchive/test/test_read_format_mtree.c
index dc5b5f1fc7ac807c2d0d7a359b3ad99584e59272..e95bdabc39231b205d7212a4b68ad588496fbc8d 100644 (file)
--- a/libarchive/test/test_read_format_mtree.c
+++ b/libarchive/test/test_read_format_mtree.c
@@ -269,7 +269,7 @@ test_read_format_mtree1(void)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualInt(30, archive_file_count(a));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -299,7 +299,7 @@ test_read_format_mtree2(void)
        assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -348,7 +348,7 @@ test_read_format_mtree3(void)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualInt(3, archive_file_count(a));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
        assertChdir("..");
@@ -418,7 +418,7 @@ DEFINE_TEST(test_read_format_mtree_filenames_only)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualInt(6, archive_file_count(a));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -477,7 +477,7 @@ DEFINE_TEST(test_read_format_mtree_nochange)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualInt(3, archive_file_count(a));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
        /*
@@ -518,7 +518,7 @@ DEFINE_TEST(test_read_format_mtree_nochange)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualInt(3, archive_file_count(a));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -620,7 +620,7 @@ DEFINE_TEST(test_read_format_mtree_nomagic_v1_form)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualInt(12, archive_file_count(a));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -687,7 +687,7 @@ DEFINE_TEST(test_read_format_mtree_nomagic_v2_form)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualInt(6, archive_file_count(a));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -754,7 +754,7 @@ DEFINE_TEST(test_read_format_mtree_nomagic_v2_netbsd_form)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualInt(6, archive_file_count(a));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -785,7 +785,7 @@ DEFINE_TEST(test_read_format_mtree_nonexistent_contents_file)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -811,7 +811,7 @@ DEFINE_TEST(test_read_format_mtree_noprint)
        assertEqualIntA(a, ARCHIVE_FATAL, archive_read_next_header(a, &ae));
        assertEqualString("Can't parse line 3", archive_error_string(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -840,7 +840,7 @@ DEFINE_TEST(test_read_format_mtree_tab)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -875,6 +875,6 @@ DEFINE_TEST(test_read_format_mtree_nano)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualInt(2, archive_file_count(a));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_rar_encryption.c b/libarchive/test/test_read_format_rar_encryption.c
index 5b592e2b52335400c8a508505f69334fb28728d2..ae2d6141d17f98cb95e0099f6959cbe64a7119c6 100644 (file)
--- a/libarchive/test/test_read_format_rar_encryption.c
+++ b/libarchive/test/test_read_format_rar_encryption.c
@@ -81,7 +81,7 @@ static void test_encrypted_rar_archive(const char *filename, int filenamesEncryp
                assertEqualInt(ARCHIVE_FATAL, archive_read_data(a, buff, sizeof(buff)));
 
                /* Additional attempts to read headers are futile */
-               assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+               assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
                assertEqualInt(ARCHIVE_OK, archive_read_free(a));
                return;
        }
@@ -126,7 +126,7 @@ static void test_encrypted_rar_archive(const char *filename, int filenamesEncryp
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_rar_encryption_data.c b/libarchive/test/test_read_format_rar_encryption_data.c
index 7e41b3b3f29fc24710893c27e21c767f853f9a09..6bfcadabe331b95143cedaeeb9986f2664671c2d 100644 (file)
--- a/libarchive/test/test_read_format_rar_encryption_data.c
+++ b/libarchive/test/test_read_format_rar_encryption_data.c
@@ -72,7 +72,7 @@ DEFINE_TEST(test_read_format_rar_encryption_data)
        assertEqualIntA(a, ARCHIVE_FORMAT_RAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_rar_encryption_header.c b/libarchive/test/test_read_format_rar_encryption_header.c
index e54db5152383ef1d8b754a089b9a4a57e1c5134a..17444a2e2b7cc301413d87d2b72b6f655983ce37 100644 (file)
--- a/libarchive/test/test_read_format_rar_encryption_header.c
+++ b/libarchive/test/test_read_format_rar_encryption_header.c
@@ -65,6 +65,6 @@ DEFINE_TEST(test_read_format_rar_encryption_header)
        assertEqualIntA(a, ARCHIVE_FORMAT_RAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_rar_encryption_partially.c b/libarchive/test/test_read_format_rar_encryption_partially.c
index 9c2106af8fa9965aa6c6a88d36ad31459a8fd48d..d117258169e58fa97e8f7a481f0022bc8405cd14 100644 (file)
--- a/libarchive/test/test_read_format_rar_encryption_partially.c
+++ b/libarchive/test/test_read_format_rar_encryption_partially.c
@@ -73,6 +73,6 @@ DEFINE_TEST(test_read_format_rar_encryption_partially)
        assertEqualIntA(a, ARCHIVE_FORMAT_RAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_tar_concatenated.c b/libarchive/test/test_read_format_tar_concatenated.c
index f6ed03a4404b95a40a0ef4ce1b3d3b7cb8f05e54..b7726b34a45e55b56f8667bf7daaf01954e379f2 100644 (file)
--- a/libarchive/test/test_read_format_tar_concatenated.c
+++ b/libarchive/test/test_read_format_tar_concatenated.c
@@ -54,7 +54,7 @@ DEFINE_TEST(test_read_format_tar_concatenated)
        /* Verify the end-of-archive. */
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
 
@@ -80,6 +80,6 @@ DEFINE_TEST(test_read_format_tar_concatenated)
        /* Verify the end-of-archive. */
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_tar_empty_filename.c b/libarchive/test/test_read_format_tar_empty_filename.c
index 310d260bb4d6053a0c30b98a2a51941c047ffbce..b9c03f572faee040d0c69388e083a8df12089822 100644 (file)
--- a/libarchive/test/test_read_format_tar_empty_filename.c
+++ b/libarchive/test/test_read_format_tar_empty_filename.c
@@ -58,6 +58,6 @@ DEFINE_TEST(test_read_format_tar_empty_filename)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_tar_empty_with_gnulabel.c b/libarchive/test/test_read_format_tar_empty_with_gnulabel.c
index a86bb287bf4e0ac6dc7375243d2949d3563cfae0..43db2037562a0f946173d2c6d7360c7196492f1b 100644 (file)
--- a/libarchive/test/test_read_format_tar_empty_with_gnulabel.c
+++ b/libarchive/test/test_read_format_tar_empty_with_gnulabel.c
@@ -47,6 +47,6 @@ DEFINE_TEST(test_read_format_tar_empty_with_gnulabel)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_tar_filename.c b/libarchive/test/test_read_format_tar_filename.c
index 5da94967ddf8b4985e503bc9044e9e6099729d73..42081ef1935d4e290f9f6aececf86df01a298154 100644 (file)
--- a/libarchive/test/test_read_format_tar_filename.c
+++ b/libarchive/test/test_read_format_tar_filename.c
@@ -100,7 +100,7 @@ test_read_format_tar_filename_KOI8R_CP866(const char *refname)
            archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 next_test:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
@@ -150,7 +150,7 @@ next_test:
            archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -214,7 +214,7 @@ test_read_format_tar_filename_KOI8R_UTF8(const char *refname)
        assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
        /*
@@ -261,7 +261,7 @@ test_read_format_tar_filename_KOI8R_UTF8(const char *refname)
            archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -329,7 +329,7 @@ test_read_format_tar_filename_KOI8R_CP1251(const char *refname)
            archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 next_test:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
@@ -377,7 +377,7 @@ next_test:
            archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_tar_pax_g_large.c b/libarchive/test/test_read_format_tar_pax_g_large.c
index c4771e699777e240d98f2ff82809c7f5aa8795ec..092cf33a7d5da2e907915f66f3376a3e70ab4da4 100644 (file)
--- a/libarchive/test/test_read_format_tar_pax_g_large.c
+++ b/libarchive/test/test_read_format_tar_pax_g_large.c
@@ -48,6 +48,6 @@ DEFINE_TEST(test_read_format_tar_pax_g_large)
        assertEqualInt(ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualInt(ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE, archive_format(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_tar_pax_large_attr.c b/libarchive/test/test_read_format_tar_pax_large_attr.c
index 1c2b55f9c6fbee9d4443452f3205330220a91521..024df41e090cf12ce1428577c7c2b7f9aa2b5a1e 100644 (file)
--- a/libarchive/test/test_read_format_tar_pax_large_attr.c
+++ b/libarchive/test/test_read_format_tar_pax_large_attr.c
@@ -60,6 +60,6 @@ DEFINE_TEST(test_read_format_tar_pax_large_attr)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_tar_pax_negative_time.c b/libarchive/test/test_read_format_tar_pax_negative_time.c
index b4edc3c2d951c67b5a2a81be277e1268f458e2ca..cdcba03262c14b1fd9878051c6b7ee919309ba64 100644 (file)
--- a/libarchive/test/test_read_format_tar_pax_negative_time.c
+++ b/libarchive/test/test_read_format_tar_pax_negative_time.c
@@ -63,6 +63,6 @@ DEFINE_TEST(test_read_format_tar_pax_negative_time)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_tar_pax_timestamps.c b/libarchive/test/test_read_format_tar_pax_timestamps.c
index 7850cbee815dfcf514f1372ac4e42f5bfdda46b1..9e416049c9ef675fbef53c5f436665401f807c88 100644 (file)
--- a/libarchive/test/test_read_format_tar_pax_timestamps.c
+++ b/libarchive/test/test_read_format_tar_pax_timestamps.c
@@ -59,6 +59,6 @@ DEFINE_TEST(test_read_format_tar_pax_timestamps)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_tar_timestamp_overflow.c b/libarchive/test/test_read_format_tar_timestamp_overflow.c
index b900e389dda9d310351446fc8a08ac0e90a3b300..0bb1101fcb5e9ca57e9327dbf40b2219ab36dcc5 100644 (file)
--- a/libarchive/test/test_read_format_tar_timestamp_overflow.c
+++ b/libarchive/test/test_read_format_tar_timestamp_overflow.c
@@ -50,6 +50,6 @@ DEFINE_TEST(test_read_format_tar_timestamp_overflow)
        /* Verify the end-of-archive. */
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_tgz.c b/libarchive/test/test_read_format_tgz.c
index 5bb5e02be4f4e1a8934b77912169cadea30f0d40..6f9a8eb1909d0080219d9a32f8992526083f9666 100644 (file)
--- a/libarchive/test/test_read_format_tgz.c
+++ b/libarchive/test/test_read_format_tgz.c
@@ -55,7 +55,7 @@ DEFINE_TEST(test_read_format_tgz)
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualInt(archive_entry_is_encrypted(ae), 0);
        assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK,archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_ustar_filename.c b/libarchive/test/test_read_format_ustar_filename.c
index 0c7e8a3c8070cd6d9591e9a92d73e2b71ae921a3..7896ff4ec9ff28cb2dab3b529267c06e1ff11e39 100644 (file)
--- a/libarchive/test/test_read_format_ustar_filename.c
+++ b/libarchive/test/test_read_format_ustar_filename.c
@@ -75,7 +75,7 @@ test_read_format_ustar_filename_eucJP_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_USTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -130,7 +130,7 @@ test_read_format_ustar_filename_CP866_KOI8R(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_USTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -185,7 +185,7 @@ test_read_format_ustar_filename_CP866_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_USTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -241,7 +241,7 @@ test_read_format_ustar_filename_KOI8R_CP866(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_USTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -296,7 +296,7 @@ test_read_format_ustar_filename_KOI8R_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_USTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -350,7 +350,7 @@ test_read_format_ustar_filename_eucJP_CP932(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_USTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -406,7 +406,7 @@ test_read_format_ustar_filename_CP866_CP1251(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_USTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -462,7 +462,7 @@ test_read_format_ustar_filename_CP866_CP1251_win(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_USTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -517,7 +517,7 @@ test_read_format_ustar_filename_KOI8R_CP1251(const char *refname)
        assertEqualIntA(a, ARCHIVE_FORMAT_TAR_USTAR, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_zip_encryption_data.c b/libarchive/test/test_read_format_zip_encryption_data.c
index 4a6502b9bf2ded334f50cfd82540ba5dc0a30ca1..2a94b2cd3d54fe44aa7be57f2e20afc353d15ef8 100644 (file)
--- a/libarchive/test/test_read_format_zip_encryption_data.c
+++ b/libarchive/test/test_read_format_zip_encryption_data.c
@@ -72,7 +72,7 @@ DEFINE_TEST(test_read_format_zip_encryption_data)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_zip_encryption_header.c b/libarchive/test/test_read_format_zip_encryption_header.c
index fb19c1421946b7679abf455f90eab306a3c59f0b..6c190c435d5927138b070f70283ecd4067d17316 100644 (file)
--- a/libarchive/test/test_read_format_zip_encryption_header.c
+++ b/libarchive/test/test_read_format_zip_encryption_header.c
@@ -65,6 +65,6 @@ DEFINE_TEST(test_read_format_zip_encryption_header)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_zip_encryption_partially.c b/libarchive/test/test_read_format_zip_encryption_partially.c
index cd5d2103ea6ab823c16ba717d824335e3c9f59a9..70241aed178b900c6001e231696cdd27803be58a 100644 (file)
--- a/libarchive/test/test_read_format_zip_encryption_partially.c
+++ b/libarchive/test/test_read_format_zip_encryption_partially.c
@@ -73,6 +73,6 @@ DEFINE_TEST(test_read_format_zip_encryption_partially)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_format_zip_filename.c b/libarchive/test/test_read_format_zip_filename.c
index b673344738be751100890e4f5e2358795d3cd6fb..21702d2f62f3b303ee5d187fa2af4a8c08e0fc93 100644 (file)
--- a/libarchive/test/test_read_format_zip_filename.c
+++ b/libarchive/test/test_read_format_zip_filename.c
@@ -81,7 +81,7 @@ DEFINE_TEST(test_read_format_zip_filename_CP932_eucJP)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -159,7 +159,7 @@ DEFINE_TEST(test_read_format_zip_filename_CP932_UTF8)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -234,7 +234,7 @@ DEFINE_TEST(test_read_format_zip_filename_UTF8_eucJP)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -329,7 +329,7 @@ DEFINE_TEST(test_read_format_zip_filename_UTF8_UTF8)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -385,7 +385,7 @@ DEFINE_TEST(test_read_format_zip_filename_CP866_KOI8R)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -441,7 +441,7 @@ DEFINE_TEST(test_read_format_zip_filename_CP866_UTF8)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -498,7 +498,7 @@ DEFINE_TEST(test_read_format_zip_filename_KOI8R_CP866)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -554,7 +554,7 @@ DEFINE_TEST(test_read_format_zip_filename_KOI8R_UTF8)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -616,7 +616,7 @@ DEFINE_TEST(test_read_format_zip_filename_UTF8_KOI8R)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -681,7 +681,7 @@ DEFINE_TEST(test_read_format_zip_filename_UTF8_CP866)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -734,7 +734,7 @@ DEFINE_TEST(test_read_format_zip_filename_UTF8_UTF8_ru)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -792,7 +792,7 @@ DEFINE_TEST(test_read_format_zip_filename_CP932_CP932)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -869,7 +869,7 @@ DEFINE_TEST(test_read_format_zip_filename_UTF8_CP932)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -926,7 +926,7 @@ DEFINE_TEST(test_read_format_zip_filename_CP866_CP1251)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -983,7 +983,7 @@ DEFINE_TEST(test_read_format_zip_filename_CP866_CP1251_win)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
@@ -1039,7 +1039,7 @@ DEFINE_TEST(test_read_format_zip_filename_KOI8R_CP1251)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -1103,7 +1103,7 @@ DEFINE_TEST(test_read_format_zip_filename_UTF8_CP1251)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 cleanup:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
@@ -1173,7 +1173,7 @@ DEFINE_TEST(test_read_format_zip_filename_KOI8R_UTF8_2)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 next_test:
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
@@ -1223,7 +1223,7 @@ next_test:
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 #endif
 }

diff --git a/libarchive/test/test_read_format_zip_traditional_encryption_data.c b/libarchive/test/test_read_format_zip_traditional_encryption_data.c
index 0cf2d0a1576d5cbb852c0661369864b445e5beef..423197032f359dee8ecebe27cb1f536d5d5248bf 100644 (file)
--- a/libarchive/test/test_read_format_zip_traditional_encryption_data.c
+++ b/libarchive/test/test_read_format_zip_traditional_encryption_data.c
@@ -92,7 +92,7 @@ DEFINE_TEST(test_read_format_zip_traditional_encryption_data)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
 
@@ -161,7 +161,7 @@ DEFINE_TEST(test_read_format_zip_traditional_encryption_data)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_zip_winzip_aes.c b/libarchive/test/test_read_format_zip_winzip_aes.c
index 9b609b4f29ff01393be5d7432a1e3b89e793bc04..064244395a6bd256308c699440be84c48d99d94a 100644 (file)
--- a/libarchive/test/test_read_format_zip_winzip_aes.c
+++ b/libarchive/test/test_read_format_zip_winzip_aes.c
@@ -78,7 +78,7 @@ test_winzip_aes(const char *refname, int need_libz)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
 
@@ -128,7 +128,7 @@ test_winzip_aes(const char *refname, int need_libz)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_zip_winzip_aes_large.c b/libarchive/test/test_read_format_zip_winzip_aes_large.c
index 4f52bb91114714710b7f558ab318ed16e819ffc1..edb4efc405fe36c6ccff2d3b39cd55051936e4a6 100644 (file)
--- a/libarchive/test/test_read_format_zip_winzip_aes_large.c
+++ b/libarchive/test/test_read_format_zip_winzip_aes_large.c
@@ -110,7 +110,7 @@ DEFINE_TEST(test_read_format_zip_winzip_aes256_large)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
 
@@ -210,7 +210,7 @@ DEFINE_TEST(test_read_format_zip_winzip_aes256_large)
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_read_format_zip_zipx_lzma_oom.c b/libarchive/test/test_read_format_zip_zipx_lzma_oom.c
index 99e5519f8f9e9517ba49e40246f7f6e6b2d0ee7f..9867fd2abc90643b7b2e4aba0dbb86666dc09e32 100644 (file)
--- a/libarchive/test/test_read_format_zip_zipx_lzma_oom.c
+++ b/libarchive/test/test_read_format_zip_zipx_lzma_oom.c
@@ -58,6 +58,6 @@ DEFINE_TEST(test_read_format_zip_zipx_lzma_oom)
        assertEqualIntA(a, ARCHIVE_FATAL, archive_read_data(a, buf, sizeof(buf)));
        assertEqualInt(ENOMEM, archive_errno(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_pax_empty_val_no_nl.c b/libarchive/test/test_read_pax_empty_val_no_nl.c
index f985488754fd284288071abdf5d38a8491cdff01..a271e9ee5e6329b4d4b5e8834a9c8abfcb2e0013 100644 (file)
--- a/libarchive/test/test_read_pax_empty_val_no_nl.c
+++ b/libarchive/test/test_read_pax_empty_val_no_nl.c
@@ -60,6 +60,6 @@ DEFINE_TEST(test_read_pax_empty_val_no_nl)
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE);
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_pax_xattr_rht_security_selinux.c b/libarchive/test/test_read_pax_xattr_rht_security_selinux.c
index 609e8d03bf7b6ba588c2765446262ddba543c462..7f526ebfd4de624ed1baa9e40784114bea8a8b85 100644 (file)
--- a/libarchive/test/test_read_pax_xattr_rht_security_selinux.c
+++ b/libarchive/test/test_read_pax_xattr_rht_security_selinux.c
@@ -57,6 +57,6 @@ DEFINE_TEST(test_read_pax_xattr_rht_security_selinux)
        assertEqualInt((int)xsize, strlen(string));
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_pax_xattr_schily.c b/libarchive/test/test_read_pax_xattr_schily.c
index 6b7dc471f043f0cf712d47660e4d9689826bb123..7dfc9e7bb5a9625a1800faa47345fbc5704b3982 100644 (file)
--- a/libarchive/test/test_read_pax_xattr_schily.c
+++ b/libarchive/test/test_read_pax_xattr_schily.c
@@ -65,6 +65,6 @@ DEFINE_TEST(test_read_pax_xattr_schily)
        assertEqualMem(xval, array, 12);
 
        /* Close the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_read_set_format.c b/libarchive/test/test_read_set_format.c
index ed7d362a8a544e8a1145b9899266391b43e3304d..0b656b1682f5707ab2399bf2c27e941c9e4f5aab 100644 (file)
--- a/libarchive/test/test_read_set_format.c
+++ b/libarchive/test/test_read_set_format.c
@@ -148,7 +148,7 @@ DEFINE_TEST(test_read_append_filter)
   assertEqualInt(1, archive_file_count(a));
   assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_GZIP);
   assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
-  assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+  assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
   assertEqualInt(ARCHIVE_OK,archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_write_disk_secure745.c b/libarchive/test/test_write_disk_secure745.c
index 7b908ccc8905935df91a1be6cc12305ef74b52b8..570a8356a9f2d78926eb297818f91e8fbcf55ea7 100644 (file)
--- a/libarchive/test/test_write_disk_secure745.c
+++ b/libarchive/test/test_write_disk_secure745.c
@@ -72,7 +72,7 @@ DEFINE_TEST(test_write_disk_secure745)
        /* Permission of target dir should not have changed. */
        assertFileMode("../target", 0700);
 
-       assert(0 == archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        archive_write_free(a);
 #endif
 }

diff --git a/libarchive/test/test_write_filter_b64encode.c b/libarchive/test/test_write_filter_b64encode.c
index d7c4763b1cdcce1ffebbca30bb953d7b02ec2f1c..d8abed976de4ec0864e1e8633665577037005df2 100644 (file)
--- a/libarchive/test/test_write_filter_b64encode.c
+++ b/libarchive/test/test_write_filter_b64encode.c
@@ -147,13 +147,13 @@ DEFINE_TEST(test_write_filter_b64encode)
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_b64encode(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_b64encode(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
@@ -161,7 +161,7 @@ DEFINE_TEST(test_write_filter_b64encode)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_b64encode(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used2));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /*

diff --git a/libarchive/test/test_write_filter_bzip2.c b/libarchive/test/test_write_filter_bzip2.c
index d7ed95e2c7ff85f64e3919e596667e7f0174ab4e..1fc19c19d45472f58c38f73528ea744ea1462d30 100644 (file)
--- a/libarchive/test/test_write_filter_bzip2.c
+++ b/libarchive/test/test_write_filter_bzip2.c
@@ -241,7 +241,7 @@ DEFINE_TEST(test_write_filter_bzip2)
        else
                assertEqualIntA(a, ARCHIVE_OK,
                    archive_write_add_filter_bzip2(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
@@ -252,7 +252,7 @@ DEFINE_TEST(test_write_filter_bzip2)
        else
                assertEqualIntA(a, ARCHIVE_OK,
                    archive_write_add_filter_bzip2(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
@@ -265,7 +265,7 @@ DEFINE_TEST(test_write_filter_bzip2)
                    archive_write_add_filter_bzip2(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used2));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /*

diff --git a/libarchive/test/test_write_filter_gzip.c b/libarchive/test/test_write_filter_gzip.c
index a6681d7618b12d8d15c952a916a5723a31bb8568..e58a91fbb8bf26cc0f6abddf38d967346546952d 100644 (file)
--- a/libarchive/test/test_write_filter_gzip.c
+++ b/libarchive/test/test_write_filter_gzip.c
@@ -280,14 +280,14 @@ DEFINE_TEST(test_write_filter_gzip)
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, (use_prog)?ARCHIVE_WARN:ARCHIVE_OK,
            archive_write_add_filter_gzip(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, (use_prog)?ARCHIVE_WARN:ARCHIVE_OK,
            archive_write_add_filter_gzip(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
@@ -295,7 +295,7 @@ DEFINE_TEST(test_write_filter_gzip)
        assertEqualIntA(a, (use_prog)?ARCHIVE_WARN:ARCHIVE_OK,
            archive_write_add_filter_gzip(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /*

diff --git a/libarchive/test/test_write_filter_lrzip.c b/libarchive/test/test_write_filter_lrzip.c
index 8da7ae39af5dea3adc3b2d0aafc14046e7a3ae3a..187b2c07baa1dce0fddde04c21efd458eeb5f62f 100644 (file)
--- a/libarchive/test/test_write_filter_lrzip.c
+++ b/libarchive/test/test_write_filter_lrzip.c
@@ -106,13 +106,13 @@ DEFINE_TEST(test_write_filter_lrzip)
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_WARN, archive_write_add_filter_lrzip(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_WARN, archive_write_add_filter_lrzip(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
@@ -120,7 +120,7 @@ DEFINE_TEST(test_write_filter_lrzip)
        assertEqualIntA(a, ARCHIVE_WARN, archive_write_add_filter_lrzip(a));
        assertEqualIntA(a, ARCHIVE_OK,
                archive_write_open_memory(a, buff, buffsize, &used2));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /*

diff --git a/libarchive/test/test_write_filter_lz4.c b/libarchive/test/test_write_filter_lz4.c
index 74a910b53530a80e5ada7dfba900abc6c75f99b7..883f28061d62ad9c77152047d3fed4f1f517358c 100644 (file)
--- a/libarchive/test/test_write_filter_lz4.c
+++ b/libarchive/test/test_write_filter_lz4.c
@@ -247,14 +247,14 @@ DEFINE_TEST(test_write_filter_lz4)
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, (use_prog)?ARCHIVE_WARN:ARCHIVE_OK,
            archive_write_add_filter_lz4(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, (use_prog)?ARCHIVE_WARN:ARCHIVE_OK,
            archive_write_add_filter_lz4(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
@@ -263,7 +263,7 @@ DEFINE_TEST(test_write_filter_lz4)
            archive_write_add_filter_lz4(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used2));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /*

diff --git a/libarchive/test/test_write_filter_lzip.c b/libarchive/test/test_write_filter_lzip.c
index 631fd96bd5ceaea0319ada0089acbaf555af1a64..199775a2bd5e680881de9c7ef32af4b95f87fd31 100644 (file)
--- a/libarchive/test/test_write_filter_lzip.c
+++ b/libarchive/test/test_write_filter_lzip.c
@@ -230,20 +230,20 @@ DEFINE_TEST(test_write_filter_lzip)
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzip(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzip(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzip(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /*

diff --git a/libarchive/test/test_write_filter_lzma.c b/libarchive/test/test_write_filter_lzma.c
index 9bb2d8eb794350baf8250ed5f6b161a5a38d670b..d60c4dda8b612d07bad07ee620ab9f81718f725c 100644 (file)
--- a/libarchive/test/test_write_filter_lzma.c
+++ b/libarchive/test/test_write_filter_lzma.c
@@ -234,20 +234,20 @@ DEFINE_TEST(test_write_filter_lzma)
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzma(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzma(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzma(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /*

diff --git a/libarchive/test/test_write_filter_lzop.c b/libarchive/test/test_write_filter_lzop.c
index 8b74d224dcedba1be5972723d9e4f9b3e317412b..f825a126b659c0d3562c06e25469b361504e5691 100644 (file)
--- a/libarchive/test/test_write_filter_lzop.c
+++ b/libarchive/test/test_write_filter_lzop.c
@@ -239,14 +239,14 @@ DEFINE_TEST(test_write_filter_lzop)
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, (use_prog)?ARCHIVE_WARN:ARCHIVE_OK,
            archive_write_add_filter_lzop(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, (use_prog)?ARCHIVE_WARN:ARCHIVE_OK,
            archive_write_add_filter_lzop(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
@@ -255,7 +255,7 @@ DEFINE_TEST(test_write_filter_lzop)
            archive_write_add_filter_lzop(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used2));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /*

diff --git a/libarchive/test/test_write_filter_uuencode.c b/libarchive/test/test_write_filter_uuencode.c
index fbd0520880fe02e3ea7a1a3f9ac57353515503d4..3ab0ffa573a1902a73aa636d94aa68028895c51e 100644 (file)
--- a/libarchive/test/test_write_filter_uuencode.c
+++ b/libarchive/test/test_write_filter_uuencode.c
@@ -147,13 +147,13 @@ DEFINE_TEST(test_write_filter_uuencode)
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_uuencode(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_uuencode(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
@@ -161,7 +161,7 @@ DEFINE_TEST(test_write_filter_uuencode)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_uuencode(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used2));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /*

diff --git a/libarchive/test/test_write_filter_xz.c b/libarchive/test/test_write_filter_xz.c
index 6baa0473b8e2f439ca1bcbfb4dcd230ae6499274..87c8b7fb2c8620cfe59b954d7d2d361d318317b3 100644 (file)
--- a/libarchive/test/test_write_filter_xz.c
+++ b/libarchive/test/test_write_filter_xz.c
@@ -240,20 +240,20 @@ DEFINE_TEST(test_write_filter_xz)
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_xz(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_xz(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_xz(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /*

diff --git a/libarchive/test/test_write_filter_zstd.c b/libarchive/test/test_write_filter_zstd.c
index 41451ca86251e95b76c06b71bc8d4972cc4e414b..360d89d02b305af97123f31eb4323e16f5b9ddc0 100644 (file)
--- a/libarchive/test/test_write_filter_zstd.c
+++ b/libarchive/test/test_write_filter_zstd.c
@@ -340,20 +340,20 @@ DEFINE_TEST(test_write_filter_zstd)
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_zstd(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_zstd(a));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_zstd(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /*

diff --git a/libarchive/test/test_write_format_7zip.c b/libarchive/test/test_write_format_7zip.c
index 4b69cff40474360d742e702e6c2f53300463aa39..ef5b40906d163f641e6a405aa4341deb9c096327 100644 (file)
--- a/libarchive/test/test_write_format_7zip.c
+++ b/libarchive/test/test_write_format_7zip.c
@@ -181,7 +181,7 @@ test_basic(const char *compression_type)
        assertEqualIntA(a, 0, archive_write_data(a, "12345678", 9));
 
        /* Close out the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /* Verify the initial header. */
@@ -310,7 +310,7 @@ test_basic(const char *compression_type)
        assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
        free(buff);
@@ -425,7 +425,7 @@ test_basic2(const char *compression_type)
        assertEqualIntA(a, 0, archive_write_data(a, "12345678", 9));
 
        /* Close out the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /* Verify the initial header. */
@@ -517,7 +517,7 @@ test_basic2(const char *compression_type)
        assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
        free(buff);

diff --git a/libarchive/test/test_write_format_7zip_empty.c b/libarchive/test/test_write_format_7zip_empty.c
index 817009f4355b0a8739e05083309966b5ffa0653b..13fa9857fa2bfa4e93933e10daaf2b698eb925ca 100644 (file)
--- a/libarchive/test/test_write_format_7zip_empty.c
+++ b/libarchive/test/test_write_format_7zip_empty.c
@@ -46,7 +46,7 @@ DEFINE_TEST(test_write_format_7zip_empty_archive)
            archive_write_open_memory(a, buff, buffsize, &used));
 
        /* Close out the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /* Verify the archive file size. */
@@ -105,7 +105,7 @@ test_only_empty_file(void)
        archive_entry_free(ae);
 
        /* Close out the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /* Verify the archive file size. */
@@ -148,7 +148,7 @@ test_only_empty_file(void)
        assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
        free(buff);
@@ -224,7 +224,7 @@ test_only_empty_files(void)
        archive_entry_free(ae);
 
        /* Close out the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /* Verify the initial header. */
@@ -284,7 +284,7 @@ test_only_empty_files(void)
        assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
        free(buff);

diff --git a/libarchive/test/test_write_format_7zip_large.c b/libarchive/test/test_write_format_7zip_large.c
index 307b1f13cdd0c94993b9ceba8240210e8b6fd345..9bd92f30d8c14cf451dc0ac0aafdbb9eaf670fb6 100644 (file)
--- a/libarchive/test/test_write_format_7zip_large.c
+++ b/libarchive/test/test_write_format_7zip_large.c
@@ -126,7 +126,7 @@ test_large(const char *compression_type)
        assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 
        free(buff);

diff --git a/libarchive/test/test_write_format_zip.c b/libarchive/test/test_write_format_zip.c
index 583c78c3ace43242da796dc811d9c7b5ee8caf98..569b54da5e2261a9360085d706e56197d4421b81 100644 (file)
--- a/libarchive/test/test_write_format_zip.c
+++ b/libarchive/test/test_write_format_zip.c
@@ -262,7 +262,7 @@ write_contents(struct archive *a)
 
 
        /* Close out the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 }
 
@@ -550,7 +550,7 @@ verify_contents(struct archive *a, int seeking, int content)
 
        /* Verify the end of the archive. */
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 

diff --git a/libarchive/test/test_write_format_zip_empty_pathname.c b/libarchive/test/test_write_format_zip_empty_pathname.c
index e607aafa36e17b07f743df866ef481d0952260ee..423616f4e9abf5a945647c0074346a5f4779bfa8 100644 (file)
--- a/libarchive/test/test_write_format_zip_empty_pathname.c
+++ b/libarchive/test/test_write_format_zip_empty_pathname.c
@@ -54,7 +54,7 @@ DEFINE_TEST(test_write_format_zip_empty_pathname)
        assertEqualInt(ARCHIVE_FAILED, archive_write_header(a, ae));
        archive_entry_free(ae);
 
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        /* Directory entry with empty pathname */
@@ -70,6 +70,6 @@ DEFINE_TEST(test_write_format_zip_empty_pathname)
        assertEqualInt(ARCHIVE_FAILED, archive_write_header(a, ae));
        archive_entry_free(ae);
 
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 }

diff --git a/libarchive/test/test_write_format_zip_long_pathname.c b/libarchive/test/test_write_format_zip_long_pathname.c
index 5b3a07c7688206d3e4c30aa8c8c1c2dd2060c8df..579505decd3e44e3c5b576ddde34e63eb46144ad 100644 (file)
--- a/libarchive/test/test_write_format_zip_long_pathname.c
+++ b/libarchive/test/test_write_format_zip_long_pathname.c
@@ -62,7 +62,7 @@ DEFINE_TEST(test_write_format_zip_long_pathname)
        assertEqualInt(ARCHIVE_OK, archive_write_header(a, ae));
        archive_entry_free(ae);
 
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
        free(pathname);
 
@@ -84,7 +84,7 @@ DEFINE_TEST(test_write_format_zip_long_pathname)
        assertEqualInt(ARCHIVE_FAILED, archive_write_header(a, ae));
        archive_entry_free(ae);
 
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
        free(pathname);
 
@@ -106,7 +106,7 @@ DEFINE_TEST(test_write_format_zip_long_pathname)
        assertEqualInt(ARCHIVE_FAILED, archive_write_header(a, ae));
        archive_entry_free(ae);
 
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
        free(pathname);
 

diff --git a/libarchive/test/test_write_read_format_zip.c b/libarchive/test/test_write_read_format_zip.c
index 828b092c7b3f17b51ea1a8f6b09f2ab825d34c6f..1be282f6735494dead5e82c3978d2ea4cbeea90c 100644 (file)
--- a/libarchive/test/test_write_read_format_zip.c
+++ b/libarchive/test/test_write_read_format_zip.c
@@ -259,7 +259,7 @@ write_contents(struct archive *a)
 
 
        /* Close out the archive. */
-       assertEqualInt(ARCHIVE_OK, archive_write_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 }
 
@@ -568,7 +568,7 @@ verify_contents(struct archive *a, int seeking, int improved_streaming)
 
        /* Verify the end of the archive. */
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
-       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }