lzip/plzip
1
0
Fork 0
Code Issues Activity

Merging upstream version 1.12.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 04:20:02 +01:00
parent d2621fb521
commit 3708015695
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
19 changed files with 83 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dec_stream.cc
View file

@ -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();
}
}