From efdc5b2e77cfe046e2cfd743ccd06bf69b382641 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 10:59:20 +0100 Subject: Adding upstream version 1.15~pre3. Signed-off-by: Daniel Baumann --- lzip.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'lzip.h') diff --git a/lzip.h b/lzip.h index ffa2fb3..20912cf 100644 --- a/lzip.h +++ b/lzip.h @@ -1,4 +1,4 @@ -/* Lzip - Data compressor based on the LZMA algorithm +/* Lzip - LZMA lossless data compressor Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify @@ -100,13 +100,11 @@ class Pretty_print std::string name_; const char * const stdin_name; unsigned longest_name; - const int verbosity_; mutable bool first_post; public: - Pretty_print( const std::vector< std::string > & filenames, const int v ) - : stdin_name( "(stdin)" ), longest_name( 0 ), verbosity_( v ), - first_post( false ) + explicit Pretty_print( const std::vector< std::string > & filenames ) + : stdin_name( "(stdin)" ), longest_name( 0 ), first_post( false ) { const unsigned stdin_name_len = std::strlen( stdin_name ); for( unsigned i = 0; i < filenames.size(); ++i ) @@ -127,7 +125,6 @@ public: void reset() const { if( name_.size() ) first_post = true; } const char * name() const { return name_.c_str(); } - int verbosity() const { return verbosity_; } void operator()( const char * const msg = 0 ) const; }; @@ -272,6 +269,12 @@ int readblock( const int fd, uint8_t * const buf, const int size ); int writeblock( const int fd, const uint8_t * const buf, const int size ); // defined in main.cc +extern int verbosity; void show_error( const char * const msg, const int errcode = 0, const bool help = false ); void internal_error( const char * const msg ); +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 ); -- cgit v1.2.3