Merging upstream version 1.6.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
bfae39f718
commit
404e96e1c5
22 changed files with 90 additions and 95 deletions
10
lzlib.c
10
lzlib.c
|
@ -1,5 +1,5 @@
|
|||
/* Lzlib - Compression library for lzip files
|
||||
Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
|
||||
/* Lzlib - Compression library for the lzip format
|
||||
Copyright (C) 2009-2014 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
|
||||
|
@ -241,11 +241,11 @@ int LZ_compress_sync_flush( struct LZ_Encoder * const e )
|
|||
if( e->flush_pending <= 0 && !Mf_flushing_or_end( e->matchfinder ) )
|
||||
{
|
||||
e->flush_pending = 2; /* 2 consecutive markers guarantee decoding */
|
||||
Mf_set_flushing( e->matchfinder, true );
|
||||
e->matchfinder->flushing = true;
|
||||
if( !LZe_encode_member( e->lz_encoder ) )
|
||||
{ e->lz_errno = LZ_library_error; e->fatal = true; return -1; }
|
||||
while( e->flush_pending > 0 && LZe_sync_flush( e->lz_encoder ) )
|
||||
{ if( --e->flush_pending <= 0 ) Mf_set_flushing( e->matchfinder, false ); }
|
||||
{ if( --e->flush_pending <= 0 ) e->matchfinder->flushing = false; }
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@ -258,7 +258,7 @@ int LZ_compress_read( struct LZ_Encoder * const e,
|
|||
if( !LZe_encode_member( e->lz_encoder ) )
|
||||
{ e->lz_errno = LZ_library_error; e->fatal = true; return -1; }
|
||||
while( e->flush_pending > 0 && LZe_sync_flush( e->lz_encoder ) )
|
||||
{ if( --e->flush_pending <= 0 ) Mf_set_flushing( e->matchfinder, false ); }
|
||||
{ if( --e->flush_pending <= 0 ) e->matchfinder->flushing = false; }
|
||||
return Re_read_data( &e->lz_encoder->renc, buffer, size );
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue