Rip out the remaining support for old libarchive 1.x APIs.

SVN-Revision: 1886

diff --git a/libarchive/archive.h b/libarchive/archive.h
index e534068b294ca8fa8ce1e86e8aedf96caccd769f..8ff934a2e222d82449e6dae868374ca04d3868ca 100644 (file)
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -204,12 +204,7 @@ 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 < 2000000
-/* Libarchive 1.0 used ssize_t for the return, which is only 32 bits
- * on most 32-bit platforms; not large enough. */
-typedef __LA_SSIZE_T   archive_skip_callback(struct archive *,
-                           void *_client_data, size_t request);
-#elif ARCHIVE_VERSION_NUMBER < 3000000
+#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 *,
@@ -488,12 +483,7 @@ __LA_DECL void             archive_read_extract_set_skip_file(struct archive *,
 __LA_DECL int           archive_read_close(struct archive *);
 /* Release all resources and destroy the object. */
 /* Note that archive_read_finish will call archive_read_close for you. */
-#if ARCHIVE_VERSION_NUMBER < 2000000
-/* Erroneously declared to return void in libarchive 1.x */
-__LA_DECL void          archive_read_finish(struct archive *);
-#else
 __LA_DECL int           archive_read_finish(struct archive *);
-#endif
 
 /*-
  * To create an archive:
@@ -567,15 +557,9 @@ __LA_DECL int               archive_write_open_memory(struct archive *,
  */
 __LA_DECL int           archive_write_header(struct archive *,
                     struct archive_entry *);
-#if ARCHIVE_VERSION_NUMBER < 2000000
-/* This was erroneously declared to return "int" in libarchive 1.x. */
-__LA_DECL int           archive_write_data(struct archive *,
-                           const void *, size_t);
-#else
 /* Libarchive 2.0 and later return ssize_t here. */
 __LA_DECL __LA_SSIZE_T  archive_write_data(struct archive *,
                            const void *, size_t);
-#endif
 
 #if ARCHIVE_VERSION_NUMBER < 3000000
 /* Libarchive 1.x and 2.x use off_t for the argument, but that's not
@@ -589,15 +573,10 @@ __LA_DECL __LA_SSIZE_T     archive_write_data_block(struct archive *,
 #endif
 __LA_DECL int           archive_write_finish_entry(struct archive *);
 __LA_DECL int           archive_write_close(struct archive *);
-#if ARCHIVE_VERSION_NUMBER < 2000000
-/* Return value was incorrect in libarchive 1.x. */
-__LA_DECL void          archive_write_finish(struct archive *);
-#else
 /* Libarchive 2.x and later returns an error if this fails. */
 /* It can fail if the archive wasn't already closed, in which case
  * archive_write_finish() will implicitly call archive_write_close(). */
 __LA_DECL int           archive_write_finish(struct archive *);
-#endif
 
 /*
  * Set write options.

diff --git a/libarchive/test/test_acl_basic.c b/libarchive/test/test_acl_basic.c
index f66014cdd31b467e236b9478f21655e151937f91..ae8e75d5caa5c113a72834fbba9e6c6cc3bad1bc 100644 (file)
--- a/libarchive/test/test_acl_basic.c
+++ b/libarchive/test/test_acl_basic.c
@@ -164,12 +164,7 @@ compare_acls(struct archive_entry *ae, struct acl_t *acls, int n, int mode)
                        assert(matched == 1);
                }
        }
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       /* Known broken before 1.9.0. */
-       skipping("archive_entry_acl_next() exits with ARCHIVE_EOF");
-#else
        assertEqualInt(ARCHIVE_EOF, r);
-#endif
        assert((mode & 0777) == (archive_entry_mode(ae) & 0777));
        failure("Could not find match for ACL "
            "(type=%d,permset=%d,tag=%d,qual=%d,name=``%s'')",

diff --git a/libarchive/test/test_acl_pax.c b/libarchive/test/test_acl_pax.c
index 1f0468ca115a9b74c6335a6de1d6a1f40eb7dcd3..a8cf5addc5ae33b0cb03d2f418fc7469241eaa42 100644 (file)
--- a/libarchive/test/test_acl_pax.c
+++ b/libarchive/test/test_acl_pax.c
@@ -386,12 +386,7 @@ compare_acls(struct archive_entry *ae, struct acl_t *acls, int n, int mode)
                        assert(matched == 1);
                }
        }
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       /* Known broken before 1.9.0. */
-       skipping("archive_entry_acl_next() exits with ARCHIVE_EOF");
-#else
        assertEqualInt(ARCHIVE_EOF, r);
-#endif
        assert((mode & 0777) == (archive_entry_mode(ae) & 0777));
        failure("Could not find match for ACL "
            "(type=%d,permset=%d,tag=%d,qual=%d,name=``%s'')",
@@ -446,11 +441,7 @@ DEFINE_TEST(test_acl_pax)
 
        /* 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
 
        /* Write out the data we generated to a file for manual inspection. */
        assert(NULL != (f = fopen("testout", "wb")));
@@ -509,9 +500,5 @@ DEFINE_TEST(test_acl_pax)
 
        /* Close 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
 }

diff --git a/libarchive/test/test_archive_api_feature.c b/libarchive/test/test_archive_api_feature.c
index 23a7083c07fa740ad44d3c6d8feca8e4ebe40e09..0d559f021b8cc0779abfa3e3903c4ea904f8243e 100644 (file)
--- a/libarchive/test/test_archive_api_feature.c
+++ b/libarchive/test/test_archive_api_feature.c
@@ -59,18 +59,8 @@ DEFINE_TEST(test_archive_api_feature)
         * in test.h, so this test is always valid.
         */
        assertEqualInt(ARCHIVE_VERSION_STAMP / 1000, ARCHIVE_API_VERSION * 1000 + ARCHIVE_API_FEATURE);
-       /*
-        * The function, however, isn't always available.  It appeared
-        * sometime in the middle of 2.2.3, but the synthesized value
-        * never has a release version, so the following conditional
-        * exactly determines whether the current library has the
-        * function.
-        */
-#if ARCHIVE_VERSION_STAMP / 1000 == 1009 || ARCHIVE_VERSION_STAMP > 2002000
+
        assertEqualInt(ARCHIVE_VERSION_STAMP, archive_version_stamp());
-#else
-       skipping("archive_version_stamp()");
-#endif
        assertEqualString(ARCHIVE_LIBRARY_VERSION, archive_version());
 #endif
 }

diff --git a/libarchive/test/test_bad_fd.c b/libarchive/test/test_bad_fd.c
index 3ea7daacf2e5ebb28fc17d4d2ec80e0edefc8234..c5367d69c00c0b19dd69477035a06d305c799fe3 100644 (file)
--- a/libarchive/test/test_bad_fd.c
+++ b/libarchive/test/test_bad_fd.c
@@ -33,9 +33,5 @@ DEFINE_TEST(test_bad_fd)
        assertA(0 == archive_read_support_compression_all(a));
        assertA(ARCHIVE_FATAL == archive_read_open_fd(a, -1, 1024));
        assertA(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assertA(0 == archive_read_finish(a));
-#endif
 }

diff --git a/libarchive/test/test_compat_gtar.c b/libarchive/test/test_compat_gtar.c
index c0a69598e98f5bda5cc47075f869b9761c69d59d..75262601a9840e9c6461949124b4050e18268a8b 100644 (file)
--- a/libarchive/test/test_compat_gtar.c
+++ b/libarchive/test/test_compat_gtar.c
@@ -103,11 +103,7 @@ test_compat_gtar_1(void)
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
-#endif
 }
 
 

