1 files changed, 88 insertions, 37 deletions

diff --git a/src/common/unzip.h b/src/common/unzip.h
index f0c2c4e..0359fa5 100644
--- a/src/common/unzip.h
+++ b/src/common/unzip.h
@@ -1,10 +1,10 @@
-/*
+]/*
      This file is part of libextractor.
      (C) 2008 Christian Grothoff (and other contributing authors)
 
      libextractor is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      libextractor is distributed in the hope that it will be useful, but
@@ -34,18 +34,20 @@
 
 typedef voidp EXTRACTOR_unzip_file;
 
+
 typedef struct EXTRACTOR_unzip_filefunc_def_s
 {
-    voidpf ( *zopen_file) (voidpf opaque, const char* filename, int mode);
-    uLong  ( *zread_file) (voidpf opaque, voidpf stream, void* buf, uLong size);
-    uLong  ( *zwrite_file) (voidpf opaque, voidpf stream, const void* buf, uLong size);
-    long   ( *ztell_file) (voidpf opaque, voidpf stream);
-    long   ( *zseek_file) (voidpf opaque, voidpf stream, uLong offset, int origin);
-    int    ( *zclose_file) (voidpf opaque, voidpf stream);
-    int    ( *zerror_file) (voidpf opaque, voidpf stream);
+  voidpf ( *zopen_file)  (voidpf opaque, const char* filename, int mode);
+  uLong  ( *zread_file)  (voidpf opaque, voidpf stream, void* buf, uLong size);
+  uLong  ( *zwrite_file) (voidpf opaque, voidpf stream, const void* buf, uLong size);
+  long   ( *ztell_file)  (voidpf opaque, voidpf stream);
+  long   ( *zseek_file)  (voidpf opaque, voidpf stream, uLong offset, int origin);
+  int    ( *zclose_file) (voidpf opaque, voidpf stream);
+  int    ( *zerror_file) (voidpf opaque, voidpf stream);
     voidpf              opaque;
 } EXTRACTOR_unzip_filefunc_def;
 
+
 /* tm_unz contain date/time info */
 typedef struct EXTRACTOR_unzip_tm_unz_s
 {
@@ -57,6 +59,7 @@ typedef struct EXTRACTOR_unzip_tm_unz_s
     uInt tm_year;           /* years - [1980..2044] */
 } EXTRACTOR_unzip_tm_unz;
 
+
 /* unz_file_info contain information about a file in the zipfile */
 typedef struct EXTRACTOR_unzip_file_info_s
 {
@@ -79,48 +82,96 @@ typedef struct EXTRACTOR_unzip_file_info_s
     EXTRACTOR_unzip_tm_unz tmu_date;
 } EXTRACTOR_unzip_file_info;
 
-int EXTRACTOR_common_unzip_string_file_name_compare(const char* fileName1,
-    const char* fileName2, int iCaseSensitivity);
 
-int EXTRACTOR_common_unzip_go_to_first_file(EXTRACTOR_unzip_file file);
+int 
+EXTRACTOR_common_unzip_string_file_name_compare (const char* fileName1,
+                                                 const char* fileName2, 
+                                                 int iCaseSensitivity);
+
+
+int 
+EXTRACTOR_common_unzip_go_to_first_file (EXTRACTOR_unzip_file file);
+
+
+EXTRACTOR_unzip_file 
+EXTRACTOR_common_unzip_open2 (const char *path,
+                              EXTRACTOR_unzip_filefunc_def* pzlib_filefunc_def);
+
+
+int 
+EXTRACTOR_common_unzip_close_current_file (EXTRACTOR_unzip_file file);
+
+
+int
+EXTRACTOR_common_unzip_close (EXTRACTOR_unzip_file file);
+
+
+int 
+EXTRACTOR_common_unzip_get_current_file_info (EXTRACTOR_unzip_file file,
+                                              EXTRACTOR_unzip_file_info *pfile_info, 
+                                              char *szFileName,
+                                              uLong fileNameBufferSize,
+                                              void *extraField, 
+                                              uLong extraFieldBufferSize, 
+                                              char *szComment,
+                                              uLong commentBufferSize);
+
+
+int
+EXTRACTOR_common_unzip_go_to_next_file (EXTRACTOR_unzip_file file);
+
+
+int
+EXTRACTOR_common_unzip_local_file (EXTRACTOR_unzip_file file, 
+                                   const char *szFileName,
+                                   int iCaseSensitivity);
+
+
+int 
+EXTRACTOR_common_unzip_read_current_file (EXTRACTOR_unzip_file file,
+                                          voidp buf,
+                                          unsigned len);
 
