From: Tim Kientzle <kientzle@gmail.com>
Date: Wed, 7 Jan 2009 05:03:15 +0000 (-0500)
Subject: close and finish are really very generic operations;
X-Git-Tag: v2.7.0~460
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63bad2ed1211ccc469d6015ca9ebe62f8483df92;p=thirdparty%2Flibarchive.git

close and finish are really very generic operations;
rename them to reflect this.

SVN-Revision: 390
---

diff --git a/libarchive/archive_virtual.c b/libarchive/archive_virtual.c
index a431058c6..b73640001 100644
--- a/libarchive/archive_virtual.c
+++ b/libarchive/archive_virtual.c
@@ -33,21 +33,21 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_virtual.c,v 1.1 2007/03/03 07:37:
 int
 archive_write_close(struct archive *a)
 {
-	return ((a->vtable->archive_write_close)(a));
+	return ((a->vtable->archive_close)(a));
 }
 
 #if ARCHIVE_API_VERSION > 1
 int
 archive_write_finish(struct archive *a)
 {
-	return ((a->vtable->archive_write_finish)(a));
+	return ((a->vtable->archive_finish)(a));
 }
 #else
 /* Temporarily allow library to compile with either 1.x or 2.0 API. */
 void
 archive_write_finish(struct archive *a)
 {
-	(void)(a->vtable->archive_write_finish)(a);
+	(void)(a->vtable->archive_finish)(a);
 }
 #endif
 
diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
index 1a3ddc9a5..ab911c8b4 100644
--- a/libarchive/archive_write.c
+++ b/libarchive/archive_write.c
@@ -72,8 +72,8 @@ archive_write_vtable(void)
 	static int inited = 0;
 
 	if (!inited) {
-		av.archive_write_close = _archive_write_close;
-		av.archive_write_finish = _archive_write_finish;
+		av.archive_close = _archive_write_close;
+		av.archive_finish = _archive_write_finish;
 		av.archive_write_header = _archive_write_header;
 		av.archive_write_finish_entry = _archive_write_finish_entry;
 		av.archive_write_data = _archive_write_data;
diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c
index eb715d61e..6a96b0d4c 100644
--- a/libarchive/archive_write_disk.c
+++ b/libarchive/archive_write_disk.c
@@ -278,8 +278,8 @@ archive_write_disk_vtable(void)
 	static int inited = 0;
 
 	if (!inited) {
-		av.archive_write_close = _archive_write_close;
-		av.archive_write_finish = _archive_write_finish;
+		av.archive_close = _archive_write_close;
+		av.archive_finish = _archive_write_finish;
 		av.archive_write_header = _archive_write_header;
 		av.archive_write_finish_entry = _archive_write_finish_entry;
 		av.archive_write_data = _archive_write_data;