Adding upstream version 1.11.upstream/1.11

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

1 files changed, 19 insertions, 19 deletions

diff --git a/file_index.h b/lzip_index.h
index ae5c5ce..4e8af14 100644
--- a/file_index.h
+++ b/lzip_index.h
@@ -1,5 +1,5 @@
 /*  Clzip - LZMA lossless data compressor
-    Copyright (C) 2010-2018 Antonio Diaz Diaz.
+    Copyright (C) 2010-2019 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
@@ -46,45 +46,45 @@ static inline void init_member( struct Member * const m,
   { init_block( &m->dblock, dp, ds ); init_block( &m->mblock, mp, ms );
     m->dictionary_size = dict_size; }
 
-struct File_index
+struct Lzip_index
   {
   struct Member * member_vector;
   char * error;
-  long long isize;
+  long long insize;
   long members;
   int error_size;
   int retval;
   };
 
-bool Fi_init( struct File_index * const fi, const int infd,
+bool Li_init( struct Lzip_index * const li, const int infd,
               const bool ignore_trailing, const bool loose_trailing );
 
-void Fi_free( struct File_index * const fi );
+void Li_free( struct Lzip_index * const li );
 
-static inline long long Fi_udata_size( const struct File_index * const fi )
+static inline long long Li_udata_size( const struct Lzip_index * const li )
   {
-  if( fi->members <= 0 ) return 0;
-  return block_end( fi->member_vector[fi->members-1].dblock );
+  if( li->members <= 0 ) return 0;
+  return block_end( li->member_vector[li->members-1].dblock );
   }
 
-static inline long long Fi_cdata_size( const struct File_index * const fi )
+static inline long long Li_cdata_size( const struct Lzip_index * const li )
   {
-  if( fi->members <= 0 ) return 0;
-  return block_end( fi->member_vector[fi->members-1].mblock );
+  if( li->members <= 0 ) return 0;
+  return block_end( li->member_vector[li->members-1].mblock );
   }
 
   /* total size including trailing data (if any) */
-static inline long long Fi_file_size( const struct File_index * const fi )
-  { if( fi->isize >= 0 ) return fi->isize; else return 0; }
+static inline long long Li_file_size( const struct Lzip_index * const li )
+  { if( li->insize >= 0 ) return li->insize; else return 0; }
 
-static inline const struct Block * Fi_dblock( const struct File_index * const fi,
+static inline const struct Block * Li_dblock( const struct Lzip_index * const li,
                                               const long i )
-  { return &fi->member_vector[i].dblock; }
+  { return &li->member_vector[i].dblock; }
 
-static inline const struct Block * Fi_mblock( const struct File_index * const fi,
+static inline const struct Block * Li_mblock( const struct Lzip_index * const li,
                                               const long i )
-  { return &fi->member_vector[i].mblock; }
+  { return &li->member_vector[i].mblock; }
 
-static inline unsigned Fi_dictionary_size( const struct File_index * const fi,
+static inline unsigned Li_dictionary_size( const struct Lzip_index * const li,
                                            const long i )
-  { return fi->member_vector[i].dictionary_size; }
+  { return li->member_vector[i].dictionary_size; }