Merging upstream version 1.5~pre2.

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

1 files changed, 10 insertions, 7 deletions

diff --git a/lzip.h b/lzip.h
index 1996e97..6141d5d 100644
--- a/lzip.h
+++ b/lzip.h
@@ -1,4 +1,4 @@
-/*  Clzip - Data compressor based on the LZMA algorithm
+/*  Clzip - LZMA lossless data compressor
     Copyright (C) 2010, 2011, 2012, 2013 Antonio Diaz Diaz.
 
     This program is free software: you can redistribute it and/or modify
@@ -118,12 +118,11 @@ struct Pretty_print
   const char * name;
   const char * stdin_name;
   int longest_name;
-  int verbosity;
   bool first_post;
   };
 
 void Pp_init( struct Pretty_print * const pp, const char * const filenames[],
-              const int num_filenames, const int v );
+              const int num_filenames );
 
 static inline void Pp_set_name( struct Pretty_print * const pp,
                                 const char * const filename )
@@ -193,7 +192,7 @@ static inline uint8_t Fh_version( const File_header data )
   { return data[4]; }
 
 static inline bool Fh_verify_version( const File_header data )
-  { return ( data[4] <= 1 ); }
+  { return ( data[4] == 1 ); }
 
 static inline unsigned Fh_get_dictionary_size( const File_header data )
   {
@@ -230,9 +229,6 @@ typedef uint8_t File_trailer[20];
 
 enum { Ft_size = 20 };
 
-static inline int Ft_versioned_size( const int version )
-  { return ( ( version >= 1 ) ? 20 : 12 ); }
-
 static inline unsigned Ft_get_data_crc( const File_trailer data )
   {
   unsigned tmp = 0;
@@ -281,6 +277,13 @@ int readblock( const int fd, uint8_t * const buf, const int size );
 int writeblock( const int fd, const uint8_t * const buf, const int size );
 
 /* defined in main.c */
+extern int verbosity;
 void cleanup_and_fail( const int retval );
 void show_error( const char * const msg, const int errcode, const bool help );
 void internal_error( const char * const msg );
+struct Matchfinder;
+struct stat;
+void show_progress( const unsigned long long partial_size,
+                    const struct Matchfinder * const m,
+                    struct Pretty_print * const p,
+                    const struct stat * const in_statsp );