Merging upstream version 1.14~rc1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
093c647604
commit
62d1763fed
17 changed files with 216 additions and 154 deletions
11
lzip.h
11
lzip.h
|
@ -188,9 +188,20 @@ static inline void Lt_set_member_size( Lzip_trailer data, unsigned long long sz
|
|||
{ int i; for( i = 12; i <= 19; ++i ) { data[i] = (uint8_t)sz; sz >>= 8; } }
|
||||
|
||||
|
||||
struct Cl_options /* command-line options */
|
||||
{
|
||||
bool ignore_trailing;
|
||||
bool loose_trailing;
|
||||
};
|
||||
|
||||
static inline void Cl_options_init( struct Cl_options * cl_opts )
|
||||
{ cl_opts->ignore_trailing = true; cl_opts->loose_trailing = false; }
|
||||
|
||||
|
||||
static inline void set_retval( int * retval, const int new_val )
|
||||
{ if( *retval < new_val ) *retval = new_val; }
|
||||
|
||||
static const char * const empty_msg = "Empty member not allowed.";
|
||||
static const char * const trailing_msg = "Trailing data not allowed.";
|
||||
static const char * const mem_msg = "Not enough memory.";
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue