Style improvement: If gzip compression is unsupported, just

exit from that point, don't put the entire rest of the test in
an else{} clause.

SVN-Revision: 891

diff --git a/libarchive/test/test_compat_gzip.c b/libarchive/test/test_compat_gzip.c
index 9ac5a59d3d39cc728848b3ff64b7dbb51a05226f..eb9981d02fe9ce72b06ad37adc26867bc13cc010 100644 (file)
--- a/libarchive/test/test_compat_gzip.c
+++ b/libarchive/test/test_compat_gzip.c
@@ -49,7 +49,8 @@ verify(const char *name)
        assert((a = archive_read_new()) != NULL);
        r = archive_read_support_compression_gzip(a);
        if (r == ARCHIVE_WARN) {
-               skipping("gzip not fully supported");
+               skipping("gzip reading not fully supported on this platform");
+               assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
                return;
        }
        assertEqualIntA(a, ARCHIVE_OK, r);
@@ -59,15 +60,9 @@ verify(const char *name)
 
        /* Read entries, match up names with list above. */
        for (i = 0; i < 6; ++i) {
-               r = archive_read_next_header(a, &ae);
-               if (UnsupportedCompress(r, a)) {
-                       skipping("Skipping GZIP compression check: "
-                               "This version of libarchive was compiled "
-                           "without gzip support");
-                       goto finish;
-               }
                failure("Could not read file %d (%s) from %s", i, n[i], name);
-               assertEqualIntA(a, ARCHIVE_OK, r);
+               assertEqualIntA(a, ARCHIVE_OK,
+                   archive_read_next_header(a, &ae));
                if (r != ARCHIVE_OK) {
                        archive_read_finish(a);
                        return;
@@ -84,12 +79,7 @@ verify(const char *name)
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
        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_read_format_cpio_bin_gz.c b/libarchive/test/test_read_format_cpio_bin_gz.c
index ce282bd902910c2fdadbd7ba6270ddcfb6585d7a..6ed43c3ffd92f0706b5deb9a80c9fbc06fc7a558 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_gz.c
+++ b/libarchive/test/test_read_format_cpio_bin_gz.c
@@ -41,19 +41,20 @@ DEFINE_TEST(test_read_format_cpio_bin_gz)
        assertEqualInt(ARCHIVE_OK, archive_read_support_compression_all(a));
        r = archive_read_support_compression_gzip(a);
        if (r == ARCHIVE_WARN) {
-               skipping("gzip not fully supported");
-       } else {
-               failure("archive_read_support_compression_gzip");
-               assertEqualInt(ARCHIVE_OK, r);
-               assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a));
-               assertEqualInt(ARCHIVE_OK,
-                   archive_read_open_memory(a, archive, sizeof(archive)));
-               assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
-               assertEqualInt(archive_compression(a),
-                   ARCHIVE_COMPRESSION_GZIP);
-               assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE);
-               assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+               skipping("gzip reading not fully supported on this platform");
+               assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
+               return;
        }
+       failure("archive_read_support_compression_gzip");
+       assertEqualInt(ARCHIVE_OK, r);
+       assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a));
+       assertEqualInt(ARCHIVE_OK,
+           archive_read_open_memory(a, archive, sizeof(archive)));
+       assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualInt(archive_compression(a),
+           ARCHIVE_COMPRESSION_GZIP);
+       assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE);
+       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
 }
 

diff --git a/libarchive/test/test_read_format_cpio_svr4_gzip.c b/libarchive/test/test_read_format_cpio_svr4_gzip.c
index 22aab630aed64eba60960aa50d757b08844bd4ff..61b1f899b2a45933ebb643c6b3b59022f35b16ae 100644 (file)
--- a/libarchive/test/test_read_format_cpio_svr4_gzip.c
+++ b/libarchive/test/test_read_format_cpio_svr4_gzip.c
@@ -42,18 +42,19 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip)
        assertEqualInt(ARCHIVE_OK, archive_read_support_compression_all(a));
        r = archive_read_support_compression_gzip(a);
        if (r == ARCHIVE_WARN) {
-               skipping("gzip not fully supported");
-       } else {
-               assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a));
-               assertEqualInt(ARCHIVE_OK,
-                   archive_read_open_memory(a, archive, sizeof(archive)));
-               assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
-               assertEqualInt(archive_compression(a),
-                   ARCHIVE_COMPRESSION_GZIP);
-               assertEqualInt(archive_format(a),
-                   ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);
-               assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+               skipping("gzip reading not fully supported on this platform");
+               assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
+               return;
        }