diff --git a/libarchive/test/test_compat_tar_hardlink.c b/libarchive/test/test_compat_tar_hardlink.c
index 30785d1fb0c1e5dd4f99de0fa02d512b3774951d..8490c9d976596120c8b7150aaf751bbc28408bad 100644 (file)
--- a/libarchive/test/test_compat_tar_hardlink.c
+++ b/libarchive/test/test_compat_tar_hardlink.c
@@ -93,11 +93,7 @@ test_compat_tar_hardlink_1(void)
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
-#endif
 }
 
 DEFINE_TEST(test_compat_tar_hardlink)

diff --git a/libarchive/test/test_compat_zip.c b/libarchive/test/test_compat_zip.c
index d8bc4de360806944cd9cc72841caab6bd795b3b9..d7397efd4c3042f6069967ff9113637328895014 100644 (file)
--- a/libarchive/test/test_compat_zip.c
+++ b/libarchive/test/test_compat_zip.c
@@ -64,11 +64,7 @@ test_compat_zip_1(void)
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));
 finish:
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
-#endif
 }
 
 

diff --git a/libarchive/test/test_entry.c b/libarchive/test/test_entry.c
index cedc88a15c0ad3b36950d6b8d2b4d9318ac98fbb..2f82504ac607ca7ab96fb4441f37c369b17d4a9f 100644 (file)
--- a/libarchive/test/test_entry.c
+++ b/libarchive/test/test_entry.c
@@ -142,22 +142,14 @@ DEFINE_TEST(test_entry)
        assertEqualInt(archive_entry_ctime_nsec(e), 0);
        assert(!archive_entry_ctime_is_set(e));
 
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        /* dev */
        archive_entry_set_dev(e, 235);
        assertEqualInt(archive_entry_dev(e), 235);
-#else
-       skipping("archive_entry_dev()");
-#endif
        /* devmajor/devminor are tested specially below. */
 
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        /* filetype */
        archive_entry_set_filetype(e, AE_IFREG);
        assertEqualInt(archive_entry_filetype(e), AE_IFREG);
-#else
-       skipping("archive_entry_filetype()");
-#endif
 
        /* fflags are tested specially below */
 
@@ -193,13 +185,10 @@ DEFINE_TEST(test_entry)
        archive_entry_copy_hardlink_w(e, NULL);
        assertEqualString(archive_entry_hardlink(e), NULL);
        assertEqualWString(archive_entry_hardlink_w(e), NULL);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
+
        /* ino */
        archive_entry_set_ino(e, 8593);
        assertEqualInt(archive_entry_ino(e), 8593);
-#else
-       skipping("archive_entry_ino()");
-#endif
 
        /* link */
        archive_entry_set_hardlink(e, "hardlinkname");
@@ -250,13 +239,9 @@ DEFINE_TEST(test_entry)
        assertEqualInt(archive_entry_mtime_nsec(e), 0);
        assert(!archive_entry_mtime_is_set(e));
 
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        /* nlink */
        archive_entry_set_nlink(e, 736);
        assertEqualInt(archive_entry_nlink(e), 736);
-#else
-       skipping("archive_entry_nlink()");
-#endif
 
        /* pathname */
        archive_entry_set_pathname(e, "path");
@@ -274,13 +259,9 @@ DEFINE_TEST(test_entry)
        memset(wbuff, 0, sizeof(wbuff));
        assertEqualWString(archive_entry_pathname_w(e), L"wpath");
 
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        /* rdev */
        archive_entry_set_rdev(e, 532);
        assertEqualInt(archive_entry_rdev(e), 532);
-#else
-       skipping("archive_entry_rdev()");
-#endif
        /* rdevmajor/rdevminor are tested specially below. */
 
        /* size */
@@ -297,13 +278,11 @@ DEFINE_TEST(test_entry)
        /* symlink */
        archive_entry_set_symlink(e, "symlinkname");
        assertEqualString(archive_entry_symlink(e), "symlinkname");
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        strcpy(buff, "symlinkname2");
        archive_entry_copy_symlink(e, buff);
        assertEqualString(archive_entry_symlink(e), "symlinkname2");
        memset(buff, 0, sizeof(buff));
        assertEqualString(archive_entry_symlink(e), "symlinkname2");
-#endif
        archive_entry_copy_symlink_w(e, NULL);
        assertEqualWString(archive_entry_symlink_w(e), NULL);
        assertEqualString(archive_entry_symlink(e), NULL);
@@ -394,25 +373,17 @@ DEFINE_TEST(test_entry)
        archive_entry_set_atime(e, 13579, 24680);
        archive_entry_set_birthtime(e, 13779, 24990);
        archive_entry_set_ctime(e, 13580, 24681);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_dev(e, 235);
-#endif
        archive_entry_set_fflags(e, 0x55, 0xAA);
        archive_entry_set_gid(e, 204);
        archive_entry_set_gname(e, "group");
        archive_entry_set_hardlink(e, "hardlinkname");
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_ino(e, 8593);
-#endif
        archive_entry_set_mode(e, 0123456);
        archive_entry_set_mtime(e, 13581, 24682);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_nlink(e, 736);
-#endif
        archive_entry_set_pathname(e, "path");
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_rdev(e, 532);
-#endif
        archive_entry_set_size(e, 987654321);
        archive_entry_copy_sourcepath(e, "source");
        archive_entry_set_symlink(e, "symlinkname");
@@ -434,36 +405,26 @@ DEFINE_TEST(test_entry)
        assertEqualInt(archive_entry_birthtime_nsec(e2), 24990);
        assertEqualInt(archive_entry_ctime(e2), 13580);
        assertEqualInt(archive_entry_ctime_nsec(e2), 24681);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(archive_entry_dev(e2), 235);
-#endif
        archive_entry_fflags(e, &set, &clear);
        assertEqualInt(clear, 0xAA);
        assertEqualInt(set, 0x55);
        assertEqualInt(archive_entry_gid(e2), 204);
        assertEqualString(archive_entry_gname(e2), "group");
        assertEqualString(archive_entry_hardlink(e2), "hardlinkname");
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(archive_entry_ino(e2), 8593);
-#endif
        assertEqualInt(archive_entry_mode(e2), 0123456);
        assertEqualInt(archive_entry_mtime(e2), 13581);
        assertEqualInt(archive_entry_mtime_nsec(e2), 24682);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(archive_entry_nlink(e2), 736);
-#endif
        assertEqualString(archive_entry_pathname(e2), "path");
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(archive_entry_rdev(e2), 532);
-#endif
        assertEqualInt(archive_entry_size(e2), 987654321);
        assertEqualString(archive_entry_sourcepath(e2), "source");
        assertEqualString(archive_entry_symlink(e2), "symlinkname");
        assertEqualInt(archive_entry_uid(e2), 83);
        assertEqualString(archive_entry_uname(e2), "user");
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       skipping("ACL preserved by archive_entry_clone()");
-#else
+
        /* Verify ACL was copied. */
        assertEqualInt(4, archive_entry_acl_reset(e2,
                           ARCHIVE_ENTRY_ACL_TYPE_ACCESS));
@@ -501,10 +462,7 @@ DEFINE_TEST(test_entry)
        assertEqualInt(tag, ARCHIVE_ENTRY_ACL_USER);
        assertEqualInt(qual, 77);
        assertEqualString(name, "user77");
-#endif
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       skipping("xattr data preserved by archive_entry_clone");
-#else
+
        /* Verify xattr was copied. */
        assertEqualInt(1, archive_entry_xattr_reset(e2));
        assertEqualInt(0, archive_entry_xattr_next(e2, &xname, &xval, &xsize));
