diff options
| author | Tim Kientzle <kientzle@gmail.com> | 2010-03-01 11:49:07 -0500 |
|---|---|---|
| committer | Tim Kientzle <kientzle@gmail.com> | 2010-03-01 11:49:07 -0500 |
| commit | 659c59dce14e6346f8692305ed0f2288f3be1b2f (patch) | |
| tree | 33300c6855f1b66ce5393c5937eaa6ddffee4d09 /libarchive/archive_write_set_format_shar.c | |
| parent | 42c1f3e1243e684bc003d857450496a274d16a31 (diff) | |
| download | libarchive-659c59dce14e6346f8692305ed0f2288f3be1b2f.tar.gz | |
Rename 'finish' to 'close' and 'destroy' to 'free', to clarify
the new/open/close/free lifecycle terminology.
SVN-Revision: 2004
Diffstat (limited to 'libarchive/archive_write_set_format_shar.c')
| -rw-r--r-- | libarchive/archive_write_set_format_shar.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libarchive/archive_write_set_format_shar.c b/libarchive/archive_write_set_format_shar.c index 52bb93c9..8f55aad3 100644 --- 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; |