diff options
| author | Karl Berry <karl@freefriends.org> | 2010-06-13 22:25:43 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2010-06-13 22:25:43 +0000 |
| commit | 6019a96432ef8427e402459751109c8b14ec0454 (patch) | |
| tree | 974dd1260a5003100daa5bb88f279fd477042c93 /Build/source/extra/xz/debug | |
| parent | f06e0d7e9489163b444e1381a9e670ed1789725d (diff) | |
xz-4.999.9beta-143-g3e49
git-svn-id: svn://tug.org/texlive/trunk@18955 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/extra/xz/debug')
| -rw-r--r-- | Build/source/extra/xz/debug/Makefile.in | 1 | ||||
| -rw-r--r-- | Build/source/extra/xz/debug/full_flush.c | 2 | ||||
| -rw-r--r-- | Build/source/extra/xz/debug/known_sizes.c | 2 | ||||
| -rw-r--r-- | Build/source/extra/xz/debug/sync_flush.c | 15 |
4 files changed, 3 insertions, 17 deletions
diff --git a/Build/source/extra/xz/debug/Makefile.in b/Build/source/extra/xz/debug/Makefile.in index c8fa9782a50..7634ccbdd7d 100644 --- a/Build/source/extra/xz/debug/Makefile.in +++ b/Build/source/extra/xz/debug/Makefile.in @@ -249,7 +249,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/Build/source/extra/xz/debug/full_flush.c b/Build/source/extra/xz/debug/full_flush.c index ce0d2e8940e..67442b15a2f 100644 --- a/Build/source/extra/xz/debug/full_flush.c +++ b/Build/source/extra/xz/debug/full_flush.c @@ -29,7 +29,7 @@ encode(size_t size, lzma_action action) do { if (strm.avail_in == 0 && size > 0) { - const size_t amount = MIN(size, CHUNK); + const size_t amount = my_min(size, CHUNK); strm.avail_in = fread(in, 1, amount, file_in); strm.next_in = in; size -= amount; // Intentionally not using avail_in. diff --git a/Build/source/extra/xz/debug/known_sizes.c b/Build/source/extra/xz/debug/known_sizes.c index cdee26dfd8e..6c3641f824a 100644 --- a/Build/source/extra/xz/debug/known_sizes.c +++ b/Build/source/extra/xz/debug/known_sizes.c @@ -87,7 +87,7 @@ main(void) != LZMA_OK) return 1; - lzma_index *idx = lzma_index_init(NULL, NULL); + lzma_index *idx = lzma_index_init(NULL); if (idx == NULL) return 1; diff --git a/Build/source/extra/xz/debug/sync_flush.c b/Build/source/extra/xz/debug/sync_flush.c index 4a31efdd88b..fc2ebcb2307 100644 --- a/Build/source/extra/xz/debug/sync_flush.c +++ b/Build/source/extra/xz/debug/sync_flush.c @@ -29,7 +29,7 @@ encode(size_t size, lzma_action action) do { if (strm.avail_in == 0 && size > 0) { - const size_t amount = MIN(size, CHUNK); + const size_t amount = my_min(size, CHUNK); strm.avail_in = fread(in, 1, amount, file_in); strm.next_in = in; size -= amount; // Intentionally not using avail_in. @@ -81,18 +81,6 @@ main(int argc, char **argv) .dist = 16 }; - lzma_options_subblock opt_subblock = { - .allow_subfilters = true, - .alignment = 8, // LZMA_SUBBLOCK_ALIGNMENT_DEFAULT, - .subblock_data_size = LZMA_SUBBLOCK_DATA_SIZE_DEFAULT, - .rle = 1, // LZMA_SUBBLOCK_RLE_OFF, - .subfilter_mode = LZMA_SUBFILTER_SET, - }; - opt_subblock.subfilter_options.id = LZMA_FILTER_LZMA1; - opt_subblock.subfilter_options.options = &opt_lzma; - opt_subblock.subfilter_options.id = LZMA_FILTER_DELTA; - opt_subblock.subfilter_options.options = &opt_delta; - lzma_filter filters[LZMA_FILTERS_MAX + 1]; filters[0].id = LZMA_FILTER_LZMA2; filters[0].options = &opt_lzma; @@ -132,6 +120,5 @@ main(int argc, char **argv) // Prevent useless warnings so we don't need to have special CFLAGS // to disable -Werror. (void)opt_lzma; - (void)opt_subblock; (void)opt_delta; } |