Merging upstream version 1.13~rc2.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/lzip.h b/lzip.h
index f789ba3..9776710 100644
--- a/lzip.h
+++ b/lzip.h
@@ -1,5 +1,5 @@
 /*  Lzip - Data compressor based on the LZMA algorithm
-    Copyright (C) 2008, 2009, 2010, 2011 Antonio Diaz Diaz.
+    Copyright (C) 2008, 2009, 2010, 2011, 2012 Antonio Diaz Diaz.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -179,6 +179,7 @@ inline int real_bits( const int value ) throw()
   return bits;
   }
 
+
 const uint8_t magic_string[4] = { 'L', 'Z', 'I', 'P' };
 
 struct File_header
@@ -273,14 +274,14 @@ struct File_trailer
 struct Error
   {
   const char * const msg;
-  Error( const char * const s ) throw() : msg( s ) {}
+  explicit Error( const char * const s ) throw() : msg( s ) {}
   };
 
 
 // defined in main.cc
 void show_error( const char * const msg, const int errcode = 0,
                  const bool help = false ) throw();
-void internal_error( const char * const msg );
+void internal_error( const char * const msg ) throw();
 
 // defined in decoder.cc
 int readblock( const int fd, uint8_t * const buf, const int size ) throw();