diff options
Diffstat (limited to 'dec_stream.cc')
| -rw-r--r-- | dec_stream.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dec_stream.cc b/dec_stream.cc index 4a0de60..8b68335 100644 --- a/dec_stream.cc +++ b/dec_stream.cc @@ -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 @@ -185,9 +185,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 ) @@ -446,7 +445,7 @@ fail: if( size + hsize < min_member_size ) { if( shared_retval.set_value( 2 ) ) show_file_error( pp.name(), ( size <= 0 ) ? "File ends unexpectedly at member header." : - "Input file is too short." ); goto fail; } + "Input file is truncated." ); goto fail; } const Lzip_header & header = *(const Lzip_header *)buffer; if( !header.check_magic() ) { if( shared_retval.set_value( 2 ) ) @@ -563,7 +562,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(); } } |