diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 11:52:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 11:52:38 +0000 |
| commit | d296515f4777d1e4b7d78e6aa8ea698162bfbc2b (patch) | |
| tree | 3a4ce9f245a9eb30538daa0b9b62c16146d9ad0e /decoder.cc | |
| parent | Adding debian version 1.17-1. (diff) | |
| download | lziprecover-d296515f4777d1e4b7d78e6aa8ea698162bfbc2b.tar.xz lziprecover-d296515f4777d1e4b7d78e6aa8ea698162bfbc2b.zip | |
Merging upstream version 1.18~pre1.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'decoder.cc')
| -rw-r--r-- | decoder.cc | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -43,7 +43,7 @@ void Pretty_print::operator()( const char * const msg, FILE * const f ) const first_post = false; std::fprintf( f, " %s: ", name_.c_str() ); for( unsigned i = 0; i < longest_name - name_.size(); ++i ) - std::fprintf( f, " " ); + std::fputc( ' ', f ); if( !msg ) std::fflush( f ); } if( msg ) std::fprintf( f, "%s\n", msg ); @@ -154,7 +154,7 @@ bool LZ_decoder::verify_trailer( const Pretty_print & pp ) const if( pp.verbosity() >= 0 ) { pp(); - std::fprintf( stderr, "CRC mismatch; trailer says %08X, data CRC is %08X.\n", + std::fprintf( stderr, "CRC mismatch; trailer says %08X, data CRC is %08X\n", trailer.data_crc(), crc() ); } } @@ -164,7 +164,7 @@ bool LZ_decoder::verify_trailer( const Pretty_print & pp ) const if( pp.verbosity() >= 0 ) { pp(); - std::fprintf( stderr, "Data size mismatch; trailer says %llu, data size is %llu (0x%llX).\n", + std::fprintf( stderr, "Data size mismatch; trailer says %llu, data size is %llu (0x%llX)\n", trailer.data_size(), data_position(), data_position() ); } } @@ -174,7 +174,7 @@ bool LZ_decoder::verify_trailer( const Pretty_print & pp ) const if( pp.verbosity() >= 0 ) { pp(); - std::fprintf( stderr, "Member size mismatch; trailer says %llu, member size is %llu (0x%llX).\n", + std::fprintf( stderr, "Member size mismatch; trailer says %llu, member size is %llu (0x%llX)\n", trailer.member_size(), member_size, member_size ); } } @@ -231,7 +231,7 @@ int LZ_decoder::decode_member( const Pretty_print & pp ) peek( rep0 ) ) ); } } - else + else /* match or repeated match */ { int len; if( rdec.decode_bit( bm_rep[state()] ) != 0 ) // 2nd bit @@ -260,7 +260,7 @@ int LZ_decoder::decode_member( const Pretty_print & pp ) state.set_rep(); len = min_match_len + rdec.decode_len( rep_len_model, pos_state ); } - else + else /* match */ { const unsigned rep0_saved = rep0; len = min_match_len + rdec.decode_len( match_len_model, pos_state ); @@ -293,7 +293,7 @@ int LZ_decoder::decode_member( const Pretty_print & pp ) if( pp.verbosity() >= 0 ) { pp(); - std::fprintf( stderr, "Unsupported marker code '%d'.\n", len ); + std::fprintf( stderr, "Unsupported marker code '%d'\n", len ); } return 4; } |