From 9761fd14b899e8dd9a7f7d5fa10f21edc7f2679d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 11:02:58 +0100 Subject: Merging upstream version 1.16~pre1. Signed-off-by: Daniel Baumann --- lzip.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'lzip.h') diff --git a/lzip.h b/lzip.h index b4b51e2..348a000 100644 --- a/lzip.h +++ b/lzip.h @@ -1,5 +1,6 @@ /* Lzip - LZMA lossless data compressor - Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz. + Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 + 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 @@ -40,7 +41,7 @@ public: enum { min_dictionary_bits = 12, - min_dictionary_size = 1 << min_dictionary_bits, + min_dictionary_size = 1 << min_dictionary_bits, // >= modeled_distances max_dictionary_bits = 29, max_dictionary_size = 1 << max_dictionary_bits, literal_context_bits = 3, @@ -240,9 +241,7 @@ struct File_trailer } void data_size( unsigned long long sz ) - { - for( int i = 4; i <= 11; ++i ) { data[i] = (uint8_t)sz; sz >>= 8; } - } + { for( int i = 4; i <= 11; ++i ) { data[i] = (uint8_t)sz; sz >>= 8; } } unsigned long long member_size() const { @@ -252,9 +251,7 @@ struct File_trailer } void member_size( unsigned long long sz ) - { - for( int i = 12; i <= 19; ++i ) { data[i] = (uint8_t)sz; sz >>= 8; } - } + { for( int i = 12; i <= 19; ++i ) { data[i] = (uint8_t)sz; sz >>= 8; } } }; @@ -278,4 +275,4 @@ class Matchfinder_base; void show_progress( const unsigned long long partial_size = 0, const Matchfinder_base * const m = 0, const Pretty_print * const p = 0, - const struct stat * const in_statsp = 0 ); + const unsigned long long cfile_size = 0 ); -- cgit v1.2.3