From ee4373742b5e806cf3fb080808a2061c5644a14d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 6 Nov 2015 12:29:00 +0100 Subject: Merging upstream version 1.0. Signed-off-by: Daniel Baumann --- decoder.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'decoder.c') diff --git a/decoder.c b/decoder.c index 0d00219..349fc8a 100644 --- a/decoder.c +++ b/decoder.c @@ -63,7 +63,7 @@ bool LZd_verify_trailer( struct LZ_decoder * const decoder, struct Pretty_print * const pp ) { File_trailer trailer; - const int trailer_size = Ft_versioned_size( decoder->format_version ); + const int trailer_size = Ft_versioned_size( decoder->member_version ); const long long member_size = LZd_member_position( decoder ) + trailer_size; bool error = false; @@ -83,7 +83,7 @@ bool LZd_verify_trailer( struct LZ_decoder * const decoder, for( ; i < trailer_size; ++i ) trailer[i] = 0; } } - if( decoder->format_version == 0 ) Ft_set_member_size( trailer, member_size ); + if( decoder->member_version == 0 ) Ft_set_member_size( trailer, member_size ); if( !Rd_code_is_zero( decoder->range_decoder ) ) { error = true; @@ -153,10 +153,11 @@ int LZd_decode_member( struct LZ_decoder * const decoder, { const uint8_t prev_byte = LZd_get_byte( decoder, 0 ); if( St_is_char( state ) ) - LZd_put_byte( decoder, Lid_decode( &decoder->literal_decoder, decoder->range_decoder, prev_byte ) ); + LZd_put_byte( decoder, Lid_decode( &decoder->literal_decoder, + decoder->range_decoder, prev_byte ) ); else - LZd_put_byte( decoder, Lid_decode_matched( &decoder->literal_decoder, decoder->range_decoder, prev_byte, - LZd_get_byte( decoder, rep0 ) ) ); + LZd_put_byte( decoder, Lid_decode_matched( &decoder->literal_decoder, + decoder->range_decoder, prev_byte, LZd_get_byte( decoder, rep0 ) ) ); St_set_char( &state ); } else -- cgit v1.2.3