aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2010-05-27 13:42:44 +0300
committerLasse Collin <lasse.collin@tukaani.org>2010-05-27 13:42:44 +0300
commita334348dc02803241cf4e0a539eecdc0e7ad2cc7 (patch)
tree0e1fcb4305fdb8734e5fe34002748c005af8ea73
parentRemove unused chunk_size.c. (diff)
downloadxz-a334348dc02803241cf4e0a539eecdc0e7ad2cc7.tar.xz
Remove references to the Subblock filter in xz and tests.
Thanks to Jonathan Nieder.
-rw-r--r--src/xz/message.c9
-rw-r--r--tests/test_filter_flags.c23
2 files changed, 0 insertions, 32 deletions
diff --git a/src/xz/message.c b/src/xz/message.c
index 94140132..ff218c48 100644
--- a/src/xz/message.c
+++ b/src/xz/message.c
@@ -1181,15 +1181,6 @@ message_help(bool long_help)
" 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
}
if (long_help)
diff --git a/tests/test_filter_flags.c b/tests/test_filter_flags.c
index 808682b5..ccd9ae98 100644
--- 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