diff options
author | delphij <delphij@FreeBSD.org> | 2017-01-20 06:38:56 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2017-01-20 06:38:56 +0000 |
commit | 30cbb6108bcfbff283ed03041ab29062a73117aa (patch) | |
tree | 2f197f78cae6aa697322fcba87a87e660e947bdc /contrib/xz/src/liblzma/delta/delta_encoder.c | |
parent | bc98894a2d3528fe78e46419ae78b9d3e420f31a (diff) | |
download | FreeBSD-src-30cbb6108bcfbff283ed03041ab29062a73117aa.zip FreeBSD-src-30cbb6108bcfbff283ed03041ab29062a73117aa.tar.gz |
MFC r311504: MFV r311477: xz 5.2.3.
Diffstat (limited to 'contrib/xz/src/liblzma/delta/delta_encoder.c')
-rw-r--r-- | contrib/xz/src/liblzma/delta/delta_encoder.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/contrib/xz/src/liblzma/delta/delta_encoder.c b/contrib/xz/src/liblzma/delta/delta_encoder.c index 5a84263..3841651 100644 --- a/contrib/xz/src/liblzma/delta/delta_encoder.c +++ b/contrib/xz/src/liblzma/delta/delta_encoder.c @@ -18,7 +18,7 @@ /// is the first filter in the chain (and thus the last filter in the /// encoder's filter stack). static void -copy_and_encode(lzma_coder *coder, +copy_and_encode(lzma_delta_coder *coder, const uint8_t *restrict in, uint8_t *restrict out, size_t size) { const size_t distance = coder->distance; @@ -35,7 +35,7 @@ copy_and_encode(lzma_coder *coder, /// Encodes the data in place. This is used when we are the last filter /// in the chain (and thus non-last filter in the encoder's filter stack). static void -encode_in_place(lzma_coder *coder, uint8_t *buffer, size_t size) +encode_in_place(lzma_delta_coder *coder, uint8_t *buffer, size_t size) { const size_t distance = coder->distance; @@ -49,11 +49,13 @@ encode_in_place(lzma_coder *coder, uint8_t *buffer, size_t size) static lzma_ret -delta_encode(lzma_coder *coder, const lzma_allocator *allocator, +delta_encode(void *coder_ptr, const lzma_allocator *allocator, const uint8_t *restrict in, size_t *restrict in_pos, size_t in_size, uint8_t *restrict out, size_t *restrict out_pos, size_t out_size, lzma_action action) { + lzma_delta_coder *coder = coder_ptr; + lzma_ret ret; if (coder->next.code == NULL) { @@ -84,10 +86,12 @@ delta_encode(lzma_coder *coder, const lzma_allocator *allocator, static lzma_ret -delta_encoder_update(lzma_coder *coder, const lzma_allocator *allocator, +delta_encoder_update(void *coder_ptr, const lzma_allocator *allocator, const lzma_filter *filters_null lzma_attribute((__unused__)), const lzma_filter *reversed_filters) { + lzma_delta_coder *coder = coder_ptr; + // Delta doesn't and will never support changing the options in // the middle of encoding. If the app tries to change them, we // simply ignore them. |