@@ -516,34 +474,23 @@ DEFINE_TEST(test_entry)
        assertEqualString(xname, NULL);
        assertEqualString(xval, NULL);
        assertEqualInt((int)xsize, 0);
-#endif
 
        /* Change the original */
        archive_entry_set_atime(e, 13580, 24690);
        archive_entry_set_birthtime(e, 13980, 24999);
        archive_entry_set_ctime(e, 13590, 24691);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_dev(e, 245);
-#endif
        archive_entry_set_fflags(e, 0x85, 0xDA);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_filetype(e, AE_IFLNK);
-#endif
        archive_entry_set_gid(e, 214);
        archive_entry_set_gname(e, "grouper");
        archive_entry_set_hardlink(e, "hardlinkpath");
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_ino(e, 8763);
-#endif
        archive_entry_set_mode(e, 0123654);
        archive_entry_set_mtime(e, 18351, 28642);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_nlink(e, 73);
-#endif
        archive_entry_set_pathname(e, "pathest");
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_rdev(e, 132);
-#endif
        archive_entry_set_size(e, 987456321);
        archive_entry_copy_sourcepath(e, "source2");
        archive_entry_set_symlink(e, "symlinkpath");
@@ -559,36 +506,26 @@ DEFINE_TEST(test_entry)
        assertEqualInt(archive_entry_birthtime_nsec(e2), 24990);
        assertEqualInt(archive_entry_ctime(e2), 13580);
        assertEqualInt(archive_entry_ctime_nsec(e2), 24681);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(archive_entry_dev(e2), 235);
-#endif
        archive_entry_fflags(e2, &set, &clear);
        assertEqualInt(clear, 0xAA);
        assertEqualInt(set, 0x55);
        assertEqualInt(archive_entry_gid(e2), 204);
        assertEqualString(archive_entry_gname(e2), "group");
        assertEqualString(archive_entry_hardlink(e2), "hardlinkname");
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(archive_entry_ino(e2), 8593);
-#endif
        assertEqualInt(archive_entry_mode(e2), 0123456);
        assertEqualInt(archive_entry_mtime(e2), 13581);
        assertEqualInt(archive_entry_mtime_nsec(e2), 24682);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(archive_entry_nlink(e2), 736);
-#endif
        assertEqualString(archive_entry_pathname(e2), "path");
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(archive_entry_rdev(e2), 532);
-#endif
        assertEqualInt(archive_entry_size(e2), 987654321);
        assertEqualString(archive_entry_sourcepath(e2), "source");
        assertEqualString(archive_entry_symlink(e2), "symlinkname");
        assertEqualInt(archive_entry_uid(e2), 83);
        assertEqualString(archive_entry_uname(e2), "user");
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       skipping("ACL held by clone of archive_entry");
-#else
+
        /* Verify ACL was unchanged. */
        assertEqualInt(4, archive_entry_acl_reset(e2,
                           ARCHIVE_ENTRY_ACL_TYPE_ACCESS));
@@ -634,13 +571,9 @@ DEFINE_TEST(test_entry)
        assertEqualInt(tag, 0);
        assertEqualInt(qual, -1);
        assertEqualString(name, NULL);
-#endif
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       skipping("xattr preserved in archive_entry copy");
-#else
+
        /* Verify xattr was unchanged. */
        assertEqualInt(1, archive_entry_xattr_reset(e2));
-#endif
 
        /* Release clone. */
        archive_entry_free(e2);
@@ -659,9 +592,7 @@ DEFINE_TEST(test_entry)
        archive_entry_fflags(e, &set, &clear);
        assertEqualInt(clear, 0);
        assertEqualInt(set, 0);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(archive_entry_filetype(e), 0);
-#endif
        assertEqualInt(archive_entry_gid(e), 0);
        assertEqualString(archive_entry_gname(e), NULL);
        assertEqualString(archive_entry_hardlink(e), NULL);
@@ -669,9 +600,7 @@ DEFINE_TEST(test_entry)
        assertEqualInt(archive_entry_mode(e), 0);
        assertEqualInt(archive_entry_mtime(e), 0);
        assertEqualInt(archive_entry_mtime_nsec(e), 0);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(archive_entry_nlink(e), 0);
-#endif
        assertEqualString(archive_entry_pathname(e), NULL);
        assertEqualInt(archive_entry_rdev(e), 0);
        assertEqualInt(archive_entry_size(e), 0);
@@ -716,9 +645,7 @@ DEFINE_TEST(test_entry)
        assertEqualInt(archive_entry_ino(e), 234);
        assertEqualInt(archive_entry_mode(e), 077777);
        assertEqualInt(archive_entry_mtime(e), 234567);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(archive_entry_nlink(e), 345);
-#endif
        assertEqualInt(archive_entry_size(e), 123456789);
        assertEqualInt(archive_entry_uid(e), 23);
 #if __FreeBSD__
@@ -738,19 +665,13 @@ DEFINE_TEST(test_entry)
        /* Set a bunch of fields individually. */
        archive_entry_set_atime(e, 456789, 321);
        archive_entry_set_ctime(e, 345678, 432);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_dev(e, 123);
-#endif
        archive_entry_set_gid(e, 34);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_ino(e, 234);
-#endif
        archive_entry_set_mode(e, 012345);
        archive_entry_set_mode(e, 012345);
        archive_entry_set_mtime(e, 234567, 543);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_nlink(e, 345);
-#endif
        archive_entry_set_size(e, 123456789);
        archive_entry_set_uid(e, 23);
        /* Retrieve a stat structure. */
@@ -758,18 +679,12 @@ DEFINE_TEST(test_entry)
        /* Check that the values match. */
        assertEqualInt(pst->st_atime, 456789);
        assertEqualInt(pst->st_ctime, 345678);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(pst->st_dev, 123);
-#endif
        assertEqualInt(pst->st_gid, 34);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(pst->st_ino, 234);
-#endif
        assertEqualInt(pst->st_mode, 012345);
        assertEqualInt(pst->st_mtime, 234567);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        assertEqualInt(pst->st_nlink, 345);
-#endif
        assertEqualInt(pst->st_size, 123456789);
        assertEqualInt(pst->st_uid, 23);
 #ifdef __FreeBSD__
@@ -786,30 +701,24 @@ DEFINE_TEST(test_entry)
        archive_entry_set_ctime(e, 345677, 431);
        assert((pst = archive_entry_stat(e)) != NULL);
        assertEqualInt(pst->st_ctime, 345677);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_dev(e, 122);
        assert((pst = archive_entry_stat(e)) != NULL);
        assertEqualInt(pst->st_dev, 122);
-#endif
        archive_entry_set_gid(e, 33);
        assert((pst = archive_entry_stat(e)) != NULL);
        assertEqualInt(pst->st_gid, 33);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_ino(e, 233);
        assert((pst = archive_entry_stat(e)) != NULL);
        assertEqualInt(pst->st_ino, 233);
-#endif
        archive_entry_set_mode(e, 012344);
        assert((pst = archive_entry_stat(e)) != NULL);
        assertEqualInt(pst->st_mode, 012344);
        archive_entry_set_mtime(e, 234566, 542);
        assert((pst = archive_entry_stat(e)) != NULL);
        assertEqualInt(pst->st_mtime, 234566);
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_nlink(e, 344);
        assert((pst = archive_entry_stat(e)) != NULL);
        assertEqualInt(pst->st_nlink, 344);
-#endif
        archive_entry_set_size(e, 123456788);
        assert((pst = archive_entry_stat(e)) != NULL);
        assertEqualInt(pst->st_size, 123456788);