+       assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a));
+       assertEqualInt(ARCHIVE_OK,
+           archive_read_open_memory(a, archive, sizeof(archive)));
+       assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualInt(archive_compression(a),
+           ARCHIVE_COMPRESSION_GZIP);
+       assertEqualInt(archive_format(a),
+           ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);
+       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
 }
 

diff --git a/libarchive/test/test_read_format_gtar_gz.c b/libarchive/test/test_read_format_gtar_gz.c
index 011b53e3ea5d95d24a61a1c871c482010971da78..1facc2fe9a6b6b6bc7135ac653e0334676c4f4a5 100644 (file)
--- a/libarchive/test/test_read_format_gtar_gz.c
+++ b/libarchive/test/test_read_format_gtar_gz.c
@@ -42,17 +42,18 @@ DEFINE_TEST(test_read_format_gtar_gz)
        assertEqualInt(ARCHIVE_OK, archive_read_support_compression_all(a));
        r = archive_read_support_compression_gzip(a);
        if (r == ARCHIVE_WARN) {
-               skipping("gzip not fully supported");
-       } else {
-               assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a));
-               assertEqualInt(ARCHIVE_OK,
-                   archive_read_open_memory(a, archive, sizeof(archive)));
-               assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
-               assertEqualInt(archive_compression(a),
-                   ARCHIVE_COMPRESSION_GZIP);
-               assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
-               assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+               skipping("gzip reading not fully supported on this platform");
+               assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
+               return;
        }
+       assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a));
+       assertEqualInt(ARCHIVE_OK,
+           archive_read_open_memory(a, archive, sizeof(archive)));
+       assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualInt(archive_compression(a),
+           ARCHIVE_COMPRESSION_GZIP);
+       assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
+       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
 }
 

diff --git a/libarchive/test/test_read_format_iso_gz.c b/libarchive/test/test_read_format_iso_gz.c
index 16fb08a2fd4871893642dbd8c215ed9542c5ce89..c8de9385ae9e8c97bff61383453ca0b534f0a751 100644 (file)
--- a/libarchive/test/test_read_format_iso_gz.c
+++ b/libarchive/test/test_read_format_iso_gz.c
@@ -39,19 +39,20 @@ DEFINE_TEST(test_read_format_iso_gz)
            archive_read_support_compression_all(a));
        r = archive_read_support_compression_gzip(a);
        if (r == ARCHIVE_WARN) {
-               skipping("gzip not fully supported");
-       } else {
-               assertEqualIntA(a, ARCHIVE_OK,
-                   archive_read_support_format_all(a));
-               assertEqualIntA(a, ARCHIVE_OK,
-                   archive_read_open_filename(a, name, 512));
-               assertEqualIntA(a, ARCHIVE_OK,
-                   archive_read_next_header(a, &ae));
-               assertEqualInt(archive_compression(a),
-                   ARCHIVE_COMPRESSION_GZIP);
-               assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660);
-               assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+               skipping("gzip reading not fully supported on this platform");
+               assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
+               return;
        }
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_read_support_format_all(a));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_read_open_filename(a, name, 512));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_read_next_header(a, &ae));
+       assertEqualInt(archive_compression(a),
+           ARCHIVE_COMPRESSION_GZIP);
+       assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660);
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
 }
 

diff --git a/libarchive/test/test_read_format_tgz.c b/libarchive/test/test_read_format_tgz.c
index fc5bf8ce55622dd9080d7e8f00b8a1620baaeca3..46d387d59a473e1b8b6b0ef2d4ab5ca88433dd37 100644 (file)
--- a/libarchive/test/test_read_format_tgz.c
+++ b/libarchive/test/test_read_format_tgz.c
@@ -42,17 +42,18 @@ DEFINE_TEST(test_read_format_tgz)
        assertEqualInt(ARCHIVE_OK, archive_read_support_compression_all(a));
        r = archive_read_support_compression_gzip(a);
        if (r == ARCHIVE_WARN) {
-               skipping("gzip not fully supported");
-       } else {
-               assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a));
-               assertEqualInt(ARCHIVE_OK,
-                   archive_read_open_memory(a, archive, sizeof(archive)));
-               assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
-               assertEqualInt(archive_compression(a),
-                   ARCHIVE_COMPRESSION_GZIP);
-               assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
-               assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+               skipping("gzip reading not fully supported on this platform");
+               assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
+               return;
        }
+       assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a));
+       assertEqualInt(ARCHIVE_OK,
+           archive_read_open_memory(a, archive, sizeof(archive)));
+       assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualInt(archive_compression(a),
+           ARCHIVE_COMPRESSION_GZIP);
+       assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
+       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK,archive_read_finish(a));
 }