Merging upstream version 1.18~pre2.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 13 insertions, 11 deletions

diff --git a/lzip.h b/lzip.h
index e46b9b8..3bdc27c 100644
--- a/lzip.h
+++ b/lzip.h
@@ -40,7 +40,7 @@ public:
 
 enum {
   min_dictionary_bits = 12,
-  min_dictionary_size = 1 << min_dictionary_bits,	/* >= modeled_distances */
+  min_dictionary_size = 1 << min_dictionary_bits,	// >= modeled_distances
   max_dictionary_bits = 29,
   max_dictionary_size = 1 << max_dictionary_bits,
   min_member_size = 36,
@@ -53,7 +53,7 @@ enum {
   dis_slot_bits = 6,
   start_dis_model = 4,
   end_dis_model = 14,
-  modeled_distances = 1 << (end_dis_model / 2),		/* 128 */
+  modeled_distances = 1 << (end_dis_model / 2),		// 128
   dis_align_bits = 4,
   dis_align_size = 1 << dis_align_bits,
 
@@ -65,8 +65,8 @@ enum {
   len_high_symbols = 1 << len_high_bits,
   max_len_symbols = len_low_symbols + len_mid_symbols + len_high_symbols,
 
-  min_match_len = 2,					/* must be 2 */
-  max_match_len = min_match_len + max_len_symbols - 1,	/* 273 */
+  min_match_len = 2,					// must be 2
+  max_match_len = min_match_len + max_len_symbols - 1,	// 273
   min_match_len_limit = 5 };
 
 inline int get_len_state( const int len )
@@ -109,6 +109,7 @@ public:
     : stdin_name( "(stdin)" ), longest_name( 0 ), verbosity_( v ),
       first_post( false )
     {
+    if( verbosity_ <= 0 ) return;
     const unsigned stdin_name_len = std::strlen( stdin_name );
     for( unsigned i = 0; i < filenames.size(); ++i )
       {
@@ -186,9 +187,9 @@ const uint8_t magic_string[4] = { 0x4C, 0x5A, 0x49, 0x50 };	// "LZIP"
 
 struct File_header
   {
-  uint8_t data[6];			/* 0-3 magic bytes */
-					/*   4 version */
-					/*   5 coded_dict_size */
+  uint8_t data[6];			// 0-3 magic bytes
+					//   4 version
+					//   5 coded_dict_size
   enum { size = 6 };
 
   void set_magic() { std::memcpy( data, magic_string, 4 ); data[4] = 1; }
@@ -228,9 +229,9 @@ struct File_header
 
 struct File_trailer
   {
-  uint8_t data[20];	/*  0-3  CRC32 of the uncompressed data */
-			/*  4-11 size of the uncompressed data */
-			/* 12-19 member size including header and trailer */
+  uint8_t data[20];	//  0-3  CRC32 of the uncompressed data
+			//  4-11 size of the uncompressed data
+			// 12-19 member size including header and trailer
 
   enum { size = 20 };
 
@@ -291,7 +292,7 @@ int open_instream( const char * const name, struct stat * const in_statsp,
                    const bool no_ofile, const bool reg_only = false );
 bool file_exists( const std::string & filename );
 int open_outstream_rw( const std::string & output_filename, const bool force );
-void show_header( const unsigned dictionary_size );
+void show_header( const unsigned dictionary_size, const int vlevel = 3 );
 void show_error( const char * const msg, const int errcode = 0,
                  const bool help = false );
 void internal_error( const char * const msg );
@@ -328,6 +329,7 @@ int debug_show_packets( const std::string & input_filename,
                         const uint8_t bad_value );
 
 // defined in split.cc
+bool verify_header( const File_header & header, const Pretty_print & pp );
 int split_file( const std::string & input_filename,
                 const std::string & default_output_filename,
                 const int verbosity, const bool force );