Stop using deprecated functions.

s/archive_read_open_file/archive_read_open_filename/
s/archive_write_open_file/archive_write_open_filename/

diff --git a/cpio/cpio.c b/cpio/cpio.c
index e5b351495ff17805882329772b04104576336ecb..ca722579aeffae698308d2aa47359abd375f7456 100644 (file)
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -557,7 +557,7 @@ mode_out(struct cpio *cpio)
        /*
         * The main loop:  Copy each file into the output archive.
         */
-       r = archive_write_open_file(cpio->archive, cpio->filename);
+       r = archive_write_open_filename(cpio->archive, cpio->filename);
        if (r != ARCHIVE_OK)
                lafe_errc(1, 0, "%s", archive_error_string(cpio->archive));
        lr = lafe_line_reader("-", cpio->option_null);
@@ -917,7 +917,8 @@ mode_in(struct cpio *cpio)
        archive_read_support_filter_all(a);
        archive_read_support_format_all(a);
 
-       if (archive_read_open_file(a, cpio->filename, cpio->bytes_per_block))
+       if (archive_read_open_filename(a, cpio->filename,
+                                       cpio->bytes_per_block))
                lafe_errc(1, archive_errno(a),
                    "%s", archive_error_string(a));
        for (;;) {
@@ -1019,7 +1020,8 @@ mode_list(struct cpio *cpio)
        archive_read_support_filter_all(a);
        archive_read_support_format_all(a);
 
-       if (archive_read_open_file(a, cpio->filename, cpio->bytes_per_block))
+       if (archive_read_open_filename(a, cpio->filename,
+                                       cpio->bytes_per_block))
                lafe_errc(1, archive_errno(a),
                    "%s", archive_error_string(a));
        for (;;) {

diff --git a/libarchive/test/test_read_format_ar.c b/libarchive/test/test_read_format_ar.c
index a7ec62d4928f5dc9f5272cc78b8167f9a7c61f8a..e70d1ae552bf181c4b53e14e12000dac52451fe6 100644 (file)
--- a/libarchive/test/test_read_format_ar.c
+++ b/libarchive/test/test_read_format_ar.c
@@ -40,7 +40,7 @@ DEFINE_TEST(test_read_format_ar)
        assert((a = archive_read_new()) != NULL);
        assertA(0 == archive_read_support_filter_all(a));
        assertA(0 == archive_read_support_format_all(a));
-       assertA(0 == archive_read_open_file(a, reffile, 7));
+       assertA(0 == archive_read_open_filename(a, reffile, 7));
 
        /* Filename table.  */
        assertA(0 == archive_read_next_header(a, &ae));

diff --git a/libarchive/test/test_read_format_mtree.c b/libarchive/test/test_read_format_mtree.c
index 2c5060a8a5f08c3c4a375f3ebef86b5a69a37ba5..efedc415eb6dc8b8645adae69be60f1b2eb8ee31 100644 (file)
--- a/libarchive/test/test_read_format_mtree.c
+++ b/libarchive/test/test_read_format_mtree.c
@@ -57,7 +57,8 @@ test_read_format_mtree1(void)
            archive_read_support_filter_all(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_support_format_all(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_read_open_file(a, reffile, 11));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_read_open_filename(a, reffile, 11));
 
        /*
         * Read "file", whose data is available on disk.
@@ -379,7 +380,8 @@ DEFINE_TEST(test_read_format_mtree_nomagic_v1_form)
            archive_read_support_filter_all(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_support_format_all(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_read_open_file(a, reffile, 11));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_read_open_filename(a, reffile, 11));
 
        /*
         * Read "file", whose data is available on disk.
@@ -457,7 +459,8 @@ DEFINE_TEST(test_read_format_mtree_nomagic_v2_form)
            archive_read_support_filter_all(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_support_format_all(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_read_open_file(a, reffile, 11));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_read_open_filename(a, reffile, 11));
 
        /*
         * Read "file", whose data is available on disk.
@@ -521,7 +524,8 @@ DEFINE_TEST(test_read_format_mtree_nomagic_v2_netbsd_form)
            archive_read_support_filter_all(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_support_format_all(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_read_open_file(a, reffile, 11));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_read_open_filename(a, reffile, 11));
 
        /*
         * Read "file", whose data is available on disk.

diff --git a/libarchive/test/test_read_format_rar.c b/libarchive/test/test_read_format_rar.c
index c3daa09be41d0c4c0954bdf15f895a06dac60fb8..4317a1adcf25d48703833ec8e23618048f50538a 100644 (file)
--- a/libarchive/test/test_read_format_rar.c
+++ b/libarchive/test/test_read_format_rar.c
@@ -41,7 +41,7 @@ DEFINE_TEST(test_read_format_rar_basic)
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_support_filter_all(a));
   assertA(0 == archive_read_support_format_all(a));
-  assertA(0 == archive_read_open_file(a, reffile, 10240));
+  assertA(0 == archive_read_open_filename(a, reffile, 10240));
 
   /* First header. */
   assertA(0 == archive_read_next_header(a, &ae));
@@ -114,7 +114,7 @@ DEFINE_TEST(test_read_format_rar_subblock)
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_support_filter_all(a));
   assertA(0 == archive_read_support_format_all(a));
-  assertA(0 == archive_read_open_file(a, reffile, 10240));
+  assertA(0 == archive_read_open_filename(a, reffile, 10240));
 
   /* First header. */
   assertA(0 == archive_read_next_header(a, &ae));
@@ -147,7 +147,7 @@ DEFINE_TEST(test_read_format_rar_noeof)
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_support_filter_all(a));
   assertA(0 == archive_read_support_format_all(a));
