Merging upstream version 1.4.

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

1 files changed, 50 insertions, 61 deletions

diff --git a/clzip.h b/clzip.h
index 42c014e..dd63438 100644
--- a/clzip.h
+++ b/clzip.h
@@ -1,5 +1,5 @@
 /*  Clzip - Data compressor based on the LZMA algorithm
-    Copyright (C) 2010, 2011, 2012 Antonio Diaz Diaz.
+    Copyright (C) 2010, 2011, 2012, 2013 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
@@ -22,39 +22,26 @@
   #define min(x,y) ((x) <= (y) ? (x) : (y))
 #endif
 
-typedef unsigned char State;
+typedef int State;
 
 enum { states = 12 };
 
 static inline bool St_is_char( const State st ) { return st < 7; }
 
-static inline void St_set_char( State * const st )
+static inline State St_set_char( const State st )
   {
-  static const unsigned char next[states] =
-    { 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 4, 5 };
-  *st = next[*st];
+  static const State next[states] = { 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 4, 5 };
+  return next[st];
   }
 
-static inline void St_set_match( State * const st )
-  {
-  static const unsigned char next[states] =
-    { 7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10 };
-  *st = next[*st];
-  }
+static inline State St_set_match( const State st )
+  { return ( ( st < 7 ) ? 7 : 10 ); }
 
-static inline void St_set_rep( State * const st )
-  {
-  static const unsigned char next[states] =
-    { 8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11 };
-  *st = next[*st];
-  }
+static inline State St_set_rep( const State st )
+  { return ( ( st < 7 ) ? 8 : 11 ); }
 
-static inline void St_set_short_rep( State * const st )
-  {
-  static const unsigned char next[states] =
-    { 9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11 };
-  *st = next[*st];
-  }
+static inline State St_set_short_rep( const State st )
+  { return ( ( st < 7 ) ? 9 : 11 ); }
 
 
 enum {
@@ -70,7 +57,7 @@ enum {
   dis_slot_bits = 6,
   start_dis_model = 4,
   end_dis_model = 14,
-  modeled_distances = 1 << (end_dis_model / 2),
+  modeled_distances = 1 << (end_dis_model / 2),		/* 128 */
   dis_align_bits = 4,
   dis_align_size = 1 << dis_align_bits,
 
@@ -88,23 +75,25 @@ enum {
 
   max_dis_states = 4 };
 
-static inline int get_dis_state( int len )
-  {
-  len -= min_match_len;
-  if( len >= max_dis_states ) len = max_dis_states - 1;
-  return len;
-  }
+static inline int get_dis_state( const int len )
+  { return min( len - min_match_len, max_dis_states - 1 ); }
+
+static inline int get_lit_state( const uint8_t prev_byte )
+  { return ( prev_byte >> ( 8 - literal_context_bits ) ); }
 
 
 enum { bit_model_move_bits = 5,
        bit_model_total_bits = 11,
        bit_model_total = 1 << bit_model_total_bits };
 
-typedef unsigned int Bit_model;
+typedef int Bit_model;
 
 static inline void Bm_init( Bit_model * const probability )
   { *probability = bit_model_total / 2; }
 
