From a12430a7bff80cea63fa05ffd716f0d5e91ddb6d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 10:59:28 +0100
Subject: Merging upstream version 1.15~pre3.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 decoder.cc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'decoder.cc')

diff --git a/decoder.cc b/decoder.cc
index 5f14fca..6f1627c 100644
--- a/decoder.cc
+++ b/decoder.cc
@@ -1,4 +1,4 @@
-/*  Lzip - Data compressor based on the LZMA algorithm
+/*  Lzip - LZMA lossless data compressor
     Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz.
 
     This program is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@ const CRC32 crc32;
 
 void Pretty_print::operator()( const char * const msg ) const
   {
-  if( verbosity_ >= 0 )
+  if( verbosity >= 0 )
     {
     if( first_post )
       {
@@ -129,7 +129,7 @@ bool LZ_decoder::verify_trailer( const Pretty_print & pp ) const
   if( size < trailer_size )
     {
     error = true;
-    if( pp.verbosity() >= 0 )
+    if( verbosity >= 0 )
       {
       pp();
       std::fprintf( stderr, "Trailer truncated at trailer position %d;"
@@ -148,7 +148,7 @@ bool LZ_decoder::verify_trailer( const Pretty_print & pp ) const
   if( trailer.data_crc() != crc() )
     {
     error = true;
-    if( pp.verbosity() >= 0 )
+    if( verbosity >= 0 )
       {
       pp();
       std::fprintf( stderr, "CRC mismatch; trailer says %08X, data CRC is %08X.\n",
@@ -158,7 +158,7 @@ bool LZ_decoder::verify_trailer( const Pretty_print & pp ) const
   if( trailer.data_size() != data_position() )
     {
     error = true;
-    if( pp.verbosity() >= 0 )
+    if( verbosity >= 0 )
       {
       pp();
       std::fprintf( stderr, "Data size mismatch; trailer says %llu, data size is %llu (0x%llX).\n",
@@ -168,19 +168,19 @@ bool LZ_decoder::verify_trailer( const Pretty_print & pp ) const
   if( trailer.member_size() != member_size )
     {
     error = true;
-    if( pp.verbosity() >= 0 )
+    if( verbosity >= 0 )
       {
       pp();
       std::fprintf( stderr, "Member size mismatch; trailer says %llu, member size is %llu (0x%llX).\n",
                     trailer.member_size(), member_size, member_size );
       }
     }
-  if( !error && pp.verbosity() >= 2 && data_position() > 0 && member_size > 0 )
+  if( !error && verbosity >= 2 && data_position() > 0 && member_size > 0 )
     std::fprintf( stderr, "%6.3f:1, %6.3f bits/byte, %5.2f%% saved.  ",
                   (double)data_position() / member_size,
                   ( 8.0 * member_size ) / data_position(),
                   100.0 * ( 1.0 - ( (double)member_size / data_position() ) ) );
-  if( !error && pp.verbosity() >= 4 )
+  if( !error && verbosity >= 4 )
     std::fprintf( stderr, "data CRC %08X, data size %9llu, member size %8llu.  ",
                   trailer.data_crc(), trailer.data_size(), trailer.member_size() );
   return !error;
@@ -283,7 +283,7 @@ int LZ_decoder::decode_member( const Pretty_print & pp )
                 {
                 rdec.load(); continue;
                 }
-              if( pp.verbosity() >= 0 )
+              if( verbosity >= 0 )
                 {
                 pp();
                 std::fprintf( stderr, "Unsupported marker code '%d'.\n", len );
-- 
cgit v1.2.3