summaryrefslogtreecommitdiffstats
path: root/clzip.h
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-06 11:29:58 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-06 11:29:58 +0000
commit72be44917bc19be536d1413c0f122cf5f2414263 (patch)
treede59e3cdd43e922654d43b2bbcb60e7e5936ed2c /clzip.h
parentAdding debian version 1.0-1. (diff)
downloadclzip-72be44917bc19be536d1413c0f122cf5f2414263.tar.xz
clzip-72be44917bc19be536d1413c0f122cf5f2414263.zip
Merging upstream version 1.1~rc2.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'clzip.h')
-rw-r--r--clzip.h152
1 files changed, 84 insertions, 68 deletions
diff --git a/clzip.h b/clzip.h
index 4629000..223cafd 100644
--- a/clzip.h
+++ b/clzip.h
@@ -1,4 +1,4 @@
-/* Clzip - A data compressor based on the LZMA algorithm
+/* Clzip - Data compressor based on the LZMA algorithm
Copyright (C) 2010 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify
@@ -24,32 +24,35 @@
typedef unsigned char State;
-enum { St_states = 12 };
+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 const unsigned char next[St_states] =
- {0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 4, 5};
+ static const unsigned char next[states] =
+ { 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 4, 5 };
*st = next[*st];
}
+
static inline void St_set_match( State * const st )
{
- static const unsigned char next[St_states] =
- {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
+ static const unsigned char next[states] =
+ { 7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10 };
*st = next[*st];
}
+
static inline void St_set_rep( State * const st )
{
- static const unsigned char next[St_states] =
- {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
+ static const unsigned char next[states] =
+ { 8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11 };
*st = next[*st];
}
+
static inline void St_set_short_rep( State * const st )
{
- static const unsigned char next[St_states] =
- {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
+ static const unsigned char next[states] =
+ { 9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11 };
*st = next[*st];
}
@@ -78,8 +81,8 @@ enum {
len_high_symbols = 1 << len_high_bits,
max_len_symbols = len_low_symbols + len_mid_symbols + len_high_symbols,
- min_match_len = 2, // must be 2
- max_match_len = min_match_len + max_len_symbols - 1, // 273
+ min_match_len = 2, /* must be 2 */
+ max_match_len = min_match_len + max_len_symbols - 1, /* 273 */
min_match_len_limit = 5,
max_dis_states = 4 };
@@ -91,10 +94,10 @@ static inline int get_dis_state( int len )
return len;
}
-enum {
- bit_model_move_bits = 5,
- bit_model_total_bits = 11,
- bit_model_total = 1 << bit_model_total_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;
@@ -107,11 +110,12 @@ 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 num_filenames, const int v );
static inline void Pp_set_name( struct Pretty_print * const pp,
const char * const filename )
@@ -127,16 +131,18 @@ static inline void Pp_reset( struct Pretty_print * const pp )
void Pp_show_msg( struct Pretty_print * const pp, const char * const msg );
-typedef uint32_t CRC32[256]; // Table of CRCs of all 8-bit messages.
+typedef uint32_t CRC32[256]; /* Table of CRCs of all 8-bit messages. */
extern CRC32 crc32;
static inline void CRC32_init()
{
- for( unsigned int n = 0; n < 256; ++n )
+ unsigned int n;
+ for( n = 0; n < 256; ++n )
{
unsigned int c = n;
- for( int k = 0; k < 8; ++k )
+ int k;
+ for( k = 0; k < 8; ++k )
{ if( c & 1 ) c = 0xEDB88320U ^ ( c >> 1 ); else c >>= 1; }
crc32[n] = c;
}
@@ -147,63 +153,66 @@ static inline void CRC32_update_byte( uint32_t * crc, const uint8_t byte )
static inline void CRC32_update_buf( uint32_t * crc, const uint8_t * const buffer,
const int size )
{
- for( int i = 0; i < size; ++i )
+ int i;
+ for( i = 0; i < size; ++i )
*crc = crc32[(*crc^buffer[i])&0xFF] ^ ( *crc >> 8 );
}
-typedef uint8_t File_header[6]; // 0-3 magic bytes
- // 4 version
- // 5 coded_dict_size;
+static inline int real_bits( const int value )
+ {
+ int bits = 0, i, mask;
+ for( i = 1, mask = 1; mask > 0; ++i, mask <<= 1 )
+ if( value & mask ) bits = i;
+ return bits;
+ }
+
+
+static const uint8_t magic_string[4] = { 'L', 'Z', 'I', 'P' };
+
+typedef uint8_t File_header[6]; /* 0-3 magic bytes */
+ /* 4 version */
+ /* 5 coded_dict_size; */
enum { Fh_size = 6 };
-static inline void Fh_set_magic( File_header header )
+static inline void Fh_set_magic( File_header data )
{
- const uint8_t magic_string[4] = { 'L', 'Z', 'I', 'P' };
- memcpy( header, magic_string, 4 );
- header[4] = 1;
+ memcpy( data, magic_string, 4 );
+ data[4] = 1;
}
-static inline bool Fh_verify_magic( const File_header header )
+static inline bool Fh_verify_magic( const File_header data )
{
- const uint8_t magic_string[4] = { 'L', 'Z', 'I', 'P' };
- return ( memcmp( header, magic_string, 4 ) == 0 );
+ return ( memcmp( data, magic_string, 4 ) == 0 );
}
-static inline uint8_t Fh_version( const File_header header )
- { return header[4]; }
-
-static inline bool Fh_verify_version( const File_header header )
- { return ( header[4] <= 1 ); }
+static inline uint8_t Fh_version( const File_header data )
+ { return data[4]; }
-static inline int Fh_real_bits( const int value )
- {
- int bits = 0;
- for( int i = 1, mask = 1; mask > 0; ++i, mask <<= 1 )
- if( value & mask ) bits = i;
- return bits;
- }
+static inline bool Fh_verify_version( const File_header data )
+ { return ( data[4] <= 1 ); }
-static inline int Fh_get_dictionary_size( const File_header header )
+static inline int Fh_get_dictionary_size( const File_header data )
{
- int sz = ( 1 << ( header[5] & 0x1F ) );
+ int sz = ( 1 << ( data[5] & 0x1F ) );
if( sz > min_dictionary_size && sz <= max_dictionary_size )
- sz -= ( sz / 16 ) * ( ( header[5] >> 5 ) & 0x07 );
+ sz -= ( sz / 16 ) * ( ( data[5] >> 5 ) & 0x07 );
return sz;
}
-static inline bool Fh_set_dictionary_size( File_header header, const int sz )
+static inline bool Fh_set_dictionary_size( File_header data, const int sz )
{
if( sz >= min_dictionary_size && sz <= max_dictionary_size )
{
- header[5] = Fh_real_bits( sz - 1 );
+ data[5] = real_bits( sz - 1 );
if( sz > min_dictionary_size )
{
- const int base_size = 1 << header[5];
+ const int base_size = 1 << data[5];
const int wedge = base_size / 16;
- for( int i = 7; i >= 1; --i )
+ int i;
+ for( i = 7; i >= 1; --i )
if( base_size - ( i * wedge ) >= sz )
- { header[5] |= ( i << 5 ); break; }
+ { data[5] |= ( i << 5 ); break; }
}
return true;
}
@@ -212,52 +221,59 @@ static inline bool Fh_set_dictionary_size( File_header header, const int sz )
typedef uint8_t File_trailer[20];
- // 0-3 CRC32 of the uncompressed data
- // 4-11 size of the uncompressed data
- // 12-19 member size including header and trailer
+ /* 0-3 CRC32 of the uncompressed data */
+ /* 4-11 size of the uncompressed data */
+ /* 12-19 member size including header and trailer */
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 trailer )
+static inline uint32_t Ft_get_data_crc( const File_trailer data )
{
uint32_t tmp = 0;
- for( int i = 3; i >= 0; --i ) { tmp <<= 8; tmp += trailer[i]; }
+ int i;
+ for( i = 3; i >= 0; --i ) { tmp <<= 8; tmp += data[i]; }
return tmp;
}
-static inline void Ft_set_data_crc( File_trailer trailer, uint32_t crc )
- { for( int i = 0; i <= 3; ++i ) { trailer[i] = (uint8_t)crc; crc >>= 8; } }
+static inline void Ft_set_data_crc( File_trailer data, uint32_t 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 trailer )
+static inline long long Ft_get_data_size( const File_trailer data )
{
long long tmp = 0;
- for( int i = 11; i >= 4; --i ) { tmp <<= 8; tmp += trailer[i]; }
+ int i;
+ for( i = 11; i >= 4; --i ) { tmp <<= 8; tmp += data[i]; }
return tmp;
}
-static inline void Ft_set_data_size( File_trailer trailer, long long sz )
+static inline void Ft_set_data_size( File_trailer data, long long sz )
{
- for( int i = 4; i <= 11; ++i ) { trailer[i] = (uint8_t)sz; sz >>= 8; }
+ 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 trailer )
+static inline long long Ft_get_member_size( const File_trailer data )
{
long long tmp = 0;
- for( int i = 19; i >= 12; --i ) { tmp <<= 8; tmp += trailer[i]; }
+ int i;
+ for( i = 19; i >= 12; --i ) { tmp <<= 8; tmp += data[i]; }
return tmp;
}
-static inline void Ft_set_member_size( File_trailer trailer, long long sz )
+static inline void Ft_set_member_size( File_trailer data, long long sz )
{
- for( int i = 12; i <= 19; ++i ) { trailer[i] = (uint8_t)sz; sz >>= 8; }
+ int i;
+ for( i = 12; i <= 19; ++i ) { data[i] = (uint8_t)sz; sz >>= 8; }
}
-extern int verbosity;
-
+/* 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 );