summaryrefslogtreecommitdiff
path: root/libarchive/archive_read_open_memory.c
diff options
context:
space:
mode:
authorTim Kientzle <kientzle@gmail.com>2011-01-22 18:05:58 -0500
committerTim Kientzle <kientzle@gmail.com>2011-01-22 18:05:58 -0500
commit85a8c85227016804e4453f07278967da2907e2d8 (patch)
treef6b3ee4fcac8ec2dd0abcf666851501cfd25726c /libarchive/archive_read_open_memory.c
parent566a663670eeddf18c4b45ba51a80952714cb213 (diff)
downloadlibarchive-85a8c85227016804e4453f07278967da2907e2d8.tar.gz
Eliminate a bunch of off_t uses.
Most of these are from the libarchive 2 API that's no longer supported. A few are places where int64_t offsets need to be mapped down to system APIs that might only be 32 bits; those are a little trickier. SVN-Revision: 2937
Diffstat (limited to 'libarchive/archive_read_open_memory.c')
-rw-r--r--libarchive/archive_read_open_memory.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/libarchive/archive_read_open_memory.c b/libarchive/archive_read_open_memory.c
index e816edd3..b00b999f 100644
--- a/libarchive/archive_read_open_memory.c
+++ b/libarchive/archive_read_open_memory.c
@@ -48,11 +48,7 @@ struct read_memory_data {
static int memory_read_close(struct archive *, void *);
static int memory_read_open(struct archive *, void *);
-#if ARCHIVE_VERSION_NUMBER < 3000000
-static off_t memory_read_skip(struct archive *, void *, off_t request);
-#else
static int64_t memory_read_skip(struct archive *, void *, int64_t request);
-#endif
static ssize_t memory_read(struct archive *, void *, const void **buff);
int
@@ -123,13 +119,8 @@ 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_VERSION_NUMBER < 3000000
-static off_t
-memory_read_skip(struct archive *a, void *client_data, off_t skip)
-#else
static int64_t
memory_read_skip(struct archive *a, void *client_data, int64_t skip)
-#endif
{
struct read_memory_data *mine = (struct read_memory_data *)client_data;