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 a431058c671792f7acd43265da5dc8d4b6ab1fac..b736400013998b17dd32c482447d5164235801ae 100644 (file)
--- 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 1a3ddc9a5e681249c3e7e93d83d57a206587dc3e..ab911c8b4d7d030a359580be64f350fefed9e89d 100644 (file)
--- 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 eb715d61efe2ce0f020db2a9e07d71e32e3fc06c..6a96b0d4cd459d7b737dba72760450948dc548bd 100644 (file)
--- 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;