-  assertA(0 == archive_read_open_file(a, reffile, 10240));
+  assertA(0 == archive_read_open_filename(a, reffile, 10240));
 
   /* First header. */
   assertA(0 == archive_read_next_header(a, &ae));
@@ -184,7 +184,7 @@ DEFINE_TEST(test_read_format_rar_unicode_UTF8)
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_support_filter_all(a));
   assertA(0 == archive_read_support_format_all(a));
-  assertA(0 == archive_read_open_file(a, reffile, 10240));
+  assertA(0 == archive_read_open_filename(a, reffile, 10240));
 
   /* First header. */
   assertA(0 == archive_read_next_header(a, &ae));
@@ -317,7 +317,7 @@ DEFINE_TEST(test_read_format_rar_unicode_CP932)
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
        return;
   }
-  assertA(0 == archive_read_open_file(a, reffile, 10240));
+  assertA(0 == archive_read_open_filename(a, reffile, 10240));
 
   /* First header. */
   assertA(0 == archive_read_next_header(a, &ae));
@@ -406,7 +406,7 @@ DEFINE_TEST(test_read_format_rar_compress_normal)
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_support_filter_all(a));
   assertA(0 == archive_read_support_format_all(a));
-  assertA(0 == archive_read_open_file(a, reffile, 10240));
+  assertA(0 == archive_read_open_filename(a, reffile, 10240));
 
   /* First header. */
   assertA(0 == archive_read_next_header(a, &ae));
@@ -497,7 +497,7 @@ DEFINE_TEST(test_read_format_rar_multi_lzss_blocks)
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_support_filter_all(a));
   assertA(0 == archive_read_support_format_all(a));
-  assertA(0 == archive_read_open_file(a, reffile, 10240));
+  assertA(0 == archive_read_open_filename(a, reffile, 10240));
 
   /* First header. */
   assertA(0 == archive_read_next_header(a, &ae));
@@ -541,7 +541,7 @@ DEFINE_TEST(test_read_format_rar_compress_best)
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_support_filter_all(a));
   assertA(0 == archive_read_support_format_all(a));
-  assertA(0 == archive_read_open_file(a, reffile, 10240));
+  assertA(0 == archive_read_open_filename(a, reffile, 10240));
 
   /* First header. */
   assertA(0 == archive_read_next_header(a, &ae));
