Merging upstream version 1.9.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 14 insertions, 24 deletions

diff --git a/fast_encoder.h b/fast_encoder.h
index 9d9e1c7..c02e9cb 100644
--- a/fast_encoder.h
+++ b/fast_encoder.h
@@ -1,34 +1,26 @@
 /*  Lzlib - Compression library for the lzip format
-    Copyright (C) 2009-2016 Antonio Diaz Diaz.
+    Copyright (C) 2009-2017 Antonio Diaz Diaz.
 
-    This library is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 2 of the License, or
-    (at your option) any later version.
+    This library is free software. Redistribution and use in source and
+    binary forms, with or without modification, are permitted provided
+    that the following conditions are met:
 
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
 
-    You should have received a copy of the GNU General Public License
-    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+    2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
 
-    As a special exception, you may use this file as part of a free
-    software library without restriction.  Specifically, if other files
-    instantiate templates or use macros or inline functions from this
-    file, or you compile this file and link it with other files to
-    produce an executable, this file does not by itself cause the
-    resulting executable to be covered by the GNU General Public
-    License.  This exception does not however invalidate any other
-    reasons why the executable file might be covered by the GNU General
-    Public License.
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
 struct FLZ_encoder
   {
   struct LZ_encoder_base eb;
-  int key4;			/* key made from latest 4 bytes */
+  unsigned key4;			/* key made from latest 4 bytes */
   };
 
 static inline void FLZe_reset_key4( struct FLZ_encoder * const fe )
@@ -47,12 +39,10 @@ static inline bool FLZe_update_and_move( struct FLZ_encoder * const fe, int n )
     {
     if( Mb_available_bytes( &fe->eb.mb ) >= 4 )
       {
-      int newpos;
       fe->key4 = ( ( fe->key4 << 4 ) ^ fe->eb.mb.buffer[fe->eb.mb.pos+3] ) &
                  fe->eb.mb.key4_mask;
-      newpos = fe->eb.mb.prev_positions[fe->key4];
+      fe->eb.mb.pos_array[fe->eb.mb.cyclic_pos] = fe->eb.mb.prev_positions[fe->key4];
       fe->eb.mb.prev_positions[fe->key4] = fe->eb.mb.pos + 1;
-      fe->eb.mb.pos_array[fe->eb.mb.cyclic_pos] = newpos;
       }
     else fe->eb.mb.pos_array[fe->eb.mb.cyclic_pos] = 0;
     if( !Mb_move_pos( &fe->eb.mb ) ) return false;