diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-01-09 05:52:40 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-01-09 05:53:03 +0000 |
| commit | 882d8d8da4a8b4a332458c4f01b03d81c2c08c78 (patch) | |
| tree | d7acd130c7201183b14adfa8e095e79eb1f49bbe /compress.cc | |
| parent | Releasing debian version 0.21-3. (diff) | |
| download | tarlz-882d8d8da4a8b4a332458c4f01b03d81c2c08c78.tar.xz tarlz-882d8d8da4a8b4a332458c4f01b03d81c2c08c78.zip | |
Merging upstream version 0.22.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'compress.cc')
| -rw-r--r-- | compress.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/compress.cc b/compress.cc index e26814b..ad3f151 100644 --- a/compress.cc +++ b/compress.cc @@ -1,5 +1,5 @@ /* Tarlz - Archiver with multimember lzip compression - Copyright (C) 2013-2021 Antonio Diaz Diaz. + Copyright (C) 2013-2022 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 @@ -122,10 +122,6 @@ void close_and_set_permissions( const struct stat * const in_statsp ) } -inline void set_retval( int & retval, const int new_val ) - { if( retval < new_val ) retval = new_val; } - - bool archive_write( const uint8_t * const buf, const long long size, LZ_Encoder * const encoder ) { @@ -318,9 +314,6 @@ int compress_archive( const Cl_options & cl_opts, int compress( Cl_options & cl_opts ) { - if( !cl_opts.archive_name.empty() ) - { show_file_error( cl_opts.archive_name.c_str(), - "Option '-f' is incompatible with '--compress'." ); return 1; } if( cl_opts.num_files > 1 && cl_opts.output_filename.size() ) { show_file_error( cl_opts.output_filename.c_str(), "Only can compress one archive when using '-o'." ); return 1; } |