@@ -833,7 +742,6 @@ DEFINE_TEST(test_entry)
         * the necessary definitions on every platform.
         */
 #if __FreeBSD__
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        archive_entry_set_dev(e, 0x12345678);
        assertEqualInt(archive_entry_devmajor(e), major(0x12345678));
        assertEqualInt(archive_entry_devminor(e), minor(0x12345678));
@@ -852,7 +760,6 @@ DEFINE_TEST(test_entry)
        assertEqualInt(archive_entry_rdevmajor(e), 0xfe);
        assertEqualInt(archive_entry_rdevminor(e), 0xdcba98);
        assertEqualInt(archive_entry_rdev(e), makedev(0xfe, 0xdcba98));
-#endif
 #endif
 
        /*

diff --git a/libarchive/test/test_read_data_large.c b/libarchive/test/test_read_data_large.c
index fe9120b59541fda8cb671b233753d7c98b262b2d..850d77738d8147f94e0fa369abb4c35ebb5c70a3 100644 (file)
--- a/libarchive/test/test_read_data_large.c
+++ b/libarchive/test/test_read_data_large.c
@@ -73,11 +73,7 @@ DEFINE_TEST(test_read_data_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
 
        /* Check that archive_read_data can handle 10*10^6 at a pop. */
        assert((a = archive_read_new()) != NULL);
@@ -90,11 +86,7 @@ DEFINE_TEST(test_read_data_large)
        failure("Read expected 10MB, but data read didn't match what was written");
        assert(0 == memcmp(buff2, buff3, sizeof(buff3)));
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 
        /* Check archive_read_data_into_fd */
        assert((a = archive_read_new()) != NULL);
@@ -110,11 +102,7 @@ DEFINE_TEST(test_read_data_large)
        assert(tmpfilefd != 0);
        assertEqualIntA(a, 0, archive_read_data_into_fd(a, tmpfilefd));
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
        close(tmpfilefd);
 
        f = fopen(tmpfilename, "rb");

diff --git a/libarchive/test/test_read_format_cpio_bin.c b/libarchive/test/test_read_format_cpio_bin.c
index fecc0ab4834f943bcaa86c24e452e40f5eba7e8f..b5dbade08a9690de8535093f5e569a09f9a9b5dd 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin.c
+++ b/libarchive/test/test_read_format_cpio_bin.c
@@ -54,11 +54,7 @@ DEFINE_TEST(test_read_format_cpio_bin)
        assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE);
        assertA(archive_format(a) == ARCHIVE_FORMAT_CPIO_BIN_LE);
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 }
 
 

diff --git a/libarchive/test/test_read_format_cpio_bin_Z.c b/libarchive/test/test_read_format_cpio_bin_Z.c
index bae370b171763a3acb522f3b562f2982480c471f..95d9ab2fe82daadeaca6610d5880772d16802e31 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_Z.c
+++ b/libarchive/test/test_read_format_cpio_bin_Z.c
@@ -51,11 +51,7 @@ DEFINE_TEST(test_read_format_cpio_bin_Z)
            archive_format_name(a));
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
-#endif
 }
 
 

diff --git a/libarchive/test/test_read_format_cpio_odc.c b/libarchive/test/test_read_format_cpio_odc.c
index 6563fcd7e9ef180d64d9a81eb3ff4ede24c10768..c368de62cf2770b7c6caef1ccb26d3a456738cfc 100644 (file)
--- a/libarchive/test/test_read_format_cpio_odc.c
+++ b/libarchive/test/test_read_format_cpio_odc.c
@@ -58,11 +58,7 @@ DEFINE_TEST(test_read_format_cpio_odc)
        assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE);
        assertA(archive_format(a) == ARCHIVE_FORMAT_CPIO_POSIX);
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 }
 
 

diff --git a/libarchive/test/test_read_format_cpio_svr4c_Z.c b/libarchive/test/test_read_format_cpio_svr4c_Z.c
index d3f086bbd51a1e175f0641ce2cb8efe0a1a02653..59f920238bc2c3ffb808685c7d114e4b2bbc9e49 100644 (file)
--- a/libarchive/test/test_read_format_cpio_svr4c_Z.c
+++ b/libarchive/test/test_read_format_cpio_svr4c_Z.c
@@ -52,11 +52,7 @@ DEFINE_TEST(test_read_format_cpio_svr4c_Z)
        failure("archive_format_name(a)=\"%s\"", archive_format_name(a));
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_CRC);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
-#endif
 }
 
 

diff --git a/libarchive/test/test_read_format_empty.c b/libarchive/test/test_read_format_empty.c
index 98cfdfa26f5d5bdbe35603cb741703389cb239b0..d726587cf0775de90e003207402073035da65323 100644 (file)
--- a/libarchive/test/test_read_format_empty.c
+++ b/libarchive/test/test_read_format_empty.c
@@ -39,9 +39,5 @@ DEFINE_TEST(test_read_format_empty)
        assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE);
        assertA(archive_format(a) == ARCHIVE_FORMAT_EMPTY);
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 }

diff --git a/libarchive/test/test_read_format_gtar_lzma.c b/libarchive/test/test_read_format_gtar_lzma.c
index 0e8ff32e57a061ab24e2e031b3aca82bd912d31e..ab8e5ff594c1e55af2c258c7cf56605d4e485fe7 100644 (file)
--- a/libarchive/test/test_read_format_gtar_lzma.c
+++ b/libarchive/test/test_read_format_gtar_lzma.c
@@ -68,11 +68,7 @@ DEFINE_TEST(test_read_format_gtar_lzma)
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 finish:
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
-#endif
 }
 
 

diff --git a/libarchive/test/test_read_format_gtar_sparse.c b/libarchive/test/test_read_format_gtar_sparse.c
index d055fc249a74d9ce615cd3b0ff794eb28dc05205..72eda862685cb55d56c7fe35aa318c33e9c69c0e 100644 (file)
--- a/libarchive/test/test_read_format_gtar_sparse.c
+++ b/libarchive/test/test_read_format_gtar_sparse.c
@@ -245,13 +245,8 @@ verify_archive_file(const char *name, struct archive_contents *ac)
                assertEqualIntA(a, err, ARCHIVE_EOF);
                failure("%s: Size returned at EOF must be zero", name);
                assertEqualInt((int)actual.s, 0);
-#if ARCHIVE_VERSION_NUMBER < 1009000
-               /* libarchive < 1.9 doesn't get this right */
-               skipping("offset of final sparse chunk");
-#else
                failure("%s: Offset of final empty chunk must be same as file size", name);
                assertEqualInt(actual.o, expect.o);
-#endif
                /* Step to next file description. */
                ++ac;
        }
@@ -260,11 +255,7 @@ verify_archive_file(const char *name, struct archive_contents *ac)
        assertEqualIntA(a, ARCHIVE_EOF, err);
 
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 }
 
 
@@ -278,9 +269,7 @@ DEFINE_TEST(test_read_format_gtar_sparse)
         * libarchive < 1.9 doesn't support the newer --posix sparse formats
         * from GNU tar 1.15 and later.
         */
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       skipping("read support for GNUtar --posix sparse formats");
-#else
+
        /*
         * An archive created by GNU tar 1.17 using --posix --sparse-format=0.1
         */
@@ -312,7 +301,6 @@ DEFINE_TEST(test_read_format_gtar_sparse)
        verify_archive_file(
                "test_read_format_gtar_sparse_1_17_posix10_modified.tar",
                files);
-#endif
 }
 
 