@@ -632,7 +632,7 @@ DEFINE_TEST(test_read_format_rar_ppmd_lzss_conversion)
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_support_filter_all(a));
   assertA(0 == archive_read_support_format_all(a));
-  assertA(0 == archive_read_open_file(a, reffile, 10240));
+  assertA(0 == archive_read_open_filename(a, reffile, 10240));
 
   /* First header. */
   assertA(0 == archive_read_next_header(a, &ae));
@@ -682,7 +682,7 @@ DEFINE_TEST(test_read_format_rar_binary)
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_support_filter_all(a));
   assertA(0 == archive_read_support_format_all(a));
-  assertA(0 == archive_read_open_file(a, reffile, 10240));
+  assertA(0 == archive_read_open_filename(a, reffile, 10240));
 
   /* First header. */
   assertA(0 == archive_read_next_header(a, &ae));
@@ -728,7 +728,7 @@ DEFINE_TEST(test_read_format_rar_windows)
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_support_filter_all(a));
   assertA(0 == archive_read_support_format_all(a));
-  assertA(0 == archive_read_open_file(a, reffile, 10240));
+  assertA(0 == archive_read_open_filename(a, reffile, 10240));
 
   /* First header. */
   assertA(0 == archive_read_next_header(a, &ae));
@@ -1018,7 +1018,7 @@ DEFINE_TEST(test_read_format_rar_sfx)
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_support_filter_all(a));
   assertA(0 == archive_read_support_format_all(a));
-  assertA(0 == archive_read_open_file(a, reffile, 10240));
+  assertA(0 == archive_read_open_filename(a, reffile, 10240));
 
   /* First header. */
   assertA(0 == archive_read_next_header(a, &ae));

diff --git a/tar/read.c b/tar/read.c
index ae58d027ff74df5ef1241dd262fea2e7b64d2943..706077200d6ac2c09c9d4effecc8c20e434b69d5 100644 (file)
--- a/tar/read.c
+++ b/tar/read.c
@@ -180,7 +180,8 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer)
        archive_read_support_format_all(a);
        if (ARCHIVE_OK != archive_read_set_options(a, bsdtar->option_options))
                lafe_errc(1, 0, "%s", archive_error_string(a));
-       if (archive_read_open_file(a, bsdtar->filename, bsdtar->bytes_per_block))
+       if (archive_read_open_filename(a, bsdtar->filename,
+                                       bsdtar->bytes_per_block))
                lafe_errc(1, 0, "Error opening archive: %s",
                    archive_error_string(a));
 

diff --git a/tar/write.c b/tar/write.c
index a534d74a8e946d93bd4d30af983602db40f6ce79..66c7e17ef88c1b64581a3b04111fb7efb1cdfaab 100644 (file)
--- a/tar/write.c
+++ b/tar/write.c
@@ -210,7 +210,7 @@ tar_mode_c(struct bsdtar *bsdtar)
 
        if (ARCHIVE_OK != archive_write_set_options(a, bsdtar->option_options))
                lafe_errc(1, 0, "%s", archive_error_string(a));
-       if (ARCHIVE_OK != archive_write_open_file(a, bsdtar->filename))
+       if (ARCHIVE_OK != archive_write_open_filename(a, bsdtar->filename))
                lafe_errc(1, 0, "%s", archive_error_string(a));
        write_archive(a, bsdtar);
 }
@@ -621,7 +621,8 @@ append_archive_filename(struct bsdtar *bsdtar, struct archive *a,
        ina = archive_read_new();
        archive_read_support_format_all(ina);
        archive_read_support_filter_all(ina);
-       if (archive_read_open_file(ina, filename, bsdtar->bytes_per_block)) {
+       if (archive_read_open_filename(ina, filename,
+                                       bsdtar->bytes_per_block)) {
                lafe_warnc(0, "%s", archive_error_string(ina));
                bsdtar->return_value = 1;
                return (0);