Replace deprecated archive_read_finish by archive_read_free

and deprecated archive_write_finish by archive_write_free.

diff --git a/libarchive/test/test_archive_clear_error.c b/libarchive/test/test_archive_clear_error.c
index 43265b5391b4bfd0b3bdbf0f89d68c52c6d7b471..66dbe93ec9e851cdb4dbb44ea16a68b2395d67e7 100644 (file)
--- a/libarchive/test/test_archive_clear_error.c
+++ b/libarchive/test/test_archive_clear_error.c
@@ -38,5 +38,5 @@ DEFINE_TEST(test_archive_clear_error)
        assertEqualInt(0, archive_errno(a));
        assertEqualString(NULL, archive_error_string(a));
 
-       archive_read_finish(a);
+       archive_read_free(a);
 }

diff --git a/libarchive/test/test_archive_read_close_twice.c b/libarchive/test/test_archive_read_close_twice.c
index d69054b4fe5a249e21e5ab5ddbc4b130079c8526..16cc805fe027baeedff5fb5c1ffdcb1925057597 100644 (file)
--- a/libarchive/test/test_archive_read_close_twice.c
+++ b/libarchive/test/test_archive_read_close_twice.c
@@ -39,5 +39,5 @@ DEFINE_TEST(test_archive_read_close_twice)
        assertEqualInt(0, archive_errno(a));
        assertEqualString(NULL, archive_error_string(a));
 
-       archive_read_finish(a);
+       archive_read_free(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 d30735e4c48b62589186e93cde66499d610ad0bd..3aba31791357861522b221867a06d464e026309a 100644 (file)
--- a/libarchive/test/test_archive_read_close_twice_open_fd.c
+++ b/libarchive/test/test_archive_read_close_twice_open_fd.c
@@ -43,5 +43,5 @@ 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_finish(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_free(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 456b6d688e55d012cf4a54302baf583c8a515dcd..f82539117bcbe640fa9c7cdaffbe66cc7280cb0b 100644 (file)
--- a/libarchive/test/test_archive_read_close_twice_open_filename.c
+++ b/libarchive/test/test_archive_read_close_twice_open_filename.c
@@ -43,5 +43,5 @@ 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_finish(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }

diff --git a/libarchive/test/test_archive_read_set_filter_option.c b/libarchive/test/test_archive_read_set_filter_option.c
index 7ff3c267947d13fc668b09698a0acc3840045431..31d575fc737e962c52c8ffd0fe99e2fc59ccb02b 100644 (file)
--- a/libarchive/test/test_archive_read_set_filter_option.c
+++ b/libarchive/test/test_archive_read_set_filter_option.c
@@ -45,7 +45,7 @@ test(int pristine)
        should(a, ARCHIVE_FAILED, "fubar", "snafu", NULL);
        should(a, ARCHIVE_FAILED, "fubar", "snafu", "betcha");
 
-       archive_read_finish(a);
+       archive_read_free(a);
 }
 
 DEFINE_TEST(test_archive_read_set_filter_option)

diff --git a/libarchive/test/test_archive_read_set_format_option.c b/libarchive/test/test_archive_read_set_format_option.c
index e1aac574e158e5250de10769f20de042d95cdbc9..2d7acf3a0aa4d942498ceab40899e52cffb9cecb 100644 (file)
--- a/libarchive/test/test_archive_read_set_format_option.c
+++ b/libarchive/test/test_archive_read_set_format_option.c
@@ -57,7 +57,7 @@ test(int pristine)
        should(a, known_option_rv, NULL, "joliet", NULL);
        should(a, known_option_rv, NULL, "joliet", NULL);
 
-       archive_read_finish(a);
+       archive_read_free(a);
 }
 
 DEFINE_TEST(test_archive_read_set_format_option)

diff --git a/libarchive/test/test_archive_read_set_option.c b/libarchive/test/test_archive_read_set_option.c
index 2ad5b0bda8e240716bba320541760299826c6bb7..0b816b7cd838bc88a6f5652af5b9995dcf12a8b4 100644 (file)
--- a/libarchive/test/test_archive_read_set_option.c
+++ b/libarchive/test/test_archive_read_set_option.c
@@ -59,7 +59,7 @@ test(int pristine)
        should(a, known_option_rv, NULL, "joliet", NULL);
        should(a, known_option_rv, NULL, "joliet", NULL);
 
-       archive_read_finish(a);
+       archive_read_free(a);
 }
 
 DEFINE_TEST(test_archive_read_set_option)

