Stop using deprecated functions. Much remains to be replaced.

s/archive_position_uncompressed(a)/archive_filter_bytes(a, 0)/

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 75ee8fc2ecd0eb7fd27ffd70a8d3b2f1dc158689..e5b351495ff17805882329772b04104576336ecb 100644 (file)
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -586,7 +586,7 @@ mode_out(struct cpio *cpio)
 
        if (!cpio->quiet) {
                int64_t blocks =
-                       (archive_position_uncompressed(cpio->archive) + 511)
+                       (archive_filter_bytes(cpio->archive, 0) + 511)
                        / 512;
                fprintf(stderr, "%lu %s\n", (unsigned long)blocks,
                    blocks == 1 ? "block" : "blocks");
@@ -966,7 +966,7 @@ mode_in(struct cpio *cpio)
        if (r != ARCHIVE_OK)
                lafe_errc(1, 0, "%s", archive_error_string(ext));
        if (!cpio->quiet) {
-               int64_t blocks = (archive_position_uncompressed(a) + 511)
+               int64_t blocks = (archive_filter_bytes(a, 0) + 511)
                              / 512;
                fprintf(stderr, "%lu %s\n", (unsigned long)blocks,
                    blocks == 1 ? "block" : "blocks");
@@ -1041,7 +1041,7 @@ mode_list(struct cpio *cpio)
        if (r != ARCHIVE_OK)
                lafe_errc(1, 0, "%s", archive_error_string(a));
        if (!cpio->quiet) {
-               int64_t blocks = (archive_position_uncompressed(a) + 511)
+               int64_t blocks = (archive_filter_bytes(a, 0) + 511)
                              / 512;
                fprintf(stderr, "%lu %s\n", (unsigned long)blocks,
                    blocks == 1 ? "block" : "blocks");
@@ -1176,7 +1176,7 @@ mode_pass(struct cpio *cpio, const char *destdir)
 
        if (!cpio->quiet) {
                int64_t blocks =
-                       (archive_position_uncompressed(cpio->archive) + 511)
+                       (archive_filter_bytes(cpio->archive, 0) + 511)
                        / 512;
                fprintf(stderr, "%lu %s\n", (unsigned long)blocks,
                    blocks == 1 ? "block" : "blocks");

diff --git a/libarchive/test/test_write_format_ar.c b/libarchive/test/test_write_format_ar.c
index 1c1b2a718b078e751b4306bfd2f1e7c8f9cf0449..42bb670853e4c3b2a6fcf43f30cbf71f956c0058 100644 (file)
--- a/libarchive/test/test_write_format_ar.c
+++ b/libarchive/test/test_write_format_ar.c
@@ -99,8 +99,8 @@ DEFINE_TEST(test_write_format_ar)
 
        assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(archive_position_compressed(a),
-           archive_position_uncompressed(a));
-       assertEqualInt(used, archive_position_uncompressed(a));
+           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 e9a01de08829091a85b5ccbdc2752d587d54fb13..94ade091eb0cf393236ea215f21cfcc74ffe1a80 100644 (file)
--- a/libarchive/test/test_write_open_memory.c
+++ b/libarchive/test/test_write_open_memory.c
@@ -74,7 +74,7 @@ DEFINE_TEST(test_write_open_memory)
                        assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
                        assertEqualInt(used, archive_position_compressed(a));
                        assertEqualInt(archive_position_compressed(a),
-                           archive_position_uncompressed(a));
+                           archive_filter_bytes(a, 0));
                }
                assertEqualInt(ARCHIVE_OK, archive_write_free(a));
                assertEqualInt(buff[i], 0xAE);

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

diff --git a/tar/write.c b/tar/write.c
index 1a24bdfcd754c11365fec5917674fde15c918a12..7f5e03e41a097ea438700b040322d8f5e9b7d074 100644 (file)
--- a/tar/write.c
+++ b/tar/write.c
@@ -952,7 +952,7 @@ report_write(struct bsdtar *bsdtar, struct archive *a,
        if (bsdtar->verbose)
                fprintf(stderr, "\n");
        comp = archive_position_compressed(a);
-       uncomp = archive_position_uncompressed(a);
+       uncomp = archive_filter_bytes(a, 0);
        fprintf(stderr, "In: %d files, %s bytes;",
            archive_file_count(a), tar_i64toa(uncomp));
        if (comp > uncomp)