diff options
31 files changed, 2 insertions, 435 deletions
diff --git a/cpio/cpio.c b/cpio/cpio.c index f41ad401..46d69277 100644 --- a/cpio/cpio.c +++ b/cpio/cpio.c @@ -906,11 +906,7 @@ extract_data(struct archive *ar, struct archive *aw) int r; size_t size; const void *block; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t offset; -#else int64_t offset; -#endif for (;;) { r = archive_read_data_block(ar, &block, &size, &offset); diff --git a/libarchive/archive.h b/libarchive/archive.h index bb6a55d4..939d83e7 100644 --- a/libarchive/archive.h +++ b/libarchive/archive.h @@ -146,28 +146,6 @@ __LA_DECL int archive_version_number(void); #define ARCHIVE_VERSION_STRING "libarchive 3.0.0a" __LA_DECL const char * archive_version_string(void); -#if ARCHIVE_VERSION_NUMBER < 3000000 -/* - * Deprecated; these are older names that will be removed in favor of - * the simpler definitions above. - */ -#define ARCHIVE_VERSION_STAMP ARCHIVE_VERSION_NUMBER -__LA_DECL int archive_version_stamp(void); -#define ARCHIVE_LIBRARY_VERSION ARCHIVE_VERSION_STRING -__LA_DECL const char * archive_version(void); -#define ARCHIVE_API_VERSION (ARCHIVE_VERSION_NUMBER / 1000000) -__LA_DECL int archive_api_version(void); -#define ARCHIVE_API_FEATURE ((ARCHIVE_VERSION_NUMBER / 1000) % 1000) -__LA_DECL int archive_api_feature(void); -#endif - -#if ARCHIVE_VERSION_NUMBER < 3000000 -/* This should never have been here in the first place. */ -/* Legacy of old tar assumptions, will be removed in libarchive 3.0. */ -#define ARCHIVE_BYTES_PER_RECORD 512 -#define ARCHIVE_DEFAULT_BYTES_PER_BLOCK 10240 -#endif - /* Declare our basic types. */ struct archive; struct archive_entry; @@ -212,17 +190,8 @@ typedef __LA_SSIZE_T archive_read_callback(struct archive *, void *_client_data, const void **_buffer); /* Skips at most request bytes from archive and returns the skipped amount */ -#if ARCHIVE_VERSION_NUMBER < 3000000 -/* Libarchive 2.0 used off_t here, but that is a bad idea on Linux and a - * few other platforms where off_t varies with build settings. */ -typedef off_t archive_skip_callback(struct archive *, - void *_client_data, off_t request); -#else -/* Libarchive 3.0 uses int64_t here, which is actually guaranteed to be - * 64 bits on every platform. */ typedef __LA_INT64_T archive_skip_callback(struct archive *, void *_client_data, __LA_INT64_T request); -#endif /* Returns size actually written, zero on EOF, -1 on error. */ typedef __LA_SSIZE_T archive_write_callback(struct archive *, @@ -434,13 +403,8 @@ __LA_DECL __LA_SSIZE_T archive_read_data(struct archive *, * the desired size of the block. The API does guarantee that offsets will * be strictly increasing and that returned blocks will not overlap. */ -#if ARCHIVE_VERSION_NUMBER < 3000000 -__LA_DECL int archive_read_data_block(struct archive *a, - const void **buff, size_t *size, off_t *offset); -#else __LA_DECL int archive_read_data_block(struct archive *a, const void **buff, size_t *size, __LA_INT64_T *offset); -#endif /*- * Some convenience functions that are built on archive_read_data: @@ -528,13 +492,8 @@ __LA_DECL void archive_read_extract_set_progress_callback(struct archive *, /* Record the dev/ino of a file that will not be written. This is * generally set to the dev/ino of the archive being read. */ -#if ARCHIVE_VERSION_NUMBER < 3000000 -__LA_DECL void archive_read_extract_set_skip_file(struct archive *, - dev_t, ino_t); -#else __LA_DECL void archive_read_extract_set_skip_file(struct archive *, __LA_INT64_T, __LA_INT64_T); -#endif /* Close the file and release most resources. */ __LA_DECL int archive_read_close(struct archive *); @@ -572,12 +531,8 @@ __LA_DECL int archive_write_get_bytes_in_last_block(struct archive *); /* The dev/ino of a file that won't be archived. This is used * to avoid recursively adding an archive to itself. */ -#if ARCHIVE_VERSION_NUMBER < 3000000 -__LA_DECL int archive_write_set_skip_file(struct archive *, dev_t, ino_t); -#else __LA_DECL int archive_write_set_skip_file(struct archive *, __LA_INT64_T, __LA_INT64_T); -#endif #if ARCHIVE_VERSION_NUMBER < 4000000 __LA_DECL int archive_write_set_compression_bzip2(struct archive *); @@ -644,17 +599,10 @@ __LA_DECL int archive_write_header(struct archive *, __LA_DECL __LA_SSIZE_T archive_write_data(struct archive *, const void *, size_t); -#if ARCHIVE_VERSION_NUMBER < 3000000 -/* Libarchive 1.x and 2.x use off_t for the argument, but that's not - * stable on Linux. */ -__LA_DECL __LA_SSIZE_T archive_write_data_block(struct archive *, - const void *, size_t, off_t); -#else -/* Libarchive 3.0 uses explicit int64_t to ensure consistent 64-bit support. */ -/* This interface is currently only available for archive_write_disk handles. */ +/* This interface is currently only available for archive_write_disk handles. */ __LA_DECL __LA_SSIZE_T archive_write_data_block(struct archive *, const void *, size_t, __LA_INT64_T); -#endif + __LA_DECL int archive_write_finish_entry(struct archive *); __LA_DECL int archive_write_close(struct archive *); /* This can fail if the archive wasn't already closed, in which case @@ -702,13 +650,8 @@ __LA_DECL int archive_write_set_options(struct archive *_a, */ __LA_DECL struct archive *archive_write_disk_new(void); /* This file will not be overwritten. */ -#if ARCHIVE_VERSION_NUMBER < 3000000 -__LA_DECL int archive_write_disk_set_skip_file(struct archive *, - dev_t, ino_t); -#else __LA_DECL int archive_write_disk_set_skip_file(struct archive *, __LA_INT64_T, __LA_INT64_T); -#endif /* Set flags to control how the next item gets created. * This accepts a bitmask of ARCHIVE_EXTRACT_XXX flags defined above. */ __LA_DECL int archive_write_disk_set_options(struct archive *, @@ -736,16 +679,6 @@ __LA_DECL int archive_write_disk_set_standard_lookup(struct archive *); * your needs, you can write your own and register them. Be sure to * include a cleanup function if you have allocated private data. */ -#if ARCHIVE_VERSION_NUMBER < 3000000 -__LA_DECL int archive_write_disk_set_group_lookup(struct archive *, - void * /* private_data */, - __LA_GID_T (*)(void *, const char *, __LA_GID_T), - void (* /* cleanup */)(void *)); -__LA_DECL int archive_write_disk_set_user_lookup(struct archive *, - void * /* private_data */, - __LA_UID_T (*)(void *, const char *, __LA_UID_T), - void (* /* cleanup */)(void *)); -#else __LA_DECL int archive_write_disk_set_group_lookup(struct archive *, void * /* private_data */, __LA_INT64_T (*)(void *, const char *, __LA_INT64_T), @@ -754,7 +687,6 @@ __LA_DECL int archive_write_disk_set_user_lookup(struct archive *, void * /* private_data */, __LA_INT64_T (*)(void *, const char *, __LA_INT64_T), void (* /* cleanup */)(void *)); -#endif /* * ARCHIVE_READ_DISK API @@ -775,27 +707,12 @@ __LA_DECL int archive_read_disk_entry_from_file(struct archive *, struct archive_entry *, int /* fd */, const struct stat *); /* Look up gname for gid or uname for uid. */ /* Default implementations are very, very stupid. */ -#if ARCHIVE_VERSION_NUMBER < 3000000 -__LA_DECL const char *archive_read_disk_gname(struct archive *, __LA_GID_T); -__LA_DECL const char *archive_read_disk_uname(struct archive *, __LA_UID_T); -#else __LA_DECL const char *archive_read_disk_gname(struct archive *, __LA_INT64_T); __LA_DECL const char *archive_read_disk_uname(struct archive *, __LA_INT64_T); -#endif /* "Standard" implementation uses getpwuid_r, getgrgid_r and caches the * results for performance. */ __LA_DECL int archive_read_disk_set_standard_lookup(struct archive *); /* You can install your own lookups if you like. */ -#if ARCHIVE_VERSION_NUMBER < 3000000 -__LA_DECL int archive_read_disk_set_gname_lookup(struct archive *, - void * /* private_data */, - const char *(* /* lookup_fn */)(void *, __LA_GID_T), - void (* /* cleanup_fn */)(void *)); -__LA_DECL int archive_read_disk_set_uname_lookup(struct archive *, - void * /* private_data */, - const char *(* /* lookup_fn */)(void *, __LA_UID_T), - void (* /* cleanup_fn */)(void *)); -#else __LA_DECL int archive_read_disk_set_gname_lookup(struct archive *, void * /* private_data */, const char *(* /* lookup_fn */)(void *, __LA_INT64_T), @@ -804,7 +721,6 @@ __LA_DECL int archive_read_disk_set_uname_lookup(struct archive *, void * /* private_data */, const char *(* /* lookup_fn */)(void *, __LA_INT64_T), void (* /* cleanup_fn */)(void *)); -#endif /* Start traversal. */ __LA_DECL int archive_read_disk_open(struct archive *, const char *); /* diff --git a/libarchive/archive_entry.c b/libarchive/archive_entry.c index deb0abed..93cf3ba9 100644 --- a/libarchive/archive_entry.c +++ b/libarchive/archive_entry.c @@ -384,13 +384,8 @@ archive_entry_fflags_text(struct archive_entry *entry) return (f); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -gid_t -archive_entry_gid(struct archive_entry *entry) -#else int64_t archive_entry_gid(struct archive_entry *entry) -#endif { return (entry->ae_stat.aest_gid); } @@ -423,19 +418,11 @@ archive_entry_hardlink_w(struct archive_entry *entry) return (NULL); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -ino_t -archive_entry_ino(struct archive_entry *entry) -{ - return (entry->ae_stat.aest_ino); -} -#else int64_t archive_entry_ino(struct archive_entry *entry) { return (entry->ae_stat.aest_ino); } -#endif int64_t archive_entry_ino64(struct archive_entry *entry) @@ -553,13 +540,8 @@ archive_entry_symlink_w(struct archive_entry *entry) return (NULL); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -uid_t -archive_entry_uid(struct archive_entry *entry) -#else int64_t archive_entry_uid(struct archive_entry *entry) -#endif { return (entry->ae_stat.aest_uid); } @@ -615,13 +597,8 @@ archive_entry_copy_fflags_text_w(struct archive_entry *entry, &entry->ae_fflags_set, &entry->ae_fflags_clear)); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -void -archive_entry_set_gid(struct archive_entry *entry, gid_t g) -#else void archive_entry_set_gid(struct archive_entry *entry, int64_t g) -#endif { entry->stat_valid = 0; entry->ae_stat.aest_gid = g; @@ -651,21 +628,12 @@ archive_entry_update_gname_utf8(struct archive_entry *entry, const char *name) return (archive_mstring_update_utf8(entry->archive, &entry->ae_gname, name)); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -void -archive_entry_set_ino(struct archive_entry *entry, unsigned long ino) -{ - entry->stat_valid = 0; - entry->ae_stat.aest_ino = ino; -} -#else void archive_entry_set_ino(struct archive_entry *entry, int64_t ino) { entry->stat_valid = 0; entry->ae_stat.aest_ino = ino; } -#endif void archive_entry_set_ino64(struct archive_entry *entry, int64_t ino) @@ -976,13 +944,8 @@ archive_entry_update_symlink_utf8(struct archive_entry *entry, const char *linkn return (archive_mstring_update_utf8(entry->archive, &entry->ae_symlink, linkname)); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -void -archive_entry_set_uid(struct archive_entry *entry, uid_t u) -#else void archive_entry_set_uid(struct archive_entry *entry, int64_t u) -#endif { entry->stat_valid = 0; entry->ae_stat.aest_uid = u; diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h index 905598b7..e0c46d90 100644 --- a/libarchive/archive_entry.h +++ b/libarchive/archive_entry.h @@ -213,20 +213,12 @@ __LA_DECL void archive_entry_fflags(struct archive_entry *, unsigned long * /* set */, unsigned long * /* clear */); __LA_DECL const char *archive_entry_fflags_text(struct archive_entry *); -#if ARCHIVE_VERSION_NUMBER < 3000000 -__LA_DECL __LA_GID_T archive_entry_gid(struct archive_entry *); -#else __LA_DECL __LA_INT64_T archive_entry_gid(struct archive_entry *); -#endif __LA_DECL const char *archive_entry_gname(struct archive_entry *); __LA_DECL const wchar_t *archive_entry_gname_w(struct archive_entry *); __LA_DECL const char *archive_entry_hardlink(struct archive_entry *); __LA_DECL const wchar_t *archive_entry_hardlink_w(struct archive_entry *); -#if ARCHIVE_VERSION_NUMBER < 3000000 -__LA_DECL __LA_INO_T archive_entry_ino(struct archive_entry *); -#else __LA_DECL __LA_INT64_T archive_entry_ino(struct archive_entry *); -#endif __LA_DECL __LA_INT64_T archive_entry_ino64(struct archive_entry *); __LA_DECL __LA_MODE_T archive_entry_mode(struct archive_entry *); __LA_DECL time_t archive_entry_mtime(struct archive_entry *); @@ -245,11 +237,7 @@ __LA_DECL int archive_entry_size_is_set(struct archive_entry *); __LA_DECL const char *archive_entry_strmode(struct archive_entry *); __LA_DECL const char *archive_entry_symlink(struct archive_entry *); __LA_DECL const wchar_t *archive_entry_symlink_w(struct archive_entry *); -#if ARCHIVE_VERSION_NUMBER < 3000000 -__LA_DECL __LA_UID_T archive_entry_uid(struct archive_entry *); -#else __LA_DECL __LA_INT64_T archive_entry_uid(struct archive_entry *); -#endif __LA_DECL const char *archive_entry_uname(struct archive_entry *); __LA_DECL const wchar_t *archive_entry_uname_w(struct archive_entry *); @@ -285,11 +273,7 @@ __LA_DECL const char *archive_entry_copy_fflags_text(struct archive_entry *, const char *); __LA_DECL const wchar_t *archive_entry_copy_fflags_text_w(struct archive_entry *, const wchar_t *); -#if ARCHIVE_VERSION_NUMBER < 3000000 -__LA_DECL void archive_entry_set_gid(struct archive_entry *, __LA_GID_T); -#else __LA_DECL void archive_entry_set_gid(struct archive_entry *, __LA_INT64_T); -#endif __LA_DECL void archive_entry_set_gname(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_gname(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_gname_w(struct archive_entry *, const wchar_t *); @@ -298,11 +282,7 @@ __LA_DECL void archive_entry_set_hardlink(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_hardlink(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_hardlink_w(struct archive_entry *, const wchar_t *); __LA_DECL int archive_entry_update_hardlink_utf8(struct archive_entry *, const char *); -#if ARCHIVE_VERSION_NUMBER < 3000000 -__LA_DECL void archive_entry_set_ino(struct archive_entry *, unsigned long); -#else __LA_DECL void archive_entry_set_ino(struct archive_entry *, __LA_INT64_T); -#endif __LA_DECL void archive_entry_set_ino64(struct archive_entry *, __LA_INT64_T); __LA_DECL void archive_entry_set_link(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_link(struct archive_entry *, const char *); @@ -327,11 +307,7 @@ __LA_DECL void archive_entry_set_symlink(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_symlink(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_symlink_w(struct archive_entry *, const wchar_t *); __LA_DECL int archive_entry_update_symlink_utf8(struct archive_entry *, const char *); -#if ARCHIVE_VERSION_NUMBER < 3000000 -__LA_DECL void archive_entry_set_uid(struct archive_entry *, __LA_UID_T); -#else __LA_DECL void archive_entry_set_uid(struct archive_entry *, __LA_INT64_T); -#endif __LA_DECL void archive_entry_set_uname(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_uname(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_uname_w(struct archive_entry *, const wchar_t *); diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c index ebfc5287..195da2a5 100644 --- a/libarchive/archive_read.c +++ b/libarchive/archive_read.c @@ -119,13 +119,8 @@ archive_read_new(void) /* * Record the do-not-extract-to file. This belongs in archive_read_extract.c. */ -#if ARCHIVE_VERSION_NUMBER < 3000000 -void -archive_read_extract_set_skip_file(struct archive *_a, dev_t d, ino_t i) -#else void archive_read_extract_set_skip_file(struct archive *_a, int64_t d, int64_t i) -#endif { struct archive_read *a = (struct archive_read *)_a; diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c index 59390480..e44987dd 100644 --- a/libarchive/archive_read_disk_posix.c +++ b/libarchive/archive_read_disk_posix.c @@ -329,13 +329,8 @@ static int _archive_read_data_block(struct archive *, const void **, size_t *, int64_t *); static int _archive_read_next_header2(struct archive *, struct archive_entry *); -#if ARCHIVE_VERSION_NUMBER < 3000000 -static const char *trivial_lookup_gname(void *, gid_t gid); -static const char *trivial_lookup_uname(void *, uid_t uid); -#else static const char *trivial_lookup_gname(void *, int64_t gid); static const char *trivial_lookup_uname(void *, int64_t uid); -#endif static int setup_sparse(struct archive_read_disk *, struct archive_entry *); static int close_and_restore_time(int fd, struct tree *, struct restore_time *); @@ -357,13 +352,8 @@ archive_read_disk_vtable(void) return (&av); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -const char * -archive_read_disk_gname(struct archive *_a, gid_t gid) -#else const char * archive_read_disk_gname(struct archive *_a, int64_t gid) -#endif { struct archive_read_disk *a = (struct archive_read_disk *)_a; if (ARCHIVE_OK != __archive_check_magic(_a, ARCHIVE_READ_DISK_MAGIC, @@ -374,13 +364,8 @@ archive_read_disk_gname(struct archive *_a, int64_t gid) return ((*a->lookup_gname)(a->lookup_gname_data, gid)); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -const char * -archive_read_disk_uname(struct archive *_a, uid_t uid) -#else const char * archive_read_disk_uname(struct archive *_a, int64_t uid) -#endif { struct archive_read_disk *a = (struct archive_read_disk *)_a; if (ARCHIVE_OK != __archive_check_magic(_a, ARCHIVE_READ_DISK_MAGIC, @@ -391,19 +376,11 @@ archive_read_disk_uname(struct archive *_a, int64_t uid) return ((*a->lookup_uname)(a->lookup_uname_data, uid)); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -int -archive_read_disk_set_gname_lookup(struct archive *_a, - void *private_data, - const char * (*lookup_gname)(void *private, gid_t gid), - void (*cleanup_gname)(void *private)) -#else int archive_read_disk_set_gname_lookup(struct archive *_a, void *private_data, const char * (*lookup_gname)(void *private, int64_t gid), void (*cleanup_gname)(void *private)) -#endif { struct archive_read_disk *a = (struct archive_read_disk *)_a; archive_check_magic(&a->archive, ARCHIVE_READ_DISK_MAGIC, @@ -418,19 +395,11 @@ archive_read_disk_set_gname_lookup(struct archive *_a, return (ARCHIVE_OK); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -int -archive_read_disk_set_uname_lookup(struct archive *_a, - void *private_data, - const char * (*lookup_uname)(void *private, uid_t uid), - void (*cleanup_uname)(void *private)) -#else int archive_read_disk_set_uname_lookup(struct archive *_a, void *private_data, const char * (*lookup_uname)(void *private, int64_t uid), void (*cleanup_uname)(void *private)) -#endif { struct archive_read_disk *a = (struct archive_read_disk *)_a; archive_check_magic(&a->archive, ARCHIVE_READ_DISK_MAGIC, @@ -593,26 +562,16 @@ archive_read_disk_set_atime_restored(struct archive *_a) * These are normally overridden by the client, but these stub * versions ensure that we always have something that works. */ -#if ARCHIVE_VERSION_NUMBER < 3000000 -static const char * -trivial_lookup_gname(void *private_data, gid_t gid) -#else static const char * trivial_lookup_gname(void *private_data, int64_t gid) -#endif { (void)private_data; /* UNUSED */ (void)gid; /* UNUSED */ return (NULL); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -static const char * -trivial_lookup_uname(void *private_data, uid_t uid) -#else static const char * trivial_lookup_uname(void *private_data, int64_t uid) -#endif { (void)private_data; /* UNUSED */ (void)uid; /* UNUSED */ diff --git a/libarchive/archive_read_disk_private.h b/libarchive/archive_read_disk_private.h index 5aae8432..2ff72282 100644 --- a/libarchive/archive_read_disk_private.h +++ b/libarchive/archive_read_disk_private.h @@ -66,18 +66,10 @@ struct archive_read_disk { unsigned char *entry_buff; size_t entry_buff_size; -#if ARCHIVE_VERSION_NUMBER < 3000000 - const char * (*lookup_gname)(void *private, gid_t gid); -#else const char * (*lookup_gname)(void *private, int64_t gid); -#endif void (*cleanup_gname)(void *private); void *lookup_gname_data; -#if ARCHIVE_VERSION_NUMBER < 3000000 - const char * (*lookup_uname)(void *private, uid_t uid); -#else const char * (*lookup_uname)(void *private, int64_t uid); -#endif void (*cleanup_uname)(void *private); void *lookup_uname_data; }; diff --git a/libarchive/archive_read_disk_set_standard_lookup.c b/libarchive/archive_read_disk_set_standard_lookup.c index c302b98d..7e9a671c 100644 --- a/libarchive/archive_read_disk_set_standard_lookup.c +++ b/libarchive/archive_read_disk_set_standard_lookup.c @@ -72,13 +72,8 @@ struct name_cache { } cache[name_cache_size]; }; -#if ARCHIVE_VERSION_NUMBER < 3000000 -static const char * lookup_gname(void *, gid_t); -static const char * lookup_uname(void *, uid_t); -#else static const char * lookup_gname(void *, int64_t); static const char * lookup_uname(void *, int64_t); -#endif static void cleanup(void *); static const char * lookup_gname_helper(struct name_cache *, id_t gid); static const char * lookup_uname_helper(struct name_cache *, id_t uid); @@ -179,13 +174,8 @@ lookup_name(struct name_cache *cache, return (cache->cache[slot].name); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -static const char * -lookup_uname(void *data, uid_t uid) -#else static const char * lookup_uname(void *data, int64_t uid) -#endif { struct name_cache *uname_cache = (struct name_cache *)data; return (lookup_name(uname_cache, @@ -248,13 +238,8 @@ lookup_uname_helper(struct name_cache *cache, id_t id) } #endif -#if ARCHIVE_VERSION_NUMBER < 3000000 -static const char * -lookup_gname(void *data, gid_t gid) -#else static const char * lookup_gname(void *data, int64_t gid) -#endif { struct name_cache *gname_cache = (struct name_cache *)data; return (lookup_name(gname_cache, diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c index 716913d0..89715de0 100644 --- a/libarchive/archive_read_disk_windows.c +++ b/libarchive/archive_read_disk_windows.c @@ -310,13 +310,8 @@ static int _archive_read_data_block(struct archive *, const void **, size_t *, int64_t *); static int _archive_read_next_header2(struct archive *, struct archive_entry *); -#if ARCHIVE_VERSION_NUMBER < 3000000 -static const char *trivial_lookup_gname(void *, gid_t gid); -static const char *trivial_lookup_uname(void *, uid_t uid); -#else static const char *trivial_lookup_gname(void *, int64_t gid); static const char *trivial_lookup_uname(void *, int64_t uid); -#endif static int setup_sparse(struct archive_read_disk *, struct archive_entry *); static int close_and_restore_time(int fd, struct tree *, struct restore_time *); @@ -341,13 +336,8 @@ archive_read_disk_vtable(void) return (&av); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -const char * -archive_read_disk_gname(struct archive *_a, gid_t gid) -#else const char * archive_read_disk_gname(struct archive *_a, int64_t gid) -#endif { struct archive_read_disk *a = (struct archive_read_disk *)_a; if (ARCHIVE_OK != __archive_check_magic(_a, ARCHIVE_READ_DISK_MAGIC, @@ -358,13 +348,8 @@ archive_read_disk_gname(struct archive *_a, int64_t gid) return ((*a->lookup_gname)(a->lookup_gname_data, gid)); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -const char * -archive_read_disk_uname(struct archive *_a, uid_t uid) -#else const char * archive_read_disk_uname(struct archive *_a, int64_t uid) -#endif { struct archive_read_disk *a = (struct archive_read_disk *)_a; if (ARCHIVE_OK != __archive_check_magic(_a, ARCHIVE_READ_DISK_MAGIC, @@ -375,19 +360,11 @@ archive_read_disk_uname(struct archive *_a, int64_t uid) return ((*a->lookup_uname)(a->lookup_uname_data, uid)); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -int -archive_read_disk_set_gname_lookup(struct archive *_a, - void *private_data, - const char * (*lookup_gname)(void *private, gid_t gid), - void (*cleanup_gname)(void *private)) -#else int archive_read_disk_set_gname_lookup(struct archive *_a, void *private_data, const char * (*lookup_gname)(void *private, int64_t gid), void (*cleanup_gname)(void *private)) -#endif { struct archive_read_disk *a = (struct archive_read_disk *)_a; archive_check_magic(&a->archive, ARCHIVE_READ_DISK_MAGIC, @@ -402,19 +379,11 @@ archive_read_disk_set_gname_lookup(struct archive *_a, return (ARCHIVE_OK); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -int -archive_read_disk_set_uname_lookup(struct archive *_a, - void *private_data, - const char * (*lookup_uname)(void *private, uid_t uid), - void (*cleanup_uname)(void *private)) -#else int archive_read_disk_set_uname_lookup(struct archive *_a, void *private_data, const char * (*lookup_uname)(void *private, int64_t uid), void (*cleanup_uname)(void *private)) -#endif { struct archive_read_disk *a = (struct archive_read_disk *)_a; archive_check_magic(&a->archive, ARCHIVE_READ_DISK_MAGIC, @@ -563,26 +532,16 @@ archive_read_disk_set_atime_restored(struct archive *_a) * These are normally overridden by the client, but these stub * versions ensure that we always have something that works. */ -#if ARCHIVE_VERSION_NUMBER < 3000000 -static const char * -trivial_lookup_gname(void *private_data, gid_t gid) -#else static const char * trivial_lookup_gname(void *private_data, int64_t gid) -#endif { (void)private_data; /* UNUSED */ (void)gid; /* UNUSED */ return (NULL); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -static const char * -trivial_lookup_uname(void *private_data, uid_t uid) -#else static const char * trivial_lookup_uname(void *private_data, int64_t uid) -#endif { (void)private_data; /* UNUSED */ (void)uid; /* UNUSED */ diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c index b1919752..caf4fd8c 100644 --- a/libarchive/archive_write.c +++ b/libarchive/archive_write.c @@ -191,13 +191,8 @@ archive_write_get_bytes_in_last_block(struct archive *_a) * dev/ino of a file to be rejected. Used to prevent adding * an archive to itself recursively. */ -#if ARCHIVE_VERSION_NUMBER < 3000000 -int -archive_write_set_skip_file(struct archive *_a, dev_t d, ino_t i) -#else int archive_write_set_skip_file(struct archive *_a, int64_t d, int64_t i) -#endif { struct archive_write *a = (struct archive_write *)_a; archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC, diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c index 7cb12664..1478bd9a 100644 --- a/libarchive/archive_write_disk.c +++ b/libarchive/archive_write_disk.c @@ -189,18 +189,10 @@ struct archive_write_disk { ino_t skip_file_ino; time_t start_time; -#if ARCHIVE_VERSION_NUMBER < 3000000 - gid_t (*lookup_gid)(void *private, const char *gname, gid_t gid); -#else int64_t (*lookup_gid)(void *private, const char *gname, int64_t gid); -#endif void (*cleanup_gid)(void *private); void *lookup_gid_data; -#if ARCHIVE_VERSION_NUMBER < 3000000 - uid_t (*lookup_uid)(void *private, const char *uname, uid_t uid); -#else int64_t (*lookup_uid)(void *private, const char *uname, int64_t uid); -#endif void (*cleanup_uid)(void *private); void *lookup_uid_data; @@ -293,13 +285,8 @@ static int set_times(struct archive_write_disk *, int, int, const char *, time_t, long, time_t, long, time_t, long, time_t, long); static int set_times_from_entry(struct archive_write_disk *); static struct fixup_entry *sort_dir_list(struct fixup_entry *p); -#if ARCHIVE_VERSION_NUMBER < 3000000 -static gid_t trivial_lookup_gid(void *, const char *, gid_t); -static uid_t trivial_lookup_uid(void *, const char *, uid_t); -#else static int64_t trivial_lookup_gid(void *, const char *, int64_t); static int64_t trivial_lookup_uid(void *, const char *, int64_t); -#endif static ssize_t write_data_block(struct archive_write_disk *, const char *, size_t); @@ -652,13 +639,8 @@ _archive_write_disk_header(struct archive *_a, struct archive_entry *entry) return (ret); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -int -archive_write_disk_set_skip_file(struct archive *_a, dev_t d, ino_t i) -#else int archive_write_disk_set_skip_file(struct archive *_a, int64_t d, int64_t i) -#endif { struct archive_write_disk *a = (struct archive_write_disk *)_a; archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, @@ -945,19 +927,11 @@ _archive_write_disk_finish_entry(struct archive *_a) return (ret); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -int -archive_write_disk_set_group_lookup(struct archive *_a, - void *private_data, - gid_t (*lookup_gid)(void *private, const char *gname, gid_t gid), - void (*cleanup_gid)(void *private)) -#else int archive_write_disk_set_group_lookup(struct archive *_a, void *private_data, int64_t (*lookup_gid)(void *private, const char *gname, int64_t gid), void (*cleanup_gid)(void *private)) -#endif { struct archive_write_disk *a = (struct archive_write_disk *)_a; archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, @@ -969,19 +943,11 @@ archive_write_disk_set_group_lookup(struct archive *_a, return (ARCHIVE_OK); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -int -archive_write_disk_set_user_lookup(struct archive *_a, - void *private_data, - uid_t (*lookup_uid)(void *private, const char *uname, uid_t uid), - void (*cleanup_uid)(void *private)) -#else int archive_write_disk_set_user_lookup(struct archive *_a, void *private_data, int64_t (*lookup_uid)(void *private, const char *uname, int64_t uid), void (*cleanup_uid)(void *private)) -#endif { struct archive_write_disk *a = (struct archive_write_disk *)_a; archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, @@ -2912,26 +2878,16 @@ set_xattrs(struct archive_write_disk *a) * These are normally overridden by the client, but these stub * versions ensure that we always have something that works. */ -#if ARCHIVE_VERSION_NUMBER < 3000000 -static gid_t -trivial_lookup_gid(void *private_data, const char *gname, gid_t gid) -#else static int64_t trivial_lookup_gid(void *private_data, const char *gname, int64_t gid) -#endif { (void)private_data; /* UNUSED */ (void)gname; /* UNUSED */ return (gid); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -static uid_t -trivial_lookup_uid(void *private_data, const char *uname, uid_t uid) -#else static int64_t trivial_lookup_uid(void *private_data, const char *uname, int64_t uid) -#endif { (void)private_data; /* UNUSED */ (void)uname; /* UNUSED */ diff --git a/libarchive/archive_write_disk_set_standard_lookup.c b/libarchive/archive_write_disk_set_standard_lookup.c index ce9b7923..5ee89a79 100644 --- a/libarchive/archive_write_disk_set_standard_lookup.c +++ b/libarchive/archive_write_disk_set_standard_lookup.c @@ -58,13 +58,8 @@ struct bucket { static const size_t cache_size = 127; static unsigned int hash(const char *); -#if ARCHIVE_VERSION_NUMBER < 3000000 -static gid_t lookup_gid(void *, const char *uname, gid_t); -static uid_t lookup_uid(void *, const char *uname, uid_t); -#else static int64_t lookup_gid(void *, const char *uname, int64_t); static int64_t lookup_uid(void *, const char *uname, int64_t); -#endif static void cleanup(void *); /* @@ -98,13 +93,8 @@ archive_write_disk_set_standard_lookup(struct archive *a) return (ARCHIVE_OK); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -static gid_t -lookup_gid(void *private_data, const char *gname, gid_t gid) -#else static int64_t lookup_gid(void *private_data, const char *gname, int64_t gid) -#endif { int h; struct bucket *b; @@ -173,13 +163,8 @@ lookup_gid(void *private_data, const char *gname, int64_t gid) return (gid); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -static uid_t -lookup_uid(void *private_data, const char *uname, uid_t uid) -#else static int64_t lookup_uid(void *private_data, const char *uname, int64_t uid) -#endif { int h; struct bucket *b; diff --git a/libarchive/test/read_open_memory.c b/libarchive/test/read_open_memory.c index 68d78b12..960cf63a 100644 --- a/libarchive/test/read_open_memory.c +++ b/libarchive/test/read_open_memory.c @@ -49,11 +49,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); static int read_open_memory_internal(struct archive *a, void *buff, size_t size, size_t read_size, int fullapi); @@ -141,13 +137,8 @@ memory_read(struct archive *a, void *client_data, const void **buff) /* * How mean can a skip() routine be? Let's try to find out. */ -#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; diff --git a/libarchive/test/test_archive_api_feature.c b/libarchive/test/test_archive_api_feature.c index 0d559f02..dab24eac 100644 --- a/libarchive/test/test_archive_api_feature.c +++ b/libarchive/test/test_archive_api_feature.c @@ -47,20 +47,4 @@ DEFINE_TEST(test_archive_api_feature) failure("Version string is: %s", archive_version_string()); assert(*p == '\0'); } - -/* This is all scheduled to disappear in libarchive 3.0 */ -#if ARCHIVE_VERSION_NUMBER < 3000000 - assertEqualInt(ARCHIVE_VERSION_STAMP, ARCHIVE_VERSION_NUMBER); - assertEqualInt(ARCHIVE_API_FEATURE, archive_api_feature()); - assertEqualInt(ARCHIVE_API_VERSION, archive_api_version()); - /* - * Even though ARCHIVE_VERSION_STAMP only appears in - * archive.h after 1.9.0 and 2.2.3, the macro is synthesized - * in test.h, so this test is always valid. - */ - assertEqualInt(ARCHIVE_VERSION_STAMP / 1000, ARCHIVE_API_VERSION * 1000 + ARCHIVE_API_FEATURE); - - assertEqualInt(ARCHIVE_VERSION_STAMP, archive_version_stamp()); - assertEqualString(ARCHIVE_LIBRARY_VERSION, archive_version()); -#endif } diff --git a/libarchive/test/test_fuzz.c b/libarchive/test/test_fuzz.c index 449d3cbf..77f4270a 100644 --- a/libarchive/test/test_fuzz.c +++ b/libarchive/test/test_fuzz.c @@ -76,11 +76,7 @@ DEFINE_TEST(test_fuzz) { const void *blk; size_t blk_size; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t blk_offset; -#else int64_t blk_offset; -#endif int n; for (n = 0; files[n].name != NULL; ++n) { diff --git a/libarchive/test/test_read_disk.c b/libarchive/test/test_read_disk.c index f3afe7ec..b69e55cf 100644 --- a/libarchive/test/test_read_disk.c +++ b/libarchive/test/test_read_disk.c @@ -33,13 +33,8 @@ gname_cleanup(void *d) *mp = 0x2468; } -#if ARCHIVE_VERSION_NUMBER < 3000000 -static const char * -gname_lookup(void *d, gid_t g) -#else static const char * gname_lookup(void *d, int64_t g) -#endif { int *mp = d; assertEqualInt(*mp, 0x13579); @@ -56,13 +51,8 @@ uname_cleanup(void *d) *mp = 0x2345; } -#if ARCHIVE_VERSION_NUMBER < 3000000 -static const char * -uname_lookup(void *d, uid_t u) -#else static const char * uname_lookup(void *d, int64_t u) -#endif { int *mp = d; assertEqualInt(*mp, 0x1234); diff --git a/libarchive/test/test_read_disk_entry_from_file.c b/libarchive/test/test_read_disk_entry_from_file.c index 471c466b..7a41034a 100644 --- a/libarchive/test/test_read_disk_entry_from_file.c +++ b/libarchive/test/test_read_disk_entry_from_file.c @@ -25,26 +25,16 @@ #include "test.h" __FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_disk_entry_from_file.c 201247 2009-12-30 05:59:21Z kientzle $"); -#if ARCHIVE_VERSION_NUMBER < 3000000 -static const char * -gname_lookup(void *d, gid_t g) -#else static const char * gname_lookup(void *d, int64_t g) -#endif { (void)d; /* UNUSED */ (void)g; /* UNUSED */ return ("FOOGROUP"); } -#if ARCHIVE_VERSION_NUMBER < 3000000 -static const char * -uname_lookup(void *d, uid_t u) -#else static const char * uname_lookup(void *d, int64_t u) -#endif { (void)d; /* UNUSED */ (void)u; /* UNUSED */ diff --git a/libarchive/test/test_read_format_gtar_sparse.c b/libarchive/test/test_read_format_gtar_sparse.c index 10e78984..9a3511e9 100644 --- a/libarchive/test/test_read_format_gtar_sparse.c +++ b/libarchive/test/test_read_format_gtar_sparse.c @@ -27,11 +27,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_gtar_sparse.c 1893 struct contents { -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t o; -#else int64_t o; -#endif size_t s; const char *d; }; diff --git a/libarchive/test/test_read_format_iso_multi_extent.c b/libarchive/test/test_read_format_iso_multi_extent.c index 3df52baa..2230d8e2 100644 --- a/libarchive/test/test_read_format_iso_multi_extent.c +++ b/libarchive/test/test_read_format_iso_multi_extent.c @@ -33,11 +33,7 @@ DEFINE_TEST(test_read_format_iso_multi_extent) struct archive *a; const void *p; size_t size; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t offset; -#else int64_t offset; -#endif int i; extract_reference_file(refname); diff --git a/libarchive/test/test_read_format_iso_xorriso.c b/libarchive/test/test_read_format_iso_xorriso.c index b4bbfed6..c503a711 100644 --- a/libarchive/test/test_read_format_iso_xorriso.c +++ b/libarchive/test/test_read_format_iso_xorriso.c @@ -71,11 +71,7 @@ DEFINE_TEST(test_read_format_iso_xorriso) struct archive *a; const void *p; size_t size; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t offset; -#else int64_t offset; -#endif int i; extract_reference_file(refname); diff --git a/libarchive/test/test_read_format_isojoliet_bz2.c b/libarchive/test/test_read_format_isojoliet_bz2.c index 7f723b82..971de0dc 100644 --- a/libarchive/test/test_read_format_isojoliet_bz2.c +++ b/libarchive/test/test_read_format_isojoliet_bz2.c @@ -59,11 +59,7 @@ DEFINE_TEST(test_read_format_isojoliet_bz2) struct archive *a; const void *p; size_t size; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t offset; -#else int64_t offset; -#endif extract_reference_file(refname); assert((a = archive_read_new()) != NULL); diff --git a/libarchive/test/test_read_format_isojoliet_long.c b/libarchive/test/test_read_format_isojoliet_long.c index 0a84744a..6904a36a 100644 --- a/libarchive/test/test_read_format_isojoliet_long.c +++ b/libarchive/test/test_read_format_isojoliet_long.c @@ -64,11 +64,7 @@ DEFINE_TEST(test_read_format_isojoliet_long) struct archive *a; const void *p; size_t size; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t offset; -#else int64_t offset; -#endif int i; for (i = 0; i < 100; i++) diff --git a/libarchive/test/test_read_format_isojoliet_rr.c b/libarchive/test/test_read_format_isojoliet_rr.c index d1afdb5f..cd54bddf 100644 --- a/libarchive/test/test_read_format_isojoliet_rr.c +++ b/libarchive/test/test_read_format_isojoliet_rr.c @@ -62,11 +62,7 @@ DEFINE_TEST(test_read_format_isojoliet_rr) struct archive *a; const void *p; size_t size; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t offset; -#else int64_t offset; -#endif extract_reference_file(refname); assert((a = archive_read_new()) != NULL); diff --git a/libarchive/test/test_read_format_isorr_bz2.c b/libarchive/test/test_read_format_isorr_bz2.c index 7b7f7df9..68191db1 100644 --- a/libarchive/test/test_read_format_isorr_bz2.c +++ b/libarchive/test/test_read_format_isorr_bz2.c @@ -59,11 +59,7 @@ DEFINE_TEST(test_read_format_isorr_bz2) struct archive *a; const void *p; size_t size; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t offset; -#else int64_t offset; -#endif int i; extract_reference_file(refname); diff --git a/libarchive/test/test_read_format_isorr_ce.c b/libarchive/test/test_read_format_isorr_ce.c index dc664837..d4ca1602 100644 --- a/libarchive/test/test_read_format_isorr_ce.c +++ b/libarchive/test/test_read_format_isorr_ce.c @@ -92,11 +92,7 @@ DEFINE_TEST(test_read_format_isorr_ce) struct archive *a; const void *p; size_t size; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t offset; -#else int64_t offset; -#endif int i; mkpath(path1, 151); diff --git a/libarchive/test/test_read_format_isorr_new_bz2.c b/libarchive/test/test_read_format_isorr_new_bz2.c index d71d4d23..12d97686 100644 --- a/libarchive/test/test_read_format_isorr_new_bz2.c +++ b/libarchive/test/test_read_format_isorr_new_bz2.c @@ -60,11 +60,7 @@ DEFINE_TEST(test_read_format_isorr_new_bz2) struct archive *a; const void *p; size_t size; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t offset; -#else int64_t offset; -#endif int i; extract_reference_file(refname); diff --git a/libarchive/test/test_read_format_isorr_rr_moved.c b/libarchive/test/test_read_format_isorr_rr_moved.c index a90677f2..05aa97e6 100644 --- a/libarchive/test/test_read_format_isorr_rr_moved.c +++ b/libarchive/test/test_read_format_isorr_rr_moved.c @@ -65,11 +65,7 @@ DEFINE_TEST(test_read_format_isorr_rr_moved) struct archive *a; const void *p; size_t size; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t offset; -#else int64_t offset; -#endif int i; extract_reference_file(refname); diff --git a/libarchive/test/test_read_format_isozisofs_bz2.c b/libarchive/test/test_read_format_isozisofs_bz2.c index c3705bb8..020d399b 100644 --- a/libarchive/test/test_read_format_isozisofs_bz2.c +++ b/libarchive/test/test_read_format_isozisofs_bz2.c @@ -58,11 +58,7 @@ DEFINE_TEST(test_read_format_isozisofs_bz2) struct archive *a; const void *p; size_t size; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t offset; -#else int64_t offset; -#endif int i; extract_reference_file(refname); diff --git a/libarchive/test/test_read_format_xar.c b/libarchive/test/test_read_format_xar.c index dbc8a618..ff1f8c12 100644 --- a/libarchive/test/test_read_format_xar.c +++ b/libarchive/test/test_read_format_xar.c @@ -83,11 +83,7 @@ static void verify0(struct archive *a, struct archive_entry *ae) { const void *p; size_t size; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t offset; -#else int64_t offset; -#endif assert(archive_entry_filetype(ae) == AE_IFREG); assertEqualInt(archive_entry_mode(ae) & 0777, 0644); diff --git a/libarchive/test/test_read_format_zip.c b/libarchive/test/test_read_format_zip.c index c1da4015..24c7eab6 100644 --- a/libarchive/test/test_read_format_zip.c +++ b/libarchive/test/test_read_format_zip.c @@ -41,11 +41,7 @@ test_basic() char *buff[128]; const void *pv; size_t s; -#if ARCHIVE_VERSION_NUMBER < 3000000 - off_t o; -#else int64_t o; -#endif int r; extract_reference_file(refname); diff --git a/libarchive/test/test_tar_large.c b/libarchive/test/test_tar_large.c index 5701181f..626f9f08 100644 --- a/libarchive/test/test_tar_large.c +++ b/libarchive/test/test_tar_large.c @@ -73,11 +73,7 @@ struct memdata { #define GB ((int64_t)1024 * MB) #define TB ((int64_t)1024 * GB) -#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); static ssize_t memory_write(struct archive *, void *, const void *, size_t); @@ -167,13 +163,8 @@ memory_read(struct archive *a, void *_private, const void **buff) } -#if ARCHIVE_VERSION_NUMBER < 3000000 -static off_t -memory_read_skip(struct archive *a, void *_private, off_t skip) -#else static int64_t memory_read_skip(struct archive *a, void *_private, int64_t skip) -#endif { struct memdata *private = _private; |