diff --git a/libarchive/test/test_read_format_tar.c b/libarchive/test/test_read_format_tar.c
index 9c197df0946445e47a1ef22b9cb3ad047e04237b..34cf28e68336c9f4b1e8411f9a08a9b6c13c2147 100644 (file)
--- a/libarchive/test/test_read_format_tar.c
+++ b/libarchive/test/test_read_format_tar.c
@@ -76,11 +76,7 @@ static void verifyEmpty(void)
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR);
 
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 }
 
 /* Single entry with a hardlink. */
@@ -448,11 +444,7 @@ static void verify(unsigned char *d, size_t s,
        f(ae);
 
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
        free(buff);
 }
 

diff --git a/libarchive/test/test_read_format_tar_empty_filename.c b/libarchive/test/test_read_format_tar_empty_filename.c
index 8d917144448dcb62a39033167a5cb7b8b114500d..467284076187e223fe87016a32c00357136ad6b8 100644 (file)
--- a/libarchive/test/test_read_format_tar_empty_filename.c
+++ b/libarchive/test/test_read_format_tar_empty_filename.c
@@ -58,9 +58,5 @@ DEFINE_TEST(test_read_format_tar_empty_filename)
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
-#endif
 }

diff --git a/libarchive/test/test_read_format_tz.c b/libarchive/test/test_read_format_tz.c
index eb066013842c894cf49c006828b240b3add1370a..e477fb7487fa6e54e4398177d348d95565c70463 100644 (file)
--- a/libarchive/test/test_read_format_tz.c
+++ b/libarchive/test/test_read_format_tz.c
@@ -51,11 +51,7 @@ DEFINE_TEST(test_read_format_tz)
        failure("archive_format_name(a)=\"%s\"", archive_format_name(a));
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
-#endif
 }
 
 

diff --git a/libarchive/test/test_read_format_zip.c b/libarchive/test/test_read_format_zip.c
index 680e7ede360f75d4d5635ba26185174db62513a9..8ad697f79fd399043a8b3cf37d7aa4b3f937a791 100644 (file)
--- a/libarchive/test/test_read_format_zip.c
+++ b/libarchive/test/test_read_format_zip.c
@@ -82,11 +82,7 @@ DEFINE_TEST(test_read_format_zip)
        assertA(archive_format(a) == ARCHIVE_FORMAT_ZIP);
        assert(0 == archive_read_close(a));
 finish:
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 }
 
 

diff --git a/libarchive/test/test_read_pax_truncated.c b/libarchive/test/test_read_pax_truncated.c
index 4e2a8134ec244b7a5ba6b7def79b6a22e9700de6..02aaa82ec5f5a4b79ed4a51c292433bece328b90 100644 (file)
--- a/libarchive/test/test_read_pax_truncated.c
+++ b/libarchive/test/test_read_pax_truncated.c
@@ -61,11 +61,7 @@ DEFINE_TEST(test_read_pax_truncated)
 
        /* 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
 
        /* Now, read back a truncated version of the archive and
         * verify that we get an appropriate error. */
@@ -109,11 +105,7 @@ DEFINE_TEST(test_read_pax_truncated)
                }
        wrap_up:
                assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-               archive_read_finish(a);
-#else
                assert(0 == archive_read_finish(a));
-#endif
        }
 
 
@@ -154,11 +146,7 @@ DEFINE_TEST(test_read_pax_truncated)
                }
        wrap_up2:
                assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-               archive_read_finish(a);
-#else
                assert(0 == archive_read_finish(a));
-#endif
        }
 
        /* Now, damage the archive in various ways and test the responses. */
@@ -174,11 +162,7 @@ DEFINE_TEST(test_read_pax_truncated)
        assertA(0 == archive_read_open_memory(a, buff2, used));
        assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae));
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 
        /* Damage the size field in the pax attributes. */
        memcpy(buff2, buff, buff_size);
@@ -189,11 +173,7 @@ DEFINE_TEST(test_read_pax_truncated)
        assertA(0 == archive_read_open_memory(a, buff2, used));
        assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae));
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 
        /* Damage the size field in the pax attributes. */
        memcpy(buff2, buff, buff_size);
@@ -206,11 +186,7 @@ DEFINE_TEST(test_read_pax_truncated)
        assertA(0 == archive_read_open_memory(a, buff2, used));
        assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae));
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 
        /* Damage the size field in the pax attributes. */
        memcpy(buff2, buff, buff_size);
@@ -224,11 +200,7 @@ DEFINE_TEST(test_read_pax_truncated)
        assertA(0 == archive_read_open_memory(a, buff2, used));
        assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae));
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 
        /* Damage the size field in the pax attributes. */
        memcpy(buff2, buff, buff_size);
@@ -240,11 +212,7 @@ DEFINE_TEST(test_read_pax_truncated)
        assertA(0 == archive_read_open_memory(a, buff2, used));
        assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae));
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 
        /* Damage the size field in the pax attributes. */
        memcpy(buff2, buff, buff_size);
@@ -255,11 +223,7 @@ DEFINE_TEST(test_read_pax_truncated)
        assertA(0 == archive_read_open_memory(a, buff2, used));
        assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae));
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 
        /* Damage the ustar header. */
        memcpy(buff2, buff, buff_size);
@@ -270,11 +234,7 @@ DEFINE_TEST(test_read_pax_truncated)
        assertA(0 == archive_read_open_memory(a, buff2, used));
        assertEqualIntA(a, ARCHIVE_FATAL, archive_read_next_header(a, &ae));
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 
        /*
         * TODO: Damage the ustar header in various ways and fixup the

diff --git a/libarchive/test/test_read_truncated.c b/libarchive/test/test_read_truncated.c
index 9b26b59818a936333f3b767eb808904ff635a8a8..166a77294978d59cee81e9b3a712fca5361bbb5f 100644 (file)
--- a/libarchive/test/test_read_truncated.c
+++ b/libarchive/test/test_read_truncated.c
@@ -56,11 +56,7 @@ DEFINE_TEST(test_read_truncated)
 
        /* 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
 
        /* Now, read back a truncated version of the archive and
         * verify that we get an appropriate error. */
@@ -97,11 +93,7 @@ DEFINE_TEST(test_read_truncated)
                }
        wrap_up:
                assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-               archive_read_finish(a);
-#else
                assert(0 == archive_read_finish(a));
-#endif
        }
 
 
@@ -140,10 +132,6 @@ DEFINE_TEST(test_read_truncated)
                }
        wrap_up2:
                assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-               archive_read_finish(a);
-#else
                assert(0 == archive_read_finish(a));
-#endif
        }
 }

diff --git a/libarchive/test/test_tar_filenames.c b/libarchive/test/test_tar_filenames.c
index b08373819dfc95e7b27848b97bf3f56593376b5f..bc22a2d314f19b150be747e0d2ec1ad1948a11ad 100644 (file)
--- a/libarchive/test/test_tar_filenames.c
+++ b/libarchive/test/test_tar_filenames.c
@@ -101,11 +101,7 @@ test_filename(const char *prefix, int dlen, int flen)
 
        /* 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
 
        /*
         * Now, read the data back.
@@ -117,11 +113,7 @@ test_filename(const char *prefix, int dlen, int flen)
 
        /* Read the file and check the filename. */
        assertA(0 == archive_read_next_header(a, &ae));
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       skipping("Leading '/' preserved on long filenames");
-#else
        assertEqualString(filename, archive_entry_pathname(ae));
-#endif
        assertEqualInt((S_IFREG | 0755), archive_entry_mode(ae));
 
        /*
@@ -133,29 +125,17 @@ test_filename(const char *prefix, int dlen, int flen)
         * here.
         */
        assertA(0 == archive_read_next_header(a, &ae));
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       skipping("Trailing '/' preserved on dirnames");
-#else
        assertEqualString(dirname, archive_entry_pathname(ae));
