From 3d3968e451576fa317143140cb93242dba81f418 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 16:36:59 +0100 Subject: Merging upstream version 1.2~pre1. Signed-off-by: Daniel Baumann --- lzip.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'lzip.h') diff --git a/lzip.h b/lzip.h index dfb28ee..f39d270 100644 --- a/lzip.h +++ b/lzip.h @@ -1,5 +1,5 @@ /* Plzip - Parallel compressor compatible with lzip - Copyright (C) 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz. + Copyright (C) 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 @@ -38,7 +38,7 @@ public: for( unsigned i = 0; i < filenames.size(); ++i ) { const std::string & s = filenames[i]; - const unsigned len = ( ( s == "-" ) ? stdin_name_len : s.size() ); + const unsigned len = ( s == "-" ) ? stdin_name_len : s.size(); if( len > longest_name ) longest_name = len; } if( longest_name == 0 ) longest_name = stdin_name_len; @@ -135,9 +135,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 { @@ -147,9 +145,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; } } }; @@ -202,7 +198,7 @@ void show_error( const char * const msg, const int errcode = 0, void internal_error( const char * const msg ); void show_progress( const int packet_size, const Pretty_print * const p = 0, - const struct stat * const in_statsp = 0 ); + const unsigned long long cfile_size = 0 ); class Slot_tally @@ -210,7 +206,7 @@ class Slot_tally const int num_slots; // total slots int num_free; // remaining free slots pthread_mutex_t mutex; - pthread_cond_t slot_av; // free slot available + pthread_cond_t slot_av; // slot available Slot_tally( const Slot_tally & ); // declared as private void operator=( const Slot_tally & ); // declared as private -- cgit v1.2.3