-EXTRACTOR_unzip_file EXTRACTOR_common_unzip_open2(const char *path,
-    EXTRACTOR_unzip_filefunc_def* pzlib_filefunc_def);
 
-int EXTRACTOR_common_unzip_close_current_file(EXTRACTOR_unzip_file file);
+int
+EXTRACTOR_common_unzip_open_current_file3 (EXTRACTOR_unzip_file file, 
+                                           int* method,
+                                           int* level,
+                                           int raw);
 
-int EXTRACTOR_common_unzip_close(EXTRACTOR_unzip_file file);
 
-int EXTRACTOR_common_unzip_get_current_file_info(EXTRACTOR_unzip_file file,
-    EXTRACTOR_unzip_file_info *pfile_info, char *szFileName, uLong fileNameBufferSize,
-    void *extraField, uLong extraFieldBufferSize, char *szComment,
-    uLong commentBufferSize);
+voidpf
+EXTRACTOR_common_unzip_zlib_open_file_func (voidpf opaque,
+                                            const char* filename, 
+                                            int mode);
 
-int EXTRACTOR_common_unzip_go_to_next_file(EXTRACTOR_unzip_file file);
 
-int EXTRACTOR_common_unzip_local_file(EXTRACTOR_unzip_file file, const char *szFileName,
-    int iCaseSensitivity);
+uLong 
+EXTRACTOR_common_unzip_zlib_read_file_func (voidpf opaque, 
+                                            voidpf stream,
+                                            void* buf, 
+                                            uLong size);
 
-int EXTRACTOR_common_unzip_read_current_file(EXTRACTOR_unzip_file file, voidp buf,
-    unsigned len);
 
-int EXTRACTOR_common_unzip_open_current_file3(EXTRACTOR_unzip_file file, int* method,
-    int* level, int raw);
+long 
+EXTRACTOR_common_unzip_zlib_tell_file_func (voidpf opaque, 
+                                            voidpf stream);
 
-voidpf EXTRACTOR_common_unzip_zlib_open_file_func(voidpf opaque,
-    const char* filename, int mode);
 
-uLong EXTRACTOR_common_unzip_zlib_read_file_func(voidpf opaque, voidpf stream,
-    void* buf, uLong size);
+long 
+EXTRACTOR_common_unzip_zlib_seek_file_func (voidpf opaque,
+                                            voidpf stream,
+                                            uLong offset, 
+                                            int origin);
 
-long EXTRACTOR_common_unzip_zlib_tell_file_func(voidpf opaque, voidpf stream);
 
-long EXTRACTOR_common_unzip_zlib_seek_file_func(voidpf opaque, voidpf stream,
-    uLong offset, int origin);
+int
+EXTRACTOR_common_unzip_zlib_close_file_func (voidpf opaque, 
+                                             voidpf stream);
 
-int EXTRACTOR_common_unzip_zlib_close_file_func(voidpf opaque, voidpf stream);
 
-int EXTRACTOR_common_unzip_zlib_testerror_file_func(voidpf opaque,
-    voidpf stream);
+int
+EXTRACTOR_common_unzip_zlib_testerror_file_func (voidpf opaque,
+                                                 voidpf stream);
 
 #endif /* UNZIP_H_ */