From 684f601a8d5c03271f00c79ecf2503adc8f88aed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 23 Jan 2024 06:44:35 +0100 Subject: Adding upstream version 1.11. Signed-off-by: Daniel Baumann --- decompress.cc | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'decompress.cc') diff --git a/decompress.cc b/decompress.cc index 291e5eb..5b0e68f 100644 --- a/decompress.cc +++ b/decompress.cc @@ -1,6 +1,6 @@ /* Plzip - Massively parallel implementation of lzip Copyright (C) 2009 Laszlo Ersek. - Copyright (C) 2009-2022 Antonio Diaz Diaz. + Copyright (C) 2009-2024 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 @@ -266,22 +266,21 @@ done: // start the workers and wait for them to finish. int decompress( const unsigned long long cfile_size, int num_workers, - const int infd, const int outfd, const Pretty_print & pp, - const int debug_level, const int in_slots, - const int out_slots, const bool ignore_trailing, - const bool loose_trailing, const bool infd_isreg, - const bool one_to_one ) + const int infd, const int outfd, const Cl_options & cl_opts, + const Pretty_print & pp, const int debug_level, + const int in_slots, const int out_slots, + const bool infd_isreg, const bool one_to_one ) { if( !infd_isreg ) - return dec_stream( cfile_size, num_workers, infd, outfd, pp, debug_level, - in_slots, out_slots, ignore_trailing, loose_trailing ); + return dec_stream( cfile_size, num_workers, infd, outfd, cl_opts, pp, + debug_level, in_slots, out_slots ); - const Lzip_index lzip_index( infd, ignore_trailing, loose_trailing ); + const Lzip_index lzip_index( infd, cl_opts ); if( lzip_index.retval() == 1 ) // decompress as stream if seek fails { lseek( infd, 0, SEEK_SET ); - return dec_stream( cfile_size, num_workers, infd, outfd, pp, debug_level, - in_slots, out_slots, ignore_trailing, loose_trailing ); + return dec_stream( cfile_size, num_workers, infd, outfd, cl_opts, pp, + debug_level, in_slots, out_slots ); } if( lzip_index.retval() != 0 ) // corrupt or invalid input file { -- cgit v1.2.3