diff --git a/libarchive/test/test_archive_read_set_options.c b/libarchive/test/test_archive_read_set_options.c
index 297d8fe8bf8f817c44ce441e9f976d7c1063dd64..a8c68d7dd4cf0c8e2984f7207312501799ac4797 100644 (file)
--- a/libarchive/test/test_archive_read_set_options.c
+++ b/libarchive/test/test_archive_read_set_options.c
@@ -116,7 +116,7 @@ test(int pristine)
                    archive_error_string(a));
        }
 
-       archive_read_finish(a);
+       archive_read_free(a);
 }
 
 DEFINE_TEST(test_archive_read_set_options)

diff --git a/libarchive/test/test_archive_set_error.c b/libarchive/test/test_archive_set_error.c
index 18897fbda8d250ea00eeecd07e6f6e529d8c5216..b83c08c884e9b8018ab4c452b405fe8cb159f1d5 100644 (file)
--- a/libarchive/test/test_archive_set_error.c
+++ b/libarchive/test/test_archive_set_error.c
@@ -47,5 +47,5 @@ DEFINE_TEST(test_archive_set_error)
        test(a, -1, "tuvw");
        test(a, 34, "XYZ");
 
-       archive_read_finish(a);
+       archive_read_free(a);
 }

diff --git a/libarchive/test/test_archive_write_set_filter_option.c b/libarchive/test/test_archive_write_set_filter_option.c
index 4a0d535e61d654ece4a184ef85e52c3fd8079d43..ab8e67773b50a3d642b70222c20228db7012bd0c 100644 (file)
--- a/libarchive/test/test_archive_write_set_filter_option.c
+++ b/libarchive/test/test_archive_write_set_filter_option.c
@@ -45,7 +45,7 @@ test(int pristine)
        should(a, ARCHIVE_FAILED, "fubar", "snafu", NULL);
        should(a, ARCHIVE_FAILED, "fubar", "snafu", "betcha");
 
-       archive_write_finish(a);
+       archive_write_free(a);
 }
 
 DEFINE_TEST(test_archive_write_set_filter_option)

diff --git a/libarchive/test/test_archive_write_set_format_option.c b/libarchive/test/test_archive_write_set_format_option.c
index ee53ca4c39d2b693470b161cf5f579b5183caf35..d964df44d7faa9fce93bb1203980eaf2b4c903d5 100644 (file)
--- a/libarchive/test/test_archive_write_set_format_option.c
+++ b/libarchive/test/test_archive_write_set_format_option.c
@@ -57,7 +57,7 @@ test(int pristine)
        should(a, known_option_rv, NULL, "joliet", NULL);
        should(a, known_option_rv, NULL, "joliet", NULL);
 
-       archive_write_finish(a);
+       archive_write_free(a);
 }
 
 DEFINE_TEST(test_archive_write_set_format_option)

diff --git a/libarchive/test/test_archive_write_set_option.c b/libarchive/test/test_archive_write_set_option.c
index d64d1e6ce08d66b3e4e878dd6b893fe73cb4f1e7..27782342f330d6b7b804117a68308123aae355a4 100644 (file)
--- a/libarchive/test/test_archive_write_set_option.c
+++ b/libarchive/test/test_archive_write_set_option.c
@@ -59,7 +59,7 @@ test(int pristine)
        should(a, known_option_rv, NULL, "joliet", NULL);
        should(a, known_option_rv, NULL, "joliet", NULL);
 
