diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-26 13:53:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-26 13:53:15 (GMT) |
| commit | 6a4b1006f9561ea126073329216c4815ca731c31 (patch) | |
| tree | e39ae350a8f4e399a974d3417e6efc06aaece3c3 /Utilities/cmlibarchive/libarchive/archive_virtual.c | |
| parent | 710f37c47a7df54c39e50d050e790271c547ad80 (diff) | |
| parent | 2aaed7a05053c3bcbebbff5ae1beb51e590b3ad1 (diff) | |
| download | CMake-6a4b1006f9561ea126073329216c4815ca731c31.zip CMake-6a4b1006f9561ea126073329216c4815ca731c31.tar.gz CMake-6a4b1006f9561ea126073329216c4815ca731c31.tar.bz2 | |
Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
LibArchive 2018-09-03 (5fe69dd0)
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_virtual.c')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_virtual.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_virtual.c b/Utilities/cmlibarchive/libarchive/archive_virtual.c index de2595a..f509ee5 100644 --- a/Utilities/cmlibarchive/libarchive/archive_virtual.c +++ b/Utilities/cmlibarchive/libarchive/archive_virtual.c @@ -48,7 +48,7 @@ archive_filter_name(struct archive *a, int n) return ((a->vtable->archive_filter_name)(a, n)); } -int64_t +la_int64_t archive_filter_bytes(struct archive *a, int n) { return ((a->vtable->archive_filter_bytes)(a, n)); @@ -124,14 +124,15 @@ archive_write_finish_entry(struct archive *a) return ((a->vtable->archive_write_finish_entry)(a)); } -ssize_t +la_ssize_t archive_write_data(struct archive *a, const void *buff, size_t s) { return ((a->vtable->archive_write_data)(a, buff, s)); } -ssize_t -archive_write_data_block(struct archive *a, const void *buff, size_t s, int64_t o) +la_ssize_t +archive_write_data_block(struct archive *a, const void *buff, size_t s, + la_int64_t o) { if (a->vtable->archive_write_data_block == NULL) { archive_set_error(a, ARCHIVE_ERRNO_MISC, @@ -156,7 +157,7 @@ archive_read_next_header2(struct archive *a, struct archive_entry *entry) int archive_read_data_block(struct archive *a, - const void **buff, size_t *s, int64_t *o) + const void **buff, size_t *s, la_int64_t *o) { return ((a->vtable->archive_read_data_block)(a, buff, s, o)); } |