diff options
author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 10:00:38 +0000 |
---|---|---|
committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 10:00:38 +0000 |
commit | f66493cb0e2e4baa840bdbf4894d02b54ef38d52 (patch) | |
tree | eaf63e5a5650e0fe54293aa687f83d46aa28b7fc /main.cc | |
parent | Adding debian version 1.15~rc1-1. (diff) | |
download | lzip-f66493cb0e2e4baa840bdbf4894d02b54ef38d52.tar.xz lzip-f66493cb0e2e4baa840bdbf4894d02b54ef38d52.zip |
Merging upstream version 1.15.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rw-r--r-- | main.cc | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -84,8 +84,8 @@ struct { const char * from; const char * to; } const known_extensions[] = { struct Lzma_options { - int dictionary_size; // 4KiB..512MiB - int match_len_limit; // 5..273 + int dictionary_size; // 4 KiB .. 512 MiB + int match_len_limit; // 5 .. 273 }; enum Mode { m_compress, m_decompress, m_test }; @@ -114,7 +114,7 @@ void show_help() " -m, --match-length=<bytes> set match length limit in bytes [36]\n" " -o, --output=<file> if reading stdin, place the output into <file>\n" " -q, --quiet suppress all messages\n" - " -s, --dictionary-size=<bytes> set dictionary size limit in bytes [8MiB]\n" + " -s, --dictionary-size=<bytes> set dictionary size limit in bytes [8 MiB]\n" " -S, --volume-size=<bytes> set volume size limit in bytes\n" " -t, --test test compressed file integrity\n" " -v, --verbose be verbose (a 2nd -v gives more)\n" @@ -739,8 +739,8 @@ void show_progress( const unsigned long long partial_size, int main( const int argc, const char * const argv[] ) { - // Mapping from gzip/bzip2 style 1..9 compression modes - // to the corresponding LZMA compression modes. + /* Mapping from gzip/bzip2 style 1..9 compression modes + to the corresponding LZMA compression modes. */ const Lzma_options option_mapping[] = { { 1 << 16, 16 }, // -0 entry values not used |