Stop using deprecated functions. Much remains to be replaced.

s/archive_position_compressed(a)/archive_filter_bytes(a, -1)/

diff --git a/libarchive/test/test_write_format_ar.c b/libarchive/test/test_write_format_ar.c
index 42bb670853e4c3b2a6fcf43f30cbf71f956c0058..5db75871c75cd9f545f4bcce1b313d30e10f6d45 100644 (file)
--- a/libarchive/test/test_write_format_ar.c
+++ b/libarchive/test/test_write_format_ar.c
@@ -98,7 +98,7 @@ DEFINE_TEST(test_write_format_ar)
        archive_entry_free(ae);
 
        assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
-       assertEqualInt(archive_position_compressed(a),
+       assertEqualInt(archive_filter_bytes(a, -1),
            archive_filter_bytes(a, 0));
        assertEqualInt(used, archive_filter_bytes(a, 0));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));

diff --git a/libarchive/test/test_write_open_memory.c b/libarchive/test/test_write_open_memory.c
index 94ade091eb0cf393236ea215f21cfcc74ffe1a80..3dbed113e799b10715a527382e9ae67a7349d87e 100644 (file)
--- a/libarchive/test/test_write_open_memory.c
+++ b/libarchive/test/test_write_open_memory.c
@@ -72,8 +72,8 @@ DEFINE_TEST(test_write_open_memory)
                            archive_write_close(a));
                else {
                        assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
-                       assertEqualInt(used, archive_position_compressed(a));
-                       assertEqualInt(archive_position_compressed(a),
+                       assertEqualInt(used, archive_filter_bytes(a, -1));
+                       assertEqualInt(archive_filter_bytes(a, -1),
                            archive_filter_bytes(a, 0));
                }
                assertEqualInt(ARCHIVE_OK, archive_write_free(a));

diff --git a/tar/read.c b/tar/read.c
index 0f353cd8fcce962c03dcc222cfac135f892d8331..ae58d027ff74df5ef1241dd262fea2e7b64d2943 100644 (file)
--- a/tar/read.c
+++ b/tar/read.c
@@ -125,7 +125,7 @@ progress_func(void *cookie)
        if (bsdtar->verbose)
                fprintf(stderr, "\n");
        if (a != NULL) {
-               comp = archive_position_compressed(a);
+               comp = archive_filter_bytes(a, -1);
                uncomp = archive_filter_bytes(a, 0);
                if (comp > uncomp)
                        compression = 0;

diff --git a/tar/write.c b/tar/write.c
index 7f5e03e41a097ea438700b040322d8f5e9b7d074..a534d74a8e946d93bd4d30af983602db40f6ce79 100644 (file)
--- a/tar/write.c
+++ b/tar/write.c
@@ -553,7 +553,7 @@ cleanup:
 
        if (bsdtar->option_totals) {
                fprintf(stderr, "Total bytes written: %s\n",
-                   tar_i64toa(archive_position_compressed(a)));
+                   tar_i64toa(archive_filter_bytes(a, -1)));
        }
 
        archive_write_free(a);
@@ -951,7 +951,7 @@ report_write(struct bsdtar *bsdtar, struct archive *a,
 
        if (bsdtar->verbose)
                fprintf(stderr, "\n");
-       comp = archive_position_compressed(a);
+       comp = archive_filter_bytes(a, -1);
        uncomp = archive_filter_bytes(a, 0);
        fprintf(stderr, "In: %d files, %s bytes;",
            archive_file_count(a), tar_i64toa(uncomp));