From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 7 Oct 2012 05:01:15 +0000 (+0900)
Subject: Stop using deprecated functions. Much remains to be replaced.
X-Git-Tag: v3.1.0~40^2~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4187df11b662d387d5e4c31df0f88083b5e54eef;p=thirdparty%2Flibarchive.git

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 75ee8fc2e..e5b351495 100644
--- 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 1c1b2a718..42bb67085 100644
--- 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 e9a01de08..94ade091e 100644
--- 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 b2af08cfe..0f353cd8f 100644
--- 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 1a24bdfcd..7f5e03e41 100644
--- 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)