summaryrefslogtreecommitdiff
path: root/libarchive/archive_virtual.c
diff options
context:
space:
mode:
authorTim Kientzle <kientzle@gmail.com>2010-02-08 02:18:22 -0500
committerTim Kientzle <kientzle@gmail.com>2010-02-08 02:18:22 -0500
commit9890b31ffd24646469461978c2ea2cbce07f9d51 (patch)
treea42d5e6150fcb2f696cefd181b20e714418490ce /libarchive/archive_virtual.c
parented4245cb9927b24413b1b96016e6e7635b31ac13 (diff)
downloadlibarchive-9890b31ffd24646469461978c2ea2cbce07f9d51.tar.gz
Rename archive_read_finish to archive_read_free and
archive_write_finish to archive_write_free. Update all clients, tests, and documentation to use the new names exclusively. (Though I've not yet run a global search-and-replace against the Wiki. I'll do that shortly.) I've preserved the old names as aliases, scheduled to be removed with libarchive 4.x, so there is no immediate impact to existing code from this change. SVN-Revision: 1891
Diffstat (limited to 'libarchive/archive_virtual.c')
-rw-r--r--libarchive/archive_virtual.c22
1 files changed, 20 insertions, 2 deletions
diff --git a/libarchive/archive_virtual.c b/libarchive/archive_virtual.c
index 0bd2d5bc..83688627 100644
--- a/libarchive/archive_virtual.c
+++ b/libarchive/archive_virtual.c
@@ -43,16 +43,34 @@ archive_read_close(struct archive *a)
}
int
+archive_write_free(struct archive *a)
+{
+ return ((a->vtable->archive_free)(a));
+}
+
+#if ARCHIVE_VERSION_NUMBER < 4000000
+/* For backwards compatibility; will be removed with libarchive 4.0. */
+int
archive_write_finish(struct archive *a)
{
- return ((a->vtable->archive_finish)(a));
+ return ((a->vtable->archive_free)(a));
+}
+#endif
+
+int
+archive_read_free(struct archive *a)
+{
+ return ((a->vtable->archive_free)(a));
}
+#if ARCHIVE_VERSION_NUMBER < 4000000
+/* For backwards compatibility; will be removed with libarchive 4.0. */
int
archive_read_finish(struct archive *a)
{
- return ((a->vtable->archive_finish)(a));
+ return ((a->vtable->archive_free)(a));
}
+#endif
int
archive_write_header(struct archive *a, struct archive_entry *entry)