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
10
main.cc
10
main.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
|
||||
|
@ -79,7 +79,7 @@ int verbosity = 0;
|
|||
namespace {
|
||||
|
||||
const char * const program_name = "plzip";
|
||||
const char * const program_year = "2024";
|
||||
const char * const program_year = "2025";
|
||||
const char * invocation_name = program_name; // default value
|
||||
|
||||
const struct { const char * from; const char * to; } known_extensions[] = {
|
||||
|
@ -122,7 +122,7 @@ void show_help( const long num_online )
|
|||
"to 2 percent larger compressed files). Note that the number of usable\n"
|
||||
"threads is limited by file size; on files larger than a few GB plzip can use\n"
|
||||
"hundreds of processors, but on files smaller than 1 MiB plzip is no faster\n"
|
||||
"than lzip (even at compression level -0).\n"
|
||||
"than lzip (not even at compression level -0).\n"
|
||||
"The number of threads defaults to the number of processors.\n"
|
||||
"\nUsage: %s [options] [files]\n", invocation_name );
|
||||
std::printf( "\nOptions:\n"
|
||||
|
@ -297,7 +297,7 @@ void show_header( const unsigned dictionary_size )
|
|||
|
||||
namespace {
|
||||
|
||||
// separate numbers of 6 or more digits in groups of 3 digits using '_'
|
||||
// separate numbers of 5 or more digits in groups of 3 digits using '_'
|
||||
const char * format_num3( unsigned long long num )
|
||||
{
|
||||
enum { buffers = 8, bufsize = 4 * sizeof num, n = 10 };
|
||||
|
@ -320,7 +320,7 @@ const char * format_num3( unsigned long long num )
|
|||
{ num /= 1000; prefix = si_prefix[i]; }
|
||||
if( prefix ) *(--p) = prefix;
|
||||
}
|
||||
const bool split = num >= 100000;
|
||||
const bool split = num >= 10000;
|
||||
|
||||
for( int i = 0; ; )
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue