From 0763626b1d5a396a8d78985c9a445763686f92f8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 12:45:50 +0100 Subject: Merging upstream version 1.16~pre2. Signed-off-by: Daniel Baumann --- lzip.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lzip.h') diff --git a/lzip.h b/lzip.h index 483835f..cd44b42 100644 --- a/lzip.h +++ b/lzip.h @@ -279,9 +279,13 @@ inline unsigned long long positive_diff( const unsigned long long x, // defined in decoder.cc -int readblock( const int fd, uint8_t * const buf, const int size ); +long readblock( const int fd, uint8_t * const buf, const long size ); int writeblock( const int fd, const uint8_t * const buf, const int size ); +// defined in file_index.cc +int seek_read( const int fd, uint8_t * const buf, const int size, + const long long pos ); + // defined in main.cc int open_instream( const char * const name, struct stat * const in_statsp, const bool no_ofile, const bool reg_only = false ); @@ -314,8 +318,6 @@ int range_decompress( const std::string & input_filename, const bool force, const bool ignore, const bool to_stdout ); // defined in repair.cc -int seek_read( const int fd, uint8_t * const buf, const int size, - const long long pos ); int repair_file( const std::string & input_filename, const std::string & output_filename, const int verbosity, const bool force ); -- cgit v1.2.3