From 2085b1344e4c2b3c4a3d21d4bc10227679a55507 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 12:45:12 +0100 Subject: Merging upstream version 1.16~pre1. Signed-off-by: Daniel Baumann --- file_index.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'file_index.h') diff --git a/file_index.h b/file_index.h index fd2d488..8acb60f 100644 --- a/file_index.h +++ b/file_index.h @@ -1,5 +1,5 @@ /* Lziprecover - Data recovery tool for lzip files - 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 @@ -25,8 +25,7 @@ class Block long long pos_, size_; // pos + size <= INT64_MAX public: - Block( const long long p, const long long s ) - : pos_( p ), size_( s ) {} + Block( const long long p, const long long s ) : pos_( p ), size_( s ) {} long long pos() const { return pos_; } long long size() const { return size_; } @@ -68,6 +67,10 @@ class File_index long long isize; int retval_; + void set_errno_error( const char * const msg ); + void set_num_error( const char * const msg1, unsigned long long num, + const char * const msg2 = "." ); + public: File_index() : error_( "No index." ), isize( 0 ), retval_( 2 ) {} explicit File_index( const int infd ); @@ -104,8 +107,3 @@ public: const Block & mblock( const int i ) const { return member_vector[i].mblock; } }; - - -const char * format_num( unsigned long long num, - unsigned long long limit = -1ULL, - const int set_prefix = 0 ); -- cgit v1.2.3