diff options
| author | cperciva <cperciva@FreeBSD.org> | 2007-01-05 10:48:18 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2007-01-05 10:48:18 +0000 |
| commit | f583eee6e15beb870cee2e61468804ac5017cfd2 (patch) | |
| tree | a8fbd9a8f7d676f70ed6b0db08db229718f48ade /lib/libarchive/archive_read_open_memory.c | |
| parent | 872ebc62d77854d9b1f45266568982a51ba268a4 (diff) | |
| download | FreeBSD-src-f583eee6e15beb870cee2e61468804ac5017cfd2.zip FreeBSD-src-f583eee6e15beb870cee2e61468804ac5017cfd2.tar.gz | |
Change the client skipper API to use off_t instead of size_t/ssize_t; but
wrap this within #if/#else/#endif so that it will only take effect once
ARCHIVE_API_VERSION is increased (which should happen on HEAD some time
between now and when RELENG_7 is branched).
Diffstat (limited to 'lib/libarchive/archive_read_open_memory.c')
| -rw-r--r-- | lib/libarchive/archive_read_open_memory.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/libarchive/archive_read_open_memory.c b/lib/libarchive/archive_read_open_memory.c index a639d85..01975cf 100644 --- a/lib/libarchive/archive_read_open_memory.c +++ b/lib/libarchive/archive_read_open_memory.c @@ -48,7 +48,11 @@ struct read_memory_data { static int memory_read_close(struct archive *, void *); static int memory_read_open(struct archive *, void *); +#if ARCHIVE_API_VERSION < 2 static ssize_t memory_read_skip(struct archive *, void *, size_t request); +#else +static off_t memory_read_skip(struct archive *, void *, off_t request); +#endif static ssize_t memory_read(struct archive *, void *, const void **buff); int @@ -119,8 +123,13 @@ memory_read(struct archive *a, void *client_data, const void **buff) * necessary in order to better exercise internal code when used * as a test harness. */ +#if ARCHIVE_API_VERSION < 2 static ssize_t memory_read_skip(struct archive *a, void *client_data, size_t skip) +#else +static off_t +memory_read_skip(struct archive *a, void *client_data, off_t skip) +#endif { struct read_memory_data *mine = (struct read_memory_data *)client_data; |
