Merging upstream version 1.12.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
d2621fb521
commit
3708015695
19 changed files with 83 additions and 95 deletions
|
@ -1,6 +1,6 @@
|
|||
/* Plzip - Massively parallel implementation of lzip
|
||||
Copyright (C) 2009 Laszlo Ersek.
|
||||
Copyright (C) 2009-2024 Antonio Diaz Diaz.
|
||||
Copyright (C) 2009-2025 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
|
||||
|
@ -129,9 +129,8 @@ out: xunlock( &omutex );
|
|||
do {
|
||||
while( opacket_queues[deliver_id].empty() && num_working > 0 )
|
||||
{ ++owait_counter; xwait( &oav_or_exit, &omutex ); }
|
||||
while( true )
|
||||
while( !opacket_queues[deliver_id].empty() )
|
||||
{
|
||||
if( opacket_queues[deliver_id].empty() ) break;
|
||||
Packet opacket = opacket_queues[deliver_id].front();
|
||||
opacket_queues[deliver_id].pop();
|
||||
if( opacket_queues[deliver_id].size() + 1 == out_slots )
|
||||
|
@ -275,7 +274,7 @@ void muxer( Packet_courier & courier, const Pretty_print & pp,
|
|||
if( shared_retval() == 0 &&
|
||||
writeblock( outfd, opacket.data, opacket.size ) != opacket.size &&
|
||||
shared_retval.set_value( 1 ) )
|
||||
{ pp(); show_error( write_error_msg, errno ); }
|
||||
{ pp(); show_error( wr_err_msg, errno ); }
|
||||
opacket.delete_data();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue