Merging upstream version 0.7.

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

1 files changed, 3 insertions, 4 deletions

diff --git a/plzip.h b/plzip.h
index afcf8ce..572e814 100644
--- a/plzip.h
+++ b/plzip.h
@@ -19,16 +19,15 @@
 class Pretty_print
   {
   const char * const stdin_name;
-  const unsigned int stdin_name_len;
   unsigned int longest_name;
   std::string name_;
   mutable bool first_post;
 
 public:
   Pretty_print( const std::vector< std::string > & filenames )
-    : stdin_name( "(stdin)" ), stdin_name_len( std::strlen( stdin_name ) ),
-      longest_name( 0 ), first_post( false )
+    : stdin_name( "(stdin)" ), longest_name( 0 ), first_post( false )
     {
+    const unsigned int stdin_name_len = std::strlen( stdin_name );
     for( unsigned int i = 0; i < filenames.size(); ++i )
       {
       const std::string & s = filenames[i];
@@ -119,7 +118,7 @@ int decompress( const int num_workers, const int num_slots,
 
 extern int verbosity;
 
-void fatal();		// Terminate the process
+void fatal();		// terminate the program
 
 void show_error( const char * const msg, const int errcode = 0, const bool help = false ) throw();
 void internal_error( const char * const msg );