Merging upstream version 1.4~rc1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
f441ba7f78
commit
718f5f97e5
13 changed files with 84 additions and 94 deletions
10
compress.cc
10
compress.cc
|
@ -251,7 +251,7 @@ public:
|
|||
xlock( &omutex );
|
||||
// id collision shouldn't happen
|
||||
if( circular_buffer[i] != 0 )
|
||||
internal_error( "id collision in collect_packet" );
|
||||
internal_error( "id collision in collect_packet." );
|
||||
// merge packet into circular buffer
|
||||
circular_buffer[i] = opacket;
|
||||
if( opacket->id == deliver_id ) xsignal( &oav_or_exit );
|
||||
|
@ -387,7 +387,7 @@ extern "C" void * cworker( void * arg )
|
|||
if( !encoder || LZ_compress_errno( encoder ) == LZ_mem_error )
|
||||
pp( mem_msg );
|
||||
else
|
||||
internal_error( "invalid argument to encoder" );
|
||||
internal_error( "invalid argument to encoder." );
|
||||
cleanup_and_fail();
|
||||
}
|
||||
|
||||
|
@ -402,7 +402,7 @@ extern "C" void * cworker( void * arg )
|
|||
const int wr = LZ_compress_write( encoder,
|
||||
packet->data + offset + written,
|
||||
packet->size - written );
|
||||
if( wr < 0 ) internal_error( "library error (LZ_compress_write)" );
|
||||
if( wr < 0 ) internal_error( "library error (LZ_compress_write)." );
|
||||
written += wr;
|
||||
}
|
||||
if( written >= packet->size ) LZ_compress_finish( encoder );
|
||||
|
@ -419,7 +419,7 @@ extern "C" void * cworker( void * arg )
|
|||
}
|
||||
new_pos += rd;
|
||||
if( new_pos >= offset + written )
|
||||
internal_error( "packet size exceeded in worker" );
|
||||
internal_error( "packet size exceeded in worker." );
|
||||
if( LZ_compress_finished( encoder ) == 1 ) break;
|
||||
}
|
||||
|
||||
|
@ -542,6 +542,6 @@ int compress( const int data_size, const int dictionary_size,
|
|||
courier.ocheck_counter,
|
||||
courier.owait_counter );
|
||||
|
||||
if( !courier.finished() ) internal_error( "courier not finished" );
|
||||
if( !courier.finished() ) internal_error( "courier not finished." );
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue