Remove references to the Subblock filter in xz and tests.

Thanks to Jonathan Nieder.

diff --git a/src/xz/message.c b/src/xz/message.c
index 94140132bf22dc71c601801cdbc24feb00268ca7..ff218c48bfecc49ebc3b16695bea2bdefe49e01f 100644 (file)
--- a/src/xz/message.c
+++ b/src/xz/message.c
@@ -1180,15 +1180,6 @@ message_help(bool long_help)
 "  --delta[=OPTS]      Delta filter; valid OPTS (valid values; default):\n"
 "                        dist=NUM   distance between bytes being subtracted\n"
 "                                   from each other (1-256; 1)"));
-#endif
-
-#if defined(HAVE_ENCODER_SUBBLOCK) || defined(HAVE_DECODER_SUBBLOCK)
-               puts(_(
-"\n"
-"  --subblock[=OPTS]   Subblock filter; valid OPTS (valid values; default):\n"
-"                        size=NUM   number of bytes of data per subblock\n"
-"                                   (1 - 256Mi; 4Ki)\n"
-"                        rle=NUM    run-length encoder chunk size (0-256; 0)"));
 #endif
        }
 

diff --git a/tests/test_filter_flags.c b/tests/test_filter_flags.c
index 808682b57e0f86d67338237f57dd6410b059f72d..ccd9ae98d382530cf4e209c78d4282e2ca2e2864 100644 (file)
--- a/tests/test_filter_flags.c
+++ b/tests/test_filter_flags.c
@@ -71,26 +71,6 @@ decode(uint32_t known_size)
 }
 
 
-#if defined(HAVE_ENCODER_SUBBLOCK) && defined(HAVE_DECODER_SUBBLOCK)
-static void
-test_subblock(void)
-{
-       // Test 1
-       known_flags.id = LZMA_FILTER_SUBBLOCK;
-       known_flags.options = NULL;
-       expect(!encode(2));
-       expect(!decode(2));
-       expect(decoded_flags.options == NULL);
-
-       // Test 2
-       buffer[0] = LZMA_FILTER_SUBBLOCK;
-       buffer[1] = 1;
-       buffer[2] = 0;
-       expect(!decode_ret(3, LZMA_OPTIONS_ERROR));
-}
-#endif
-
-
 #if defined(HAVE_ENCODER_X86) && defined(HAVE_DECODER_X86)
 static void
 test_bcj(void)
@@ -262,9 +242,6 @@ test_lzma(void)
 int
 main(void)
 {
-#if defined(HAVE_ENCODER_SUBBLOCK) && defined(HAVE_DECODER_SUBBLOCK)
-       test_subblock();
-#endif
 #if defined(HAVE_ENCODER_X86) && defined(HAVE_DECODER_X86)
        test_bcj();
 #endif