summaryrefslogtreecommitdiff
path: root/lib/libarchive/archive_read_open_filename.c
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2007-01-05 10:48:18 +0000
committerColin Percival <cperciva@FreeBSD.org>2007-01-05 10:48:18 +0000
commita0b84e7498933faae16f2f43a2a29a72c1850165 (patch)
treea8fbd9a8f7d676f70ed6b0db08db229718f48ade /lib/libarchive/archive_read_open_filename.c
parent03d0aa10bc4524c28846bd828f1599420e4a195f (diff)
Notes
Diffstat (limited to 'lib/libarchive/archive_read_open_filename.c')
-rw-r--r--lib/libarchive/archive_read_open_filename.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/libarchive/archive_read_open_filename.c b/lib/libarchive/archive_read_open_filename.c
index cefc2861b13e..2355f190c1a1 100644
--- a/lib/libarchive/archive_read_open_filename.c
+++ b/lib/libarchive/archive_read_open_filename.c
@@ -59,7 +59,11 @@ struct read_file_data {
static int file_close(struct archive *, void *);
static int file_open(struct archive *, void *);
static ssize_t file_read(struct archive *, void *, const void **buff);
+#if ARCHIVE_API_VERSION < 2
static ssize_t file_skip(struct archive *, void *, size_t request);
+#else
+static off_t file_skip(struct archive *, void *, off_t request);
+#endif
int
archive_read_open_file(struct archive *a, const char *filename,
@@ -151,8 +155,13 @@ file_read(struct archive *a, void *client_data, const void **buff)
return (bytes_read);
}
+#if ARCHIVE_API_VERSION < 2
static ssize_t
file_skip(struct archive *a, void *client_data, size_t request)
+#else
+static off_t
+file_skip(struct archive *a, void *client_data, off_t request)
+#endif
{
struct read_file_data *mine = (struct read_file_data *)client_data;
off_t old_offset, new_offset;