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_ustar.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_ustar.c')
| -rw-r--r-- | libarchive/archive_write_set_format_ustar.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libarchive/archive_write_set_format_ustar.c b/libarchive/archive_write_set_format_ustar.c index 8885b746..18180036 100644 --- 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; |