Rename 'finish' to 'close' and 'destroy' to 'free', to clarify

the new/open/close/free lifecycle terminology.

SVN-Revision: 2004

diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
index 1a6c80c29e34de41a0d0a5cd1af9a13e19513ea9..752768f9d99efedfb8649d1fd0f189047fc66bdb 100644 (file)
--- a/libarchive/archive_write.c
+++ b/libarchive/archive_write.c
@@ -582,10 +582,9 @@ _archive_write_close(struct archive *_a)
                r = ((a->format_finish_entry)(a));
 
        /* Finish off the archive. */
-       /* TODO: Rename format_finish to format_close, have
-        * format closers invoke compression close. */
-       if (a->format_finish != NULL) {
-               r1 = (a->format_finish)(a);
+       /* TODO: have format closers invoke compression close. */
+       if (a->format_close != NULL) {
+               r1 = (a->format_close)(a);
                if (r1 < r)
                        r = r1;
        }
@@ -642,9 +641,8 @@ _archive_write_free(struct archive *_a)
                r = archive_write_close(&a->archive);
 
        /* Release format resources. */
-       /* TODO: Rename format_destroy to format_free */
-       if (a->format_destroy != NULL) {
-               r1 = (a->format_destroy)(a);
+       if (a->format_free != NULL) {
+               r1 = (a->format_free)(a);
                if (r1 < r)
                        r = r1;
        }

diff --git a/libarchive/archive_write_private.h b/libarchive/archive_write_private.h
index ae5adfc0909325753c00818932be5c55490bfd34..f1aad29dd7192282ad4591bd4bde4f5e15c9e911 100644 (file)
--- a/libarchive/archive_write_private.h
+++ b/libarchive/archive_write_private.h
@@ -117,13 +117,13 @@ struct archive_write {
        int     (*format_init)(struct archive_write *);
        int     (*format_options)(struct archive_write *,
                    const char *key, const char *value);
-       int     (*format_finish)(struct archive_write *);
-       int     (*format_destroy)(struct archive_write *);
        int     (*format_finish_entry)(struct archive_write *);
        int     (*format_write_header)(struct archive_write *,
                    struct archive_entry *);
        ssize_t (*format_write_data)(struct archive_write *,
                    const void *buff, size_t);
+       int     (*format_close)(struct archive_write *);
+       int     (*format_free)(struct archive_write *);
 };
 
 /*

diff --git a/libarchive/archive_write_set_format_ar.c b/libarchive/archive_write_set_format_ar.c
index efe2725f27153315f985ffcd39176f45307e5894..715f1d1de9e6611b6b376bc9027b0f76f8ab135f 100644 (file)
--- a/libarchive/archive_write_set_format_ar.c
+++ b/libarchive/archive_write_set_format_ar.c
@@ -75,8 +75,8 @@ static int             archive_write_ar_header(struct archive_write *,
                             struct archive_entry *);
 static ssize_t          archive_write_ar_data(struct archive_write *,
                             const void *buff, size_t s);
-static int              archive_write_ar_destroy(struct archive_write *);
-static int              archive_write_ar_finish(struct archive_write *);
+static int              archive_write_ar_free(struct archive_write *);
+static int              archive_write_ar_close(struct archive_write *);
 static int              archive_write_ar_finish_entry(struct archive_write *);
 static const char      *ar_basename(const char *path);
 static int              format_octal(int64_t v, char *p, int s);
@@ -123,8 +123,8 @@ archive_write_set_format_ar(struct archive_write *a)
        struct ar_w *ar;
 
        /* If someone else was already registered, unregister them. */
-       if (a->format_destroy != NULL)
-               (a->format_destroy)(a);
+       if (a->format_free != NULL)
+               (a->format_free)(a);
 
        ar = (struct ar_w *)malloc(sizeof(*ar));
        if (ar == NULL) {
@@ -137,8 +137,8 @@ archive_write_set_format_ar(struct archive_write *a)
        a->format_name = "ar";
        a->format_write_header = archive_write_ar_header;
        a->format_write_data = archive_write_ar_data;
-       a->format_finish = archive_write_ar_finish;
-       a->format_destroy = archive_write_ar_destroy;
+       a->format_close = archive_write_ar_close;
+       a->format_free = archive_write_ar_free;
        a->format_finish_entry = archive_write_ar_finish_entry;
        return (ARCHIVE_OK);
 }
@@ -394,7 +394,7 @@ archive_write_ar_data(struct archive_write *a, const void *buff, size_t s)
 }
 
 static int
-archive_write_ar_destroy(struct archive_write *a)
+archive_write_ar_free(struct archive_write *a)
 {
        struct ar_w *ar;
 
@@ -414,7 +414,7 @@ archive_write_ar_destroy(struct archive_write *a)
 }
 
 static int
-archive_write_ar_finish(struct archive_write *a)
+archive_write_ar_close(struct archive_write *a)
 {
        struct ar_w *ar;
        int ret;

diff --git a/libarchive/archive_write_set_format_cpio.c b/libarchive/archive_write_set_format_cpio.c
index 28e91e192f81e3772e1b6ee9d3e08ff8efc8b5b4..3295a91b41f9a5e93a59fd6a9b4069024edeb8b5 100644 (file)
--- a/libarchive/archive_write_set_format_cpio.c
+++ b/libarchive/archive_write_set_format_cpio.c
@@ -44,8 +44,8 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_cpio.c 201170 2
 
 static ssize_t archive_write_cpio_data(struct archive_write *,
                    const void *buff, size_t s);
-static int     archive_write_cpio_finish(struct archive_write *);
-static int     archive_write_cpio_destroy(struct archive_write *);
+static int     archive_write_cpio_close(struct archive_write *);
+static int     archive_write_cpio_free(struct archive_write *);
 static int     archive_write_cpio_finish_entry(struct archive_write *);
 static int     archive_write_cpio_header(struct archive_write *,
                    struct archive_entry *);
@@ -89,8 +89,8 @@ archive_write_set_format_cpio(struct archive *_a)
            ARCHIVE_STATE_NEW, "archive_write_set_format_cpio");
 
        /* If someone else was already registered, unregister them. */
-       if (a->format_destroy != NULL)
-               (a->format_destroy)(a);
+       if (a->format_free != NULL)
+               (a->format_free)(a);
 
        cpio = (struct cpio *)malloc(sizeof(*cpio));
        if (cpio == NULL) {
@@ -105,8 +105,8 @@ archive_write_set_format_cpio(struct archive *_a)
        a->format_write_header = archive_write_cpio_header;
        a->format_write_data = archive_write_cpio_data;
        a->format_finish_entry = archive_write_cpio_finish_entry;
-       a->format_finish = archive_write_cpio_finish;
-       a->format_destroy = archive_write_cpio_destroy;
+       a->format_close = archive_write_cpio_close;
+       a->format_free = archive_write_cpio_free;
        a->archive.archive_format = ARCHIVE_FORMAT_CPIO_POSIX;
        a->archive.archive_format_name = "POSIX cpio";
        return (ARCHIVE_OK);
@@ -300,7 +300,7 @@ format_octal_recursive(int64_t v, char *p, int s)
 }
 
 static int
-archive_write_cpio_finish(struct archive_write *a)
+archive_write_cpio_close(struct archive_write *a)
 {
        int er;
        struct archive_entry *trailer;
@@ -315,7 +315,7 @@ archive_write_cpio_finish(struct archive_write *a)
 }
 
 static int
-archive_write_cpio_destroy(struct archive_write *a)
+archive_write_cpio_free(struct archive_write *a)
 {
        struct cpio *cpio;
 

diff --git a/libarchive/archive_write_set_format_cpio_newc.c b/libarchive/archive_write_set_format_cpio_newc.c
index b9d21c52d364356a0d521d74ba9e82c1699cf5d2..9810e623c87523d499b16d0bf783efa11cd21f67 100644 (file)
--- a/libarchive/archive_write_set_format_cpio_newc.c
+++ b/libarchive/archive_write_set_format_cpio_newc.c
@@ -45,8 +45,8 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_cpio_newc.c 201
 
 static ssize_t archive_write_newc_data(struct archive_write *,
                    const void *buff, size_t s);
-static int     archive_write_newc_finish(struct archive_write *);
-static int     archive_write_newc_destroy(struct archive_write *);
+static int     archive_write_newc_close(struct archive_write *);
+static int     archive_write_newc_free(struct archive_write *);
 static int     archive_write_newc_finish_entry(struct archive_write *);
 static int     archive_write_newc_header(struct archive_write *,
                    struct archive_entry *);
@@ -91,8 +91,8 @@ archive_write_set_format_cpio_newc(struct archive *_a)
            ARCHIVE_STATE_NEW, "archive_write_set_format_cpio_newc");
 
        /* If someone else was already registered, unregister them. */
-       if (a->format_destroy != NULL)
-               (a->format_destroy)(a);
+       if (a->format_free != NULL)
+               (a->format_free)(a);
 
        cpio = (struct cpio *)malloc(sizeof(*cpio));
        if (cpio == NULL) {
@@ -107,8 +107,8 @@ archive_write_set_format_cpio_newc(struct archive *_a)
        a->format_write_header = archive_write_newc_header;
        a->format_write_data = archive_write_newc_data;
        a->format_finish_entry = archive_write_newc_finish_entry;
-       a->format_finish = archive_write_newc_finish;
-       a->format_destroy = archive_write_newc_destroy;
+       a->format_close = archive_write_newc_close;
+       a->format_free = archive_write_newc_free;
        a->archive.archive_format = ARCHIVE_FORMAT_CPIO_SVR4_NOCRC;
        a->archive.archive_format_name = "SVR4 cpio nocrc";
        return (ARCHIVE_OK);
@@ -253,7 +253,7 @@ format_hex_recursive(int64_t v, char *p, int s)
 }
 
 static int
-archive_write_newc_finish(struct archive_write *a)
+archive_write_newc_close(struct archive_write *a)
 {
        int er;
        struct archive_entry *trailer;
@@ -267,7 +267,7 @@ archive_write_newc_finish(struct archive_write *a)
 }
 
 static int
-archive_write_newc_destroy(struct archive_write *a)
+archive_write_newc_free(struct archive_write *a)
 {
        struct cpio *cpio;
 

diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index 5329d8211123235780aa115720e6911f8ab0d0bb..72c2f7935e98c35e771565ee1bbfa9e2785e639d 100644 (file)
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -1017,8 +1017,8 @@ static int        iso9660_write_header(struct archive_write *,
 static ssize_t iso9660_write_data(struct archive_write *,
                    const void *, size_t);
 static int     iso9660_finish_entry(struct archive_write *);
-static int     iso9660_finish(struct archive_write *);
-static int     iso9660_destroy(struct archive_write *);
+static int     iso9660_close(struct archive_write *);
+static int     iso9660_free(struct archive_write *);
 
 static void    get_system_identitier(char *, size_t);
 static void    set_str(unsigned char *, const char *, size_t, char,
@@ -1162,8 +1162,8 @@ archive_write_set_format_iso9660(struct archive *_a)
            ARCHIVE_STATE_NEW, "archive_write_set_format_iso9660");
 
        /* If another format was already registered, unregister it. */
-       if (a->format_destroy != NULL)
-               (a->format_destroy)(a);
+       if (a->format_free != NULL)
+               (a->format_free)(a);
 
        iso9660 = malloc(sizeof(*iso9660));
        if (iso9660 == NULL) {
@@ -1286,8 +1286,8 @@ archive_write_set_format_iso9660(struct archive *_a)
        a->format_write_header = iso9660_write_header;
        a->format_write_data = iso9660_write_data;
        a->format_finish_entry = iso9660_finish_entry;
-       a->format_finish = iso9660_finish;
-       a->format_destroy = iso9660_destroy;
+       a->format_close = iso9660_close;
+       a->format_free = iso9660_free;
        a->archive.archive_format = ARCHIVE_FORMAT_ISO9660;
        a->archive.archive_format_name = "ISO9660";
 
@@ -1954,7 +1954,7 @@ iso9660_finish_entry(struct archive_write *a)
 }
 
 static int
-iso9660_finish(struct archive_write *a)
+iso9660_close(struct archive_write *a)
 {
        struct iso9660 *iso9660;
        int ret, blocks;
@@ -2168,7 +2168,7 @@ iso9660_finish(struct archive_write *a)
 }
 
 static int
-iso9660_destroy(struct archive_write *a)
+iso9660_free(struct archive_write *a)
 {
        struct iso9660 *iso9660;
        int i, ret;

diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c
index 5b2bf02244e57c89f3dc0bb9970cdee92074b72a..9a70d8aa4eb3fea159622418fd5e5592db0fe085 100644 (file)
--- a/libarchive/archive_write_set_format_mtree.c
+++ b/libarchive/archive_write_set_format_mtree.c
@@ -830,7 +830,7 @@ archive_write_mtree_finish_entry(struct archive_write *a)
 }
 
 static int
-archive_write_mtree_finish(struct archive_write *a)
+archive_write_mtree_close(struct archive_write *a)
 {
        struct mtree_writer *mtree= a->format_data;
 
@@ -888,7 +888,7 @@ archive_write_mtree_data(struct archive_write *a, const void *buff, size_t n)
 }
 
 static int
-archive_write_mtree_destroy(struct archive_write *a)
+archive_write_mtree_free(struct archive_write *a)
 {
        struct mtree_writer *mtree= a->format_data;
 
@@ -1018,8 +1018,8 @@ archive_write_set_format_mtree(struct archive *_a)
        archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
            ARCHIVE_STATE_NEW, "archive_write_set_format_mtree");
 
-       if (a->format_destroy != NULL)
-               (a->format_destroy)(a);
+       if (a->format_free != NULL)
+               (a->format_free)(a);
 
        if ((mtree = malloc(sizeof(*mtree))) == NULL) {
                archive_set_error(&a->archive, ENOMEM,
@@ -1037,13 +1037,13 @@ archive_write_set_format_mtree(struct archive *_a)
        archive_string_init(&mtree->ebuf);
        archive_string_init(&mtree->buf);
        a->format_data = mtree;
-       a->format_destroy = archive_write_mtree_destroy;
+       a->format_free = archive_write_mtree_free;
 
        a->pad_uncompressed = 0;
        a->format_name = "mtree";
        a->format_options = archive_write_mtree_options;
        a->format_write_header = archive_write_mtree_header;
-       a->format_finish = archive_write_mtree_finish;
+       a->format_close = archive_write_mtree_close;
        a->format_write_data = archive_write_mtree_data;
        a->format_finish_entry = archive_write_mtree_finish_entry;
        a->archive.archive_format = ARCHIVE_FORMAT_MTREE;

diff --git a/libarchive/archive_write_set_format_pax.c b/libarchive/archive_write_set_format_pax.c
index 771de2a5f3add1ed8f26060be639a39fb4aef6ea..b2b97ed889befc2617d6640fd2ebdd266669e31f 100644 (file)
--- a/libarchive/archive_write_set_format_pax.c
+++ b/libarchive/archive_write_set_format_pax.c
@@ -70,8 +70,8 @@ static void            add_pax_attr_w(struct archive_string *,
                             const char *key, const wchar_t *wvalue);
 static ssize_t          archive_write_pax_data(struct archive_write *,
                             const void *, size_t);
-static int              archive_write_pax_finish(struct archive_write *);
-static int              archive_write_pax_destroy(struct archive_write *);
+static int              archive_write_pax_close(struct archive_write *);
+static int              archive_write_pax_free(struct archive_write *);
 static int              archive_write_pax_finish_entry(struct archive_write *);
 static int              archive_write_pax_header(struct archive_write *,
                             struct archive_entry *);
@@ -121,8 +121,8 @@ archive_write_set_format_pax(struct archive *_a)
        archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
            ARCHIVE_STATE_NEW, "archive_write_set_format_pax");
 
-       if (a->format_destroy != NULL)
-               (a->format_destroy)(a);
+       if (a->format_free != NULL)
+               (a->format_free)(a);
 
        pax = (struct pax *)malloc(sizeof(*pax));
        if (pax == NULL) {
@@ -136,8 +136,8 @@ archive_write_set_format_pax(struct archive *_a)
        a->format_name = "pax";
        a->format_write_header = archive_write_pax_header;
        a->format_write_data = archive_write_pax_data;
-       a->format_finish = archive_write_pax_finish;
-       a->format_destroy = archive_write_pax_destroy;
+       a->format_close = archive_write_pax_close;
+       a->format_free = archive_write_pax_free;
        a->format_finish_entry = archive_write_pax_finish_entry;
        a->archive.archive_format = ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE;
        a->archive.archive_format_name = "POSIX pax interchange";
@@ -1379,13 +1379,13 @@ build_gnu_sparse_name(char *dest, const char *src)
 
 /* Write two null blocks for the end of archive */
 static int
-archive_write_pax_finish(struct archive_write *a)
+archive_write_pax_close(struct archive_write *a)
 {
        return (write_nulls(a, 512 * 2));
 }
 
 static int
-archive_write_pax_destroy(struct archive_write *a)
+archive_write_pax_free(struct archive_write *a)
 {
        struct pax *pax;
 

diff --git a/libarchive/archive_write_set_format_shar.c b/libarchive/archive_write_set_format_shar.c
index 52bb93c924bde25c69136f261bf60934eb3e02b3..8f55aad30c3dc1abcf0bf25ca45e7c314dc3cd84 100644 (file)
--- a/libarchive/archive_write_set_format_shar.c
+++ b/libarchive/archive_write_set_format_shar.c
@@ -59,8 +59,8 @@ struct shar {
        struct archive_string    quoted_name;
 };
 
-static int     archive_write_shar_finish(struct archive_write *);
-static int     archive_write_shar_destroy(struct archive_write *);
+static int     archive_write_shar_close(struct archive_write *);
+static int     archive_write_shar_free(struct archive_write *);
 static int     archive_write_shar_header(struct archive_write *,
                    struct archive_entry *);
 static ssize_t archive_write_shar_data_sed(struct archive_write *,
@@ -110,8 +110,8 @@ archive_write_set_format_shar(struct archive *_a)
            ARCHIVE_STATE_NEW, "archive_write_set_format_shar");
 
        /* If someone else was already registered, unregister them. */
-       if (a->format_destroy != NULL)
-               (a->format_destroy)(a);
+       if (a->format_free != NULL)
+               (a->format_free)(a);
 
        shar = (struct shar *)malloc(sizeof(*shar));
        if (shar == NULL) {
@@ -126,8 +126,8 @@ archive_write_set_format_shar(struct archive *_a)
        a->pad_uncompressed = 0;
        a->format_name = "shar";
        a->format_write_header = archive_write_shar_header;
-       a->format_finish = archive_write_shar_finish;
-       a->format_destroy = archive_write_shar_destroy;
+       a->format_close = archive_write_shar_close;
+       a->format_free = archive_write_shar_free;
        a->format_write_data = archive_write_shar_data_sed;
        a->format_finish_entry = archive_write_shar_finish_entry;
        a->archive.archive_format = ARCHIVE_FORMAT_SHAR_BASE;
@@ -572,7 +572,7 @@ archive_write_shar_finish_entry(struct archive_write *a)
 }
 
 static int
-archive_write_shar_finish(struct archive_write *a)
+archive_write_shar_close(struct archive_write *a)
 {
        struct shar *shar;
        int ret;
@@ -610,7 +610,7 @@ archive_write_shar_finish(struct archive_write *a)
 }
 
 static int
-archive_write_shar_destroy(struct archive_write *a)
+archive_write_shar_free(struct archive_write *a)
 {
        struct shar *shar;
 

diff --git a/libarchive/archive_write_set_format_ustar.c b/libarchive/archive_write_set_format_ustar.c
index 8885b74616e823c876b3dc0fe089d352eb80ad38..181800362babf46527f054ab51d6c5754bfc41cf 100644 (file)
--- a/libarchive/archive_write_set_format_ustar.c
+++ b/libarchive/archive_write_set_format_ustar.c
@@ -143,8 +143,8 @@ static const char template_header[] = {
 
 static ssize_t archive_write_ustar_data(struct archive_write *a, const void *buff,
                    size_t s);
-static int     archive_write_ustar_destroy(struct archive_write *);
-static int     archive_write_ustar_finish(struct archive_write *);
+static int     archive_write_ustar_free(struct archive_write *);
+static int     archive_write_ustar_close(struct archive_write *);
 static int     archive_write_ustar_finish_entry(struct archive_write *);
 static int     archive_write_ustar_header(struct archive_write *,
                    struct archive_entry *entry);
@@ -166,8 +166,8 @@ archive_write_set_format_ustar(struct archive *_a)
            ARCHIVE_STATE_NEW, "archive_write_set_format_ustar");
 
        /* If someone else was already registered, unregister them. */
-       if (a->format_destroy != NULL)
-               (a->format_destroy)(a);
+       if (a->format_free != NULL)
+               (a->format_free)(a);
 
        /* Basic internal sanity test. */
        if (sizeof(template_header) != 512) {
@@ -187,8 +187,8 @@ archive_write_set_format_ustar(struct archive *_a)
        a->format_name = "ustar";
        a->format_write_header = archive_write_ustar_header;
        a->format_write_data = archive_write_ustar_data;
-       a->format_finish = archive_write_ustar_finish;
-       a->format_destroy = archive_write_ustar_destroy;
+       a->format_close = archive_write_ustar_close;
+       a->format_free = archive_write_ustar_free;
        a->format_finish_entry = archive_write_ustar_finish_entry;
        a->archive.archive_format = ARCHIVE_FORMAT_TAR_USTAR;
        a->archive.archive_format_name = "POSIX ustar";
@@ -522,13 +522,13 @@ format_octal(int64_t v, char *p, int s)
 }
 
 static int
-archive_write_ustar_finish(struct archive_write *a)
+archive_write_ustar_close(struct archive_write *a)
 {
        return (write_nulls(a, 512*2));
 }
 
 static int
-archive_write_ustar_destroy(struct archive_write *a)
+archive_write_ustar_free(struct archive_write *a)
 {
        struct ustar *ustar;
 

diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c
index 4ed1bfa79ec502058571c64fd00342d551c26b02..97af7b3c3e7aae745574e582a71a5d3608ec3161 100644 (file)
--- a/libarchive/archive_write_set_format_zip.c
+++ b/libarchive/archive_write_set_format_zip.c
@@ -92,8 +92,8 @@ enum compression {
 };
 
 static ssize_t archive_write_zip_data(struct archive_write *, const void *buff, size_t s);
-static int archive_write_zip_finish(struct archive_write *);
-static int archive_write_zip_destroy(struct archive_write *);
+static int archive_write_zip_close(struct archive_write *);
+static int archive_write_zip_free(struct archive_write *);
 static int archive_write_zip_finish_entry(struct archive_write *);
 static int archive_write_zip_header(struct archive_write *, struct archive_entry *);
 static unsigned int dos_time(const time_t);
@@ -231,8 +231,8 @@ archive_write_set_format_zip(struct archive *_a)
            ARCHIVE_STATE_NEW, "archive_write_set_format_zip");
 
        /* If another format was already registered, unregister it. */
-       if (a->format_destroy != NULL)
-               (a->format_destroy)(a);
+       if (a->format_free != NULL)
+               (a->format_free)(a);
 
        zip = (struct zip *) calloc(1, sizeof(*zip));
        if (zip == NULL) {
@@ -265,8 +265,8 @@ archive_write_set_format_zip(struct archive *_a)
        a->format_write_header = archive_write_zip_header;
        a->format_write_data = archive_write_zip_data;
        a->format_finish_entry = archive_write_zip_finish_entry;
-       a->format_finish = archive_write_zip_finish;
-       a->format_destroy = archive_write_zip_destroy;
+       a->format_close = archive_write_zip_close;
+       a->format_free = archive_write_zip_free;
        a->archive.archive_format = ARCHIVE_FORMAT_ZIP;
        a->archive.archive_format_name = "ZIP";
 
@@ -494,7 +494,7 @@ archive_write_zip_finish_entry(struct archive_write *a)
 }
 
 static int
-archive_write_zip_finish(struct archive_write *a)
+archive_write_zip_close(struct archive_write *a)
 {
        struct zip *zip;
        struct zip_file_header_link *l;
@@ -583,7 +583,7 @@ archive_write_zip_finish(struct archive_write *a)
 }
 
 static int
-archive_write_zip_destroy(struct archive_write *a)
+archive_write_zip_free(struct archive_write *a)
 {
        struct zip *zip;
        struct zip_file_header_link *l;