diff options
Diffstat (limited to 'contrib/libarchive/libarchive/test/test_tar_large.c')
| -rw-r--r-- | contrib/libarchive/libarchive/test/test_tar_large.c | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/contrib/libarchive/libarchive/test/test_tar_large.c b/contrib/libarchive/libarchive/test/test_tar_large.c index 92ca839..6fb7776 100644 --- a/contrib/libarchive/libarchive/test/test_tar_large.c +++ b/contrib/libarchive/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 < 2000000 -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 int64_t memory_read_skip(struct archive *, void *, int64_t request); static ssize_t memory_read(struct archive *, void *, const void **buff); static ssize_t memory_write(struct archive *, void *, const void *, size_t); @@ -167,18 +163,8 @@ memory_read(struct archive *a, void *_private, const void **buff) } -#if ARCHIVE_VERSION_NUMBER < 2000000 -static ssize_t -memory_read_skip(struct archive *a, void *private, size_t skip) -{ - (void)a; /* UNUSED */ - (void)private; /* UNUSED */ - (void)skip; /* UNUSED */ - return (0); -} -#else -static off_t -memory_read_skip(struct archive *a, void *_private, off_t skip) +static int64_t +memory_read_skip(struct archive *a, void *_private, int64_t skip) { struct memdata *private = _private; @@ -197,7 +183,6 @@ memory_read_skip(struct archive *a, void *_private, off_t skip) } return (skip); } -#endif DEFINE_TEST(test_tar_large) { @@ -270,12 +255,8 @@ DEFINE_TEST(test_tar_large) /* Close out the archive. */ - assertA(0 == archive_write_close(a)); -#if ARCHIVE_VERSION_NUMBER < 2000000 - archive_write_finish(a); -#else - assertA(0 == archive_write_finish(a)); -#endif + assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Open the same archive for reading. @@ -300,12 +281,8 @@ DEFINE_TEST(test_tar_large) assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); /* Close out the archive. */ - assertA(0 == archive_read_close(a)); -#if ARCHIVE_VERSION_NUMBER < 2000000 - archive_read_finish(a); -#else - assertA(0 == archive_read_finish(a)); -#endif + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); free(memdata.buff); free(filedata); |