-#endif
        assert((S_IFDIR | 0755) == archive_entry_mode(ae));
 
        assertA(0 == archive_read_next_header(a, &ae));
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       skipping("Trailing '/' added to dir names");
-#else
        assertEqualString(dirname, archive_entry_pathname(ae));
-#endif
        assert((S_IFDIR | 0755) == archive_entry_mode(ae));
 
        /* Verify the end of the archive. */
        assert(1 == archive_read_next_header(a, &ae));
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 }
 
 DEFINE_TEST(test_tar_filenames)

diff --git a/libarchive/test/test_tar_large.c b/libarchive/test/test_tar_large.c
index adc81551cecd47367d867bfc965fd0395380466d..f273ed991ab93e8196e7f47dfa365d5a7752acf1 100644 (file)
--- 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 < 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 ssize_t memory_read(struct archive *, void *, const void **buff);
 static ssize_t memory_write(struct archive *, void *, const void *, size_t);
 
@@ -167,16 +163,6 @@ 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)
 {
@@ -197,7 +183,6 @@ memory_read_skip(struct archive *a, void *_private, off_t skip)
        }
        return (skip);
 }
-#endif
 
 DEFINE_TEST(test_tar_large)
 {
@@ -271,11 +256,7 @@ 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
 
        /*
         * Open the same archive for reading.
@@ -301,11 +282,7 @@ DEFINE_TEST(test_tar_large)
 
        /* 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
 
        free(memdata.buff);
        free(filedata);

diff --git a/libarchive/test/test_ustar_filenames.c b/libarchive/test/test_ustar_filenames.c
index e3ebf3c92f04093d652bd64ced5db2f8179bac6a..f0db4fa21a6d371ef7f549a32b93a941bc5587cb 100644 (file)
--- a/libarchive/test/test_ustar_filenames.c
+++ b/libarchive/test/test_ustar_filenames.c
@@ -111,11 +111,7 @@ test_filename(const char *prefix, int dlen, int flen)
 
        /* Close out the archive. */
        assertA(0 == archive_write_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(a);
-#else
        assertEqualInt(0, archive_write_finish(a));
-#endif
 
        /*
         * Now, read the data back.
@@ -157,11 +153,7 @@ test_filename(const char *prefix, int dlen, int flen)
        failure("This fails if entries were written that should not have been written.  dlen=%d, flen=%d", dlen, flen);
        assertEqualInt(1, archive_read_next_header(a, &ae));
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assertEqualInt(0, archive_read_finish(a));
-#endif
 }
 
 DEFINE_TEST(test_ustar_filenames)

diff --git a/libarchive/test/test_write_compress.c b/libarchive/test/test_write_compress.c
index aa590de8a91181eb92b851736c464b9330e03fb4..0497421902a8632b161dc014993fb58d255729dc 100644 (file)
--- a/libarchive/test/test_write_compress.c
+++ b/libarchive/test/test_write_compress.c
@@ -67,12 +67,8 @@ DEFINE_TEST(test_write_compress)
        }
 
 
-       archive_write_close(a);
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(a);
-#else
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
        assert(0 == archive_write_finish(a));
-#endif
 
        /*
         * Now, read the data back.
@@ -91,11 +87,7 @@ DEFINE_TEST(test_write_compress)
                assertEqualInt((int)datasize, archive_entry_size(ae));
        }
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 
        free(data);
        free(buff);

diff --git a/libarchive/test/test_write_compress_program.c b/libarchive/test/test_write_compress_program.c
index bae77e5341bb0f9f9b256f4b4ac946e3b01060c0..0e032c71c46c66aff38f37b3c8f9b5945633e9ae 100644 (file)
--- a/libarchive/test/test_write_compress_program.c
+++ b/libarchive/test/test_write_compress_program.c
@@ -30,9 +30,6 @@ char buff2[64];
 
 DEFINE_TEST(test_write_compress_program)
 {
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       skipping("archive_write_set_compress_program()");
-#else
        struct archive_entry *ae;
        struct archive *a;
        size_t used;
@@ -114,5 +111,4 @@ DEFINE_TEST(test_write_compress_program)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
-#endif
 }

diff --git a/libarchive/test/test_write_disk.c b/libarchive/test/test_write_disk.c
index 169f4f2399651057370c09bed3a49b0bbd2931a0..23d5d5a98302870b16cd9645d1978508ed5b3837 100644 (file)
--- a/libarchive/test/test_write_disk.c
+++ b/libarchive/test/test_write_disk.c
@@ -25,8 +25,6 @@
 #include "test.h"
 __FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk.c 201247 2009-12-30 05:59:21Z kientzle $");
 
-#if ARCHIVE_VERSION_NUMBER >= 1009000
-
 #define UMASK 022
 /*
  * When comparing mode values, ignore high-order bits
@@ -47,11 +45,8 @@ static void create(struct archive_entry *ae, const char *msg)
        failure("%s", msg);
        assertEqualIntA(ad, 0, archive_write_header(ad, ae));
        assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(ad);
-#else
        assertEqualInt(0, archive_write_finish(ad));
-#endif
+
        /* Test the entries on disk. */
        assert(0 == stat(archive_entry_pathname(ae), &st));
        failure("%s", msg);
@@ -97,11 +92,8 @@ static void create_reg_file(struct archive_entry *ae, const char *msg)
        assertEqualIntA(ad, 0, archive_write_header(ad, ae));
        assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data)));
        assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(ad);
-#else
        assertEqualInt(0, archive_write_finish(ad));
-#endif
+
        /* Test the entries on disk. */
        assertIsReg(archive_entry_pathname(ae), archive_entry_mode(ae) & 0777);
        assertFileSize(archive_entry_pathname(ae), sizeof(data));
@@ -159,11 +151,8 @@ static void create_reg_file3(struct archive_entry *ae, const char *msg)
        assertEqualIntA(ad, 0, archive_write_header(ad, ae));
        assertEqualInt(5, archive_write_data(ad, data, sizeof(data)));
        assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(ad);
-#else
        assertEqualInt(0, archive_write_finish(ad));
-#endif
+
        /* Test the entry on disk. */
        assert(0 == stat(archive_entry_pathname(ae), &st));
        failure("st.st_mode=%o archive_entry_mode(ae)=%o",
@@ -188,11 +177,8 @@ static void create_reg_file4(struct archive_entry *ae, const char *msg)
        assertEqualInt(ARCHIVE_OK,
            archive_write_data_block(ad, data, sizeof(data), 0));
        assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(ad);
-#else
        assertEqualInt(0, archive_write_finish(ad));
-#endif
+
        /* Test the entry on disk. */
        assert(0 == stat(archive_entry_pathname(ae), &st));
        failure("st.st_mode=%o archive_entry_mode(ae)=%o",
@@ -222,11 +208,8 @@ static void create_reg_file_win(struct archive_entry *ae, const char *msg)
        assertEqualIntA(ad, 0, archive_write_header(ad, ae));
        assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data)));
        assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(ad);
-#else
        assertEqualInt(0, archive_write_finish(ad));
-#endif
+
        /* Test the entries on disk. */
        l = strlen(archive_entry_pathname(ae));
        fname = malloc(l + 1);
@@ -243,13 +226,9 @@ static void create_reg_file_win(struct archive_entry *ae, const char *msg)
        assertEqualInt(st.st_size, sizeof(data));
 }
 #endif /* _WIN32 && !__CYGWIN__ */
