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

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 42bb67085..5db75871c 100644
--- 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 94ade091e..3dbed113e 100644
--- 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 0f353cd8f..ae58d027f 100644
--- 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 7f5e03e41..a534d74a8 100644
--- 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));