diff options
| author | Tim Kientzle <kientzle@gmail.com> | 2010-05-31 14:37:17 -0400 |
|---|---|---|
| committer | Tim Kientzle <kientzle@gmail.com> | 2010-05-31 14:37:17 -0400 |
| commit | 0187c5dd12cb9723aaa04819e389aeb52fcb6745 (patch) | |
| tree | 9e3f1cb199e94a53c8dbb9967b79c56316520147 /libarchive/archive_read_private.h | |
| parent | 55aec9a7b8f5a2b32a8dd6faa3cb2d24f10ce05c (diff) | |
| download | libarchive-0187c5dd12cb9723aaa04819e389aeb52fcb6745.tar.gz | |
For internal APIs, we don't need to worry about the API version.
SVN-Revision: 2432
Diffstat (limited to 'libarchive/archive_read_private.h')
| -rw-r--r-- | libarchive/archive_read_private.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h index d9448d77..cf25004a 100644 --- a/libarchive/archive_read_private.h +++ b/libarchive/archive_read_private.h @@ -135,12 +135,8 @@ struct archive_read { * data to client buffers, filling gaps with zero bytes. */ const char *read_data_block; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t read_data_offset; -#else int64_t read_data_offset; -#endif - off_t read_data_output_offset; + int64_t read_data_output_offset; size_t read_data_remaining; /* Callbacks to open/read/write/close client archive stream. */ @@ -153,7 +149,7 @@ struct archive_read { struct archive_read_filter *filter; /* File offset of beginning of most recently-read header. */ - off_t header_position; + int64_t header_position; /* * Format detection is mostly the same as compression @@ -170,11 +166,7 @@ struct archive_read { int (*options)(struct archive_read *, const char *key, const char *value); int (*read_header)(struct archive_read *, struct archive_entry *); -#if ARCHIVE_VERSION_NUMBER < 3000000 - int (*read_data)(struct archive_read *, const void **, size_t *, off_t *); -#else int (*read_data)(struct archive_read *, const void **, size_t *, int64_t *); -#endif int (*read_data_skip)(struct archive_read *); int (*cleanup)(struct archive_read *); } formats[9]; @@ -193,11 +185,7 @@ int __archive_read_register_format(struct archive_read *a, int (*bid)(struct archive_read *), int (*options)(struct archive_read *, const char *, const char *), int (*read_header)(struct archive_read *, struct archive_entry *), -#if ARCHIVE_VERSION_NUMBER < 3000000 - int (*read_data)(struct archive_read *, const void **, size_t *, off_t *), -#else int (*read_data)(struct archive_read *, const void **, size_t *, int64_t *), -#endif int (*read_data_skip)(struct archive_read *), int (*cleanup)(struct archive_read *)); |