From: Michihiro NAKAJIMA Date: Mon, 8 Oct 2012 22:49:06 +0000 (+0900) Subject: Replace deprecated archive_read_finish by archive_read_free X-Git-Tag: v3.1.0~40^2~67 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26d7ae4ea9e19355ab8cf731e7cef3038eee081e;p=thirdparty%2Flibarchive.git 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 43265b539..66dbe93ec 100644 --- 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 d69054b4f..16cc805fe 100644 --- 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 d30735e4c..3aba31791 100644 --- 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 456b6d688..f82539117 100644 --- 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 7ff3c2679..31d575fc7 100644 --- 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 e1aac574e..2d7acf3a0 100644 --- 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 2ad5b0bda..0b816b7cd 100644 --- 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 297d8fe8b..a8c68d7dd 100644 --- 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 18897fbda..b83c08c88 100644 --- 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 4a0d535e6..ab8e67773 100644 --- 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 ee53ca4c3..d964df44d 100644 --- 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 d64d1e6ce..27782342f 100644 --- 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 a12177df8..db7e50e7f 100644 --- 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 06a3a2c1f..845486cf9 100644 --- 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);