+static inline void Bm_array_init( Bit_model * const p, const int size )
+  { int i = 0; while( i < size ) p[i++] = bit_model_total / 2; }
+
 
 struct Pretty_print
   {
@@ -121,7 +110,7 @@ void Pp_init( struct Pretty_print * const pp, const char * const filenames[],
 static inline void Pp_set_name( struct Pretty_print * const pp,
                                 const char * const filename )
   {
-  if( filename && filename[0] && strcmp( filename, "-" ) )
+  if( filename && filename[0] && strcmp( filename, "-" ) != 0 )
     pp->name = filename;
   else pp->name = pp->stdin_name;
   pp->first_post = true;
@@ -136,12 +125,12 @@ typedef uint32_t CRC32[256];	/* Table of CRCs of all 8-bit messages. */
 
 extern CRC32 crc32;
 
-static inline void CRC32_init()
+static inline void CRC32_init( void )
   {
-  unsigned int n;
+  unsigned n;
   for( n = 0; n < 256; ++n )
     {
-    unsigned int c = n;
+    unsigned c = n;
     int k;
     for( k = 0; k < 8; ++k )
       { if( c & 1 ) c = 0xEDB88320U ^ ( c >> 1 ); else c >>= 1; }
@@ -149,10 +138,11 @@ static inline void CRC32_init()
     }
   }
 
-static inline void CRC32_update_byte( uint32_t * crc, const uint8_t byte )
+static inline void CRC32_update_byte( uint32_t * const crc, const uint8_t byte )
   { *crc = crc32[(*crc^byte)&0xFF] ^ ( *crc >> 8 ); }
-static inline void CRC32_update_buf( uint32_t * crc, const uint8_t * const buffer,
-                                     const int size )
+
+static inline void CRC32_update_buf( uint32_t * const crc,
+                                     const uint8_t * const buffer, const int size )
   {
   int i;
   for( i = 0; i < size; ++i )
@@ -160,16 +150,15 @@ static inline void CRC32_update_buf( uint32_t * crc, const uint8_t * const buffe
   }
 
 
-static inline int real_bits( const unsigned int value )
+static inline int real_bits( unsigned value )
   {
-  int bits = 0, i = 1;
-  unsigned int mask = 1;
-  for( ; mask > 0; ++i, mask <<= 1 ) if( value & mask ) bits = i;
+  int bits = 0;
+  while( value > 0 ) { value >>= 1; ++bits; }
   return bits;
   }
 
 
-static const uint8_t magic_string[4] = { 'L', 'Z', 'I', 'P' };
+static const uint8_t magic_string[4] = { 0x4C, 0x5A, 0x49, 0x50 }; /* "LZIP" */
 
 typedef uint8_t File_header[6];		/* 0-3 magic bytes */
 					/*   4 version */
@@ -188,11 +177,11 @@ static inline uint8_t Fh_version( const File_header data )
 static inline bool Fh_verify_version( const File_header data )
   { return ( data[4] <= 1 ); }
 
-static inline int Fh_get_dictionary_size( const File_header data )
+static inline unsigned Fh_get_dictionary_size( const File_header data )
   {
-  int sz = ( 1 << ( data[5] & 0x1F ) );
-  if( sz > min_dictionary_size && sz <= max_dictionary_size )
-    sz -= ( sz / 16 ) * ( ( data[5] >> 5 ) & 0x07 );
+  unsigned sz = ( 1 << ( data[5] & 0x1F ) );
+  if( sz > min_dictionary_size )
+    sz -= ( sz / 16 ) * ( ( data[5] >> 5 ) & 7 );
   return sz;
   }
 
@@ -226,54 +215,54 @@ enum { Ft_size = 20 };
 static inline int Ft_versioned_size( const int version )
   { return ( ( version >= 1 ) ? 20 : 12 ); }
 
-static inline uint32_t Ft_get_data_crc( const File_trailer data )
+static inline unsigned Ft_get_data_crc( const File_trailer data )
   {
-  uint32_t tmp = 0;
+  unsigned tmp = 0;
   int i;
   for( i = 3; i >= 0; --i ) { tmp <<= 8; tmp += data[i]; }
   return tmp;
   }
 
-static inline void Ft_set_data_crc( File_trailer data, uint32_t crc )
+static inline void Ft_set_data_crc( File_trailer data, unsigned crc )
   {
   int i;
   for( i = 0; i <= 3; ++i ) { data[i] = (uint8_t)crc; crc >>= 8; }
   }
 
-static inline long long Ft_get_data_size( const File_trailer data )
+static inline unsigned long long Ft_get_data_size( const File_trailer data )
   {
-  long long tmp = 0;
+  unsigned long long tmp = 0;
   int i;
   for( i = 11; i >= 4; --i ) { tmp <<= 8; tmp += data[i]; }
   return tmp;
   }
 
-static inline void Ft_set_data_size( File_trailer data, long long sz )
+static inline void Ft_set_data_size( File_trailer data, unsigned long long sz )
   {
   int i;
   for( i = 4; i <= 11; ++i ) { data[i] = (uint8_t)sz; sz >>= 8; }
   }
 
-static inline long long Ft_get_member_size( const File_trailer data )
+static inline unsigned long long Ft_get_member_size( const File_trailer data )
   {
-  long long tmp = 0;
+  unsigned long long tmp = 0;
   int i;
   for( i = 19; i >= 12; --i ) { tmp <<= 8; tmp += data[i]; }
   return tmp;
   }
 
-static inline void Ft_set_member_size( File_trailer data, long long sz )
+static inline void Ft_set_member_size( File_trailer data, unsigned long long sz )
   {
   int i;
   for( i = 12; i <= 19; ++i ) { data[i] = (uint8_t)sz; sz >>= 8; }
   }
 
 
+/* defined in decoder.c */
+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 */
 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 );
-
-/* defined in decoder.c */
-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 );