Merging upstream version 1.25~pre1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/lzip_index.h b/lzip_index.h
index 95e277d..9c8bd2b 100644
--- a/lzip_index.h
+++ b/lzip_index.h
@@ -28,8 +28,8 @@ class Lzip_index
       : dblock( dpos, dsize ), mblock( mpos, msize ),
         dictionary_size( dict_size ) {}
 
-    bool operator==( const Member & m ) const { return ( mblock == m.mblock ); }
-    bool operator!=( const Member & m ) const { return ( mblock != m.mblock ); }
+    bool operator==( const Member & m ) const { return mblock == m.mblock; }
+    bool operator!=( const Member & m ) const { return mblock != m.mblock; }
     };
 
   // member_vector only contains members with a valid header.
@@ -43,8 +43,7 @@ class Lzip_index
   bool check_header( const Lzip_header & header, const bool ignore_bad_ds );
   void set_errno_error( const char * const msg );
   void set_num_error( const char * const msg, unsigned long long num );
-  bool read_header( const int fd, Lzip_header & header, const long long pos,
-                    const bool ignore_marking = true );
+  bool read_header( const int fd, Lzip_header & header, const long long pos );
   bool read_trailer( const int fd, Lzip_trailer & trailer,
                      const long long pos );
   bool skip_gap( const int fd, unsigned long long & pos,
@@ -94,3 +93,6 @@ public:
   unsigned dictionary_size( const long i ) const
     { return member_vector[i].dictionary_size; }
   };
+
+int seek_read( const int fd, uint8_t * const buf, const int size,
+               const long long pos );