-#endif
 
 DEFINE_TEST(test_write_disk)
 {
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       skipping("archive_write_disk interface");
-#else
        struct archive_entry *ae;
 
        /* Force the umask to something predictable. */
@@ -328,5 +307,4 @@ DEFINE_TEST(test_write_disk)
            " with unusable characters in its file name");
        archive_entry_free(ae);
 #endif /* _WIN32 && !__CYGWIN__ */
-#endif
 }

diff --git a/libarchive/test/test_write_disk_failures.c b/libarchive/test/test_write_disk_failures.c
index 991fa3d4fe6ebbf3a469fd6b28dd8486b36025ea..df62d3c5df968335d4c3457e745f2845bf98ac29 100644 (file)
--- a/libarchive/test/test_write_disk_failures.c
+++ b/libarchive/test/test_write_disk_failures.c
@@ -25,16 +25,9 @@
 #include "test.h"
 __FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_failures.c 201247 2009-12-30 05:59:21Z kientzle $");
 
-#if ARCHIVE_VERSION_NUMBER >= 1009000
-
-#define UMASK 022
-
-
-#endif
-
 DEFINE_TEST(test_write_disk_failures)
 {
-#if ARCHIVE_VERSION_NUMBER < 1009000 || (defined(_WIN32) && !defined(__CYGWIN__))
+#if defined(_WIN32) && !defined(__CYGWIN__)
        skipping("archive_write_disk interface");
 #else
        struct archive_entry *ae;
@@ -42,7 +35,7 @@ DEFINE_TEST(test_write_disk_failures)
        int fd;
 
        /* Force the umask to something predictable. */
-       assertUmask(UMASK);
+       assertUmask(022);
 
        /* A directory that we can't write to. */
        assertMakeDir("dir", 0555);

diff --git a/libarchive/test/test_write_disk_perms.c b/libarchive/test/test_write_disk_perms.c
index 207444833e7a83d8dd537efa13ec326724d0c52f..a1a7c90fdf8ce390c8724b1ab0b4656b4324cb73 100644 (file)
--- a/libarchive/test/test_write_disk_perms.c
+++ b/libarchive/test/test_write_disk_perms.c
@@ -25,7 +25,7 @@
 #include "test.h"
 __FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_perms.c 201247 2009-12-30 05:59:21Z kientzle $");
 
-#if ARCHIVE_VERSION_NUMBER >= 1009000 && (!defined(_WIN32) || defined(__CYGWIN__))
+#if !defined(_WIN32) || defined(__CYGWIN__)
 
 #define UMASK 022
 
@@ -125,7 +125,7 @@ defaultgid(void)
 
 DEFINE_TEST(test_write_disk_perms)
 {
-#if ARCHIVE_VERSION_NUMBER < 1009000 || (defined(_WIN32) && !defined(__CYGWIN__))
+#if defined(_WIN32) && !defined(__CYGWIN__)
        skipping("archive_write_disk interface");
 #else
        struct archive *a;
@@ -365,11 +365,7 @@ DEFINE_TEST(test_write_disk_perms)
                assertEqualIntA(a,ARCHIVE_WARN,archive_write_finish_entry(a));
        }
 
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(a);
-#else
        assert(0 == archive_write_finish(a));
-#endif
        archive_entry_free(ae);
 
        /* Test the entries on disk. */

diff --git a/libarchive/test/test_write_disk_secure.c b/libarchive/test/test_write_disk_secure.c
index c14dadccfa6bbacd6d278160cf1802918557d946..e20cd3164d0bd76a6059846bb237ecce47a203a1 100644 (file)
--- a/libarchive/test/test_write_disk_secure.c
+++ b/libarchive/test/test_write_disk_secure.c
@@ -34,9 +34,9 @@ __FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_secure.c 201247 200
 
 DEFINE_TEST(test_write_disk_secure)
 {
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       skipping("archive_write_disk interface");
-#elif !defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
+       skipping("archive_write_disk security checks not supported on Windows");
+#else
        struct archive *a;
        struct archive_entry *ae;
        struct stat st;

diff --git a/libarchive/test/test_write_format_ar.c b/libarchive/test/test_write_format_ar.c
index 5822b3f3817ca6c290f0d374cacdf74224f7d309..1a5d6ad4843750268da278457e34a7cecec27914 100644 (file)
--- a/libarchive/test/test_write_format_ar.c
+++ b/libarchive/test/test_write_format_ar.c
@@ -34,9 +34,6 @@ static char strtab[] = "abcdefghijklmn.o/\nggghhhjjjrrrttt.o/\niiijjjdddsssppp.o
 
 DEFINE_TEST(test_write_format_ar)
 {
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       skipping("ar write support");
-#else
        struct archive_entry *ae;
        struct archive* a;
        size_t used;
@@ -101,11 +98,7 @@ DEFINE_TEST(test_write_format_ar)
        archive_entry_free(ae);
 
        archive_write_close(a);
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(a);
-#else
        assertEqualInt(0, archive_write_finish(a));
-#endif
 
        /*
         * Now, read the data back.
@@ -140,11 +133,7 @@ DEFINE_TEST(test_write_format_ar)
        assertEqualMem(buff2, "88877766", 8);
 
        assertEqualIntA(a, 0, archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assertEqualInt(0, archive_read_finish(a));
-#endif
 
        /*
         * Then, we try to create a BSD format archive.
@@ -173,11 +162,7 @@ DEFINE_TEST(test_write_format_ar)
        assertEqualIntA(a, 6, archive_write_data(a, "555555", 7));
        archive_entry_free(ae);
        archive_write_close(a);
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(a);
-#else
        assertEqualInt(0, archive_write_finish(a));
-#endif
 
        /* Now, Read the data back */
        assert((a = archive_read_new()) != NULL);
@@ -200,10 +185,5 @@ DEFINE_TEST(test_write_format_ar)
        /* Test EOF */
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualIntA(a, 0, archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assertEqualInt(0, archive_read_finish(a));
-#endif
-#endif
 }

diff --git a/libarchive/test/test_write_format_cpio.c b/libarchive/test/test_write_format_cpio.c
index 7bf2a41a528ae9977608ca1ac1644a92a70a98e0..8ac8fcd94ecda9dde0e5f1e68f479ebc6cf8134a 100644 (file)
--- a/libarchive/test/test_write_format_cpio.c
+++ b/libarchive/test/test_write_format_cpio.c
@@ -26,7 +26,6 @@
 __FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_cpio.c 185672 2008-12-06 06:02:26Z kientzle $");
 
 /* The version stamp macro was introduced after cpio write support. */
-#if ARCHIVE_VERSION_NUMBER >= 1009000
 static void
 test_format(int        (*set_format)(struct archive *))
 {
@@ -104,11 +103,7 @@ test_format(int    (*set_format)(struct archive *))
 
        /* 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
 
        /*
         * Damage the second entry to test the search-ahead recovery.
@@ -173,22 +168,13 @@ test_format(int   (*set_format)(struct archive *))
        /* Verify the end of the archive. */
        assertEqualIntA(a, 1, archive_read_next_header(a, &ae));
        assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assert(0 == archive_read_finish(a));
-#endif
 
        free(buff);
 }
-#endif
 
 DEFINE_TEST(test_write_format_cpio)
 {
-#if ARCHIVE_VERSION_NUMBER >= 1009000
        test_format(archive_write_set_format_cpio);
        test_format(archive_write_set_format_cpio_newc);
-#else
-       skipping("cpio write support");
-#endif
 }

diff --git a/libarchive/test/test_write_format_cpio_empty.c b/libarchive/test/test_write_format_cpio_empty.c
index 131ac24617d2e2b7be795dc22bee185c9517d020..48c70822a8dbf6a7e319630056be629ee5574191 100644 (file)
--- a/libarchive/test/test_write_format_cpio_empty.c
+++ b/libarchive/test/test_write_format_cpio_empty.c
@@ -62,11 +62,7 @@ DEFINE_TEST(test_write_format_cpio_empty)
 
        /* 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
 
        failure("Empty cpio archive should be exactly 87 bytes, was %d.", used);
        assert(used == 87);

diff --git a/libarchive/test/test_write_format_cpio_newc.c b/libarchive/test/test_write_format_cpio_newc.c
index 1c3c330b0e9c6347fb0caabd5c135ac8a48e577e..0d3887aae6c00134b81f3bbc83022047504b5057 100644 (file)
--- a/libarchive/test/test_write_format_cpio_newc.c
+++ b/libarchive/test/test_write_format_cpio_newc.c
@@ -111,12 +111,7 @@ DEFINE_TEST(test_write_format_cpio_newc)
        assertEqualIntA(a, 0, archive_write_header(a, entry));
        archive_entry_free(entry);
 
-
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(a);
-#else
        assert(0 == archive_write_finish(a));
-#endif
 
        /*
         * Verify the archive format.

diff --git a/libarchive/test/test_write_format_cpio_odc.c b/libarchive/test/test_write_format_cpio_odc.c
index e2136f87cfb02aa525d4f511f8ae7fd476c5e015..8e9e6933a603a15328ff99623eefa2e4c624b221 100644 (file)
--- a/libarchive/test/test_write_format_cpio_odc.c
+++ b/libarchive/test/test_write_format_cpio_odc.c
@@ -123,11 +123,7 @@ DEFINE_TEST(test_write_format_cpio_odc)
        /* Write of data to symlink should fail == zero bytes get written. */
        assertEqualIntA(a, 0, archive_write_data(a, "1234567890", 10));
 
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(a);
-#else
        assert(0 == archive_write_finish(a));
-#endif
 
        /*
         * Verify the archive format.

diff --git a/libarchive/test/test_write_format_mtree.c b/libarchive/test/test_write_format_mtree.c
index e0b78f557165659d361944575dc75b8c91238529..0d363a9780140110f40eb169db22cbb2e011b1ac 100644 (file)
--- a/libarchive/test/test_write_format_mtree.c
+++ b/libarchive/test/test_write_format_mtree.c
@@ -86,11 +86,8 @@ test_write_format_mtree_sub(int use_set, int dironly)
                archive_entry_free(ae);
        }
        archive_write_close(a);
-#if ARCHIVE_VERSION_NUMBER < 2000000
-        archive_write_finish(a);
-#else
         assertEqualInt(0, archive_write_finish(a));
-#endif
+
        if (use_set) {
                const char *p;
 
@@ -135,11 +132,7 @@ test_write_format_mtree_sub(int use_set, int dironly)
                        assertEqualInt(8, archive_entry_size(ae));
        }
        assertEqualIntA(a, 0, archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_read_finish(a);
-#else
        assertEqualInt(0, archive_read_finish(a));
-#endif
 }
 
 DEFINE_TEST(test_write_format_mtree)

diff --git a/libarchive/test/test_write_format_shar_empty.c b/libarchive/test/test_write_format_shar_empty.c
index 14ee3889a366e042a5b3ef399b044b4b3dbb6ea5..8a89bb6923ece343abc1e5b959f2d8192cbc1403 100644 (file)
--- a/libarchive/test/test_write_format_shar_empty.c
+++ b/libarchive/test/test_write_format_shar_empty.c
@@ -47,11 +47,7 @@ DEFINE_TEST(test_write_format_shar_empty)
 
        /* 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
 
        failure("Empty shar archive should be exactly 0 bytes, was %d.", used);
        assert(used == 0);

diff --git a/libarchive/test/test_write_format_tar.c b/libarchive/test/test_write_format_tar.c
index 372fef1f0232e75c820382a76853674428042073..afc1273fd7f612924941861506fcc4165c383a74 100644 (file)
--- a/libarchive/test/test_write_format_tar.c
+++ b/libarchive/test/test_write_format_tar.c
@@ -72,11 +72,8 @@ DEFINE_TEST(test_write_format_tar)
 
                /* 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
+
                /* This calculation gives "the smallest multiple of
                 * the block size that is at least 2048 bytes". */
                assert(((2048 - 1)/blocksize+1)*blocksize == used);
@@ -105,10 +102,6 @@ DEFINE_TEST(test_write_format_tar)
                /* Verify the end of the archive. */
                assert(1 == archive_read_next_header(a, &ae));
                assert(0 == archive_read_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-               archive_read_finish(a);
-#else
                assert(0 == archive_read_finish(a));
-#endif
        }
 }

diff --git a/libarchive/test/test_write_format_tar_empty.c b/libarchive/test/test_write_format_tar_empty.c
index 6b40f0767f3e6ccfa2c93e9ece9eb6392b3602e3..1f8d431d08e78eeedca7b7eb750be5676b5ebc84 100644 (file)
--- a/libarchive/test/test_write_format_tar_empty.c
+++ b/libarchive/test/test_write_format_tar_empty.c
@@ -46,18 +46,9 @@ DEFINE_TEST(test_write_format_tar_empty)
 
        /* 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
 
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       /* Earlier versions wrote 0-length files for empty tar archives. */
-       skipping("empty tar archive size");
-#else
        assert(used == 1024);
-#endif
        for (i = 0; i < used; i++) {
                failure("Empty tar archive should be all nulls.");
                assert(buff[i] == 0);
@@ -73,18 +64,9 @@ DEFINE_TEST(test_write_format_tar_empty)
 
        /* 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
 
-#if ARCHIVE_VERSION_NUMBER < 1009000
-       /* Earlier versions wrote 0-length files for empty tar archives. */
-       skipping("empty tar archive size");
-#else
        assertEqualInt((int)used, 1024);
-#endif
        for (i = 0; i < used; i++) {
                failure("Empty tar archive should be all nulls.");
                assert(buff[i] == 0);

diff --git a/libarchive/test/test_write_format_tar_ustar.c b/libarchive/test/test_write_format_tar_ustar.c
index 29968dfb331394c95ec421e979624b5a206f76d6..971cad57c59bfe738657b63f87437b2ed8dd6299 100644 (file)
--- a/libarchive/test/test_write_format_tar_ustar.c
+++ b/libarchive/test/test_write_format_tar_ustar.c
@@ -188,12 +188,7 @@ DEFINE_TEST(test_write_format_tar_ustar)
        archive_entry_set_nlink(entry, 1);
        assertEqualIntA(a, 0, archive_write_header(a, entry));
        archive_entry_free(entry);
-
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(a);
-#else
        assert(0 == archive_write_finish(a));
-#endif
 
        /*
         * Verify the archive format.

diff --git a/libarchive/test/test_write_open_memory.c b/libarchive/test/test_write_open_memory.c
index 696db6c963adc56aff0cf0b7c8b95c85660ba966..67102b183f0366c8d0ed5ec5981c2938134a7290 100644 (file)
--- a/libarchive/test/test_write_open_memory.c
+++ b/libarchive/test/test_write_open_memory.c
@@ -64,11 +64,7 @@ DEFINE_TEST(test_write_open_memory)
                        assertA(ARCHIVE_FATAL == archive_write_close(a));
                else
                        assertA(0 == archive_write_close(a));
-#if ARCHIVE_VERSION_NUMBER < 2000000
-               archive_write_finish(a);
-#else
                assert(0 == archive_write_finish(a));
-#endif
                assert(buff[i] == 0xAE);
                assert(s <= i);
        }