-       archive_write_finish(a);
+       archive_write_free(a);
 }
 
 DEFINE_TEST(test_archive_write_set_option)

diff --git a/libarchive/test/test_archive_write_set_options.c b/libarchive/test/test_archive_write_set_options.c
index a12177df8b7f8b4228685ad9401e7c0607bef40e..db7e50e7f0f80df8e52072a32682a2309cc1ba83 100644 (file)
--- a/libarchive/test/test_archive_write_set_options.c
+++ b/libarchive/test/test_archive_write_set_options.c
@@ -116,7 +116,7 @@ test(int pristine)
                    archive_error_string(a));
        }
 
-       archive_write_finish(a);
+       archive_write_free(a);
 }
 
 DEFINE_TEST(test_archive_write_set_options)

diff --git a/libarchive/test/test_open_failure.c b/libarchive/test/test_open_failure.c
index 06a3a2c1fa357b2cdd4394754e037409308bc557..845486cf9216ae990b083606061c2c25a8682909 100644 (file)
--- a/libarchive/test/test_open_failure.c
+++ b/libarchive/test/test_open_failure.c
@@ -97,7 +97,7 @@ DEFINE_TEST(test_open_failure)
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.read_called);
        assertEqualInt(1, private.close_called);
-       assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_free(a));
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.read_called);
        assertEqualInt(1, private.close_called);
@@ -112,7 +112,7 @@ DEFINE_TEST(test_open_failure)
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.read_called);
        assertEqualInt(1, private.close_called);
-       assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_free(a));
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.read_called);
        assertEqualInt(1, private.close_called);
@@ -127,7 +127,7 @@ DEFINE_TEST(test_open_failure)
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.read_called);
        assertEqualInt(1, private.close_called);
-       assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_free(a));
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.read_called);
        assertEqualInt(1, private.close_called);
@@ -146,7 +146,7 @@ DEFINE_TEST(test_open_failure)
        assertEqualInt(1, private.open_called);
        assertEqualInt(1, private.read_called);
        assertEqualInt(1, private.close_called);
-       assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_free(a));
        assertEqualInt(1, private.open_called);
        assertEqualInt(1, private.read_called);
        assertEqualInt(1, private.close_called);
@@ -161,7 +161,7 @@ DEFINE_TEST(test_open_failure)
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.write_called);
        assertEqualInt(1, private.close_called);
-       assertEqualInt(ARCHIVE_OK, archive_write_finish(a));
+       assertEqualInt(ARCHIVE_OK, archive_write_free(a));
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.write_called);
        assertEqualInt(1, private.close_called);
@@ -178,7 +178,7 @@ DEFINE_TEST(test_open_failure)
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.write_called);
        assertEqualInt(1, private.close_called);
-       assertEqualInt(ARCHIVE_OK, archive_write_finish(a));
+       assertEqualInt(ARCHIVE_OK, archive_write_free(a));
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.write_called);
        assertEqualInt(1, private.close_called);
@@ -194,7 +194,7 @@ DEFINE_TEST(test_open_failure)
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.write_called);
        assertEqualInt(1, private.close_called);
-       assertEqualInt(ARCHIVE_OK, archive_write_finish(a));
+       assertEqualInt(ARCHIVE_OK, archive_write_free(a));
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.write_called);
        assertEqualInt(1, private.close_called);
@@ -210,7 +210,7 @@ DEFINE_TEST(test_open_failure)
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.write_called);
        assertEqualInt(1, private.close_called);
-       assertEqualInt(ARCHIVE_OK, archive_write_finish(a));
+       assertEqualInt(ARCHIVE_OK, archive_write_free(a));
        assertEqualInt(1, private.open_called);
        assertEqualInt(0, private.write_called);
        assertEqualInt(1, private.close_called);