diff options
| author | Martin Matuška <martin@matuska.org> | 2022-02-05 10:02:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-05 10:02:15 +0100 |
| commit | 83b3d522e131e0cf4f07131716dcac24dd0b0273 (patch) | |
| tree | c82fd5c7733d0003fff9114c9f8f69f68bcdc293 /libarchive/archive_write_disk_windows.c | |
| parent | 3665c7587d6561f0209da1716f86fbebb9a26778 (diff) | |
| parent | 4b7558e108c17de1417fb427ce0f771049e10ec5 (diff) | |
| download | libarchive-83b3d522e131e0cf4f07131716dcac24dd0b0273.tar.gz | |
Merge pull request #1603 from evelikov/reader-filter-vtbl
Reader filter rework - simplification, robustness and deadcode removal
Diffstat (limited to 'libarchive/archive_write_disk_windows.c')
| -rw-r--r-- | libarchive/archive_write_disk_windows.c | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/libarchive/archive_write_disk_windows.c b/libarchive/archive_write_disk_windows.c index a91e20b7..1b12a299 100644 --- a/libarchive/archive_write_disk_windows.c +++ b/libarchive/archive_write_disk_windows.c @@ -238,8 +238,6 @@ static struct fixup_entry *sort_dir_list(struct fixup_entry *p); static ssize_t write_data_block(struct archive_write_disk *, const char *, size_t); -static struct archive_vtable *archive_write_disk_vtable(void); - static int _archive_write_disk_close(struct archive *); static int _archive_write_disk_free(struct archive *); static int _archive_write_disk_header(struct archive *, @@ -759,25 +757,16 @@ lazy_stat(struct archive_write_disk *a) return (ARCHIVE_WARN); } -static struct archive_vtable * -archive_write_disk_vtable(void) -{ - static struct archive_vtable av; - static int inited = 0; - - if (!inited) { - av.archive_close = _archive_write_disk_close; - av.archive_filter_bytes = _archive_write_disk_filter_bytes; - av.archive_free = _archive_write_disk_free; - av.archive_write_header = _archive_write_disk_header; - av.archive_write_finish_entry - = _archive_write_disk_finish_entry; - av.archive_write_data = _archive_write_disk_data; - av.archive_write_data_block = _archive_write_disk_data_block; - inited = 1; - } - return (&av); -} +static const struct archive_vtable +archive_write_disk_vtable = { + .archive_close = _archive_write_disk_close, + .archive_filter_bytes = _archive_write_disk_filter_bytes, + .archive_free = _archive_write_disk_free, + .archive_write_header = _archive_write_disk_header, + .archive_write_finish_entry = _archive_write_disk_finish_entry, + .archive_write_data = _archive_write_disk_data, + .archive_write_data_block = _archive_write_disk_data_block, +}; static int64_t _archive_write_disk_filter_bytes(struct archive *_a, int n) @@ -1373,7 +1362,7 @@ archive_write_disk_new(void) a->archive.magic = ARCHIVE_WRITE_DISK_MAGIC; /* We're ready to write a header immediately. */ a->archive.state = ARCHIVE_STATE_HEADER; - a->archive.vtable = archive_write_disk_vtable(); + a->archive.vtable = &archive_write_disk_vtable; a->start_time = time(NULL); /* Query and restore the umask. */ umask(a->user_umask = umask(0)); |