Minizip warning fixes.

6 files changed, 95 insertions, 13 deletions

diff --git a/src/minizip/ioapi.c.diff b/src/minizip/ioapi.c.diff
index ee325e2..05d3e4a 100644
--- a/src/minizip/ioapi.c.diff
+++ b/src/minizip/ioapi.c.diff
@@ -1,5 +1,5 @@
 --- ioapi.c.orig	2012-01-21 20:58:45.000000000 +0100
-+++ ioapi.c	2014-05-24 10:30:08.688103848 +0200
++++ ioapi.c	2014-05-24 13:27:22.516230485 +0200
 @@ -73,6 +73,7 @@
      p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
      p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
diff --git a/src/minizip/ioapi.h.diff b/src/minizip/ioapi.h.diff
index 65558f6..ddcec6c 100644
--- a/src/minizip/ioapi.h.diff
+++ b/src/minizip/ioapi.h.diff
@@ -1,5 +1,5 @@
 --- ioapi.h.orig	2012-01-17 03:51:31.000000000 +0100
-+++ ioapi.h	2014-05-24 10:28:47.731394304 +0200
++++ ioapi.h	2014-05-24 13:27:22.516230485 +0200
 @@ -135,6 +135,7 @@
  typedef voidpf   (ZCALLBACK *open_file_func)      OF((voidpf opaque, const char* filename, int mode));
  typedef uLong    (ZCALLBACK *read_file_func)      OF((voidpf opaque, voidpf stream, void* buf, uLong size));
diff --git a/src/minizip/zip.c b/src/minizip/zip.c
index 3164199..b0d83e2 100644
--- a/src/minizip/zip.c
+++ b/src/minizip/zip.c
@@ -186,7 +186,7 @@ typedef struct
 #include "crypt.h"
 #endif
 
-local linkedlist_datablock_internal* allocate_new_datablock()
+local linkedlist_datablock_internal* allocate_new_datablock(void)
 {
     linkedlist_datablock_internal* ldi;
     ldi = (linkedlist_datablock_internal*)
@@ -637,7 +637,7 @@ local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib
   return relativeOffset;
 }
 
-int LoadCentralDirectoryRecord(zip64_internal* pziinit)
+local int LoadCentralDirectoryRecord(zip64_internal* pziinit)
 {
   int err=ZIP_OK;
   ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
@@ -955,7 +955,7 @@ extern zipFile ZEXPORT zipOpen64 (const void* pathname, int append)
     return zipOpen3(pathname,append,NULL,NULL);
 }
 
-int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
+local int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
 {
   /* write the local header */
   int err;
@@ -1752,7 +1752,7 @@ extern int ZEXPORT zipCloseFileInZip (zipFile file)
     return zipCloseFileInZipRaw (file,0,0);
 }
 
-int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
+local int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
 {
   int err = ZIP_OK;
   ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
@@ -1774,7 +1774,7 @@ int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eo
     return err;
 }
 
-int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+local int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
 {
   int err = ZIP_OK;
 
@@ -1813,7 +1813,8 @@ int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centra
   }
   return err;
 }
-int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+
+local int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
 {
   int err = ZIP_OK;
 
@@ -1861,7 +1862,7 @@ int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir,
    return err;
 }
 
-int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
+local int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
 {
   int err = ZIP_OK;
   uInt size_global_comment = 0;
diff --git a/src/minizip/zip.c.diff b/src/minizip/zip.c.diff
index e8c1bd4..204d985 100644
--- a/src/minizip/zip.c.diff
+++ b/src/minizip/zip.c.diff
@@ -1,6 +1,70 @@
 --- zip.c.orig	2013-02-24 08:32:30.000000000 +0100
-+++ zip.c	2014-05-24 10:36:41.744297397 +0200
-@@ -1879,6 +1879,18 @@
++++ zip.c	2014-05-24 13:52:45.570151611 +0200
+@@ -186,7 +186,7 @@
+ #include "crypt.h"
+ #endif
+ 
+-local linkedlist_datablock_internal* allocate_new_datablock()
++local linkedlist_datablock_internal* allocate_new_datablock(void)
+ {
+     linkedlist_datablock_internal* ldi;
+     ldi = (linkedlist_datablock_internal*)
+@@ -637,7 +637,7 @@
+   return relativeOffset;
+ }
+ 
+-int LoadCentralDirectoryRecord(zip64_internal* pziinit)
++local int LoadCentralDirectoryRecord(zip64_internal* pziinit)
+ {
+   int err=ZIP_OK;
+   ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+@@ -955,7 +955,7 @@
+     return zipOpen3(pathname,append,NULL,NULL);
+ }
+ 
+-int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
++local int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
+ {
+   /* write the local header */
+   int err;
+@@ -1752,7 +1752,7 @@
+     return zipCloseFileInZipRaw (file,0,0);
+ }
+ 
+-int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
++local int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
+ {
+   int err = ZIP_OK;
+   ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
+@@ -1774,7 +1774,7 @@
+     return err;
+ }
+ 
+-int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
++local int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+ {
+   int err = ZIP_OK;
+ 
+@@ -1813,7 +1813,8 @@
+   }
+   return err;
+ }
+-int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
++
++local int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+ {
+   int err = ZIP_OK;
+ 
+@@ -1861,7 +1862,7 @@
+    return err;
+ }
+ 
+-int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
++local int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
+ {
+   int err = ZIP_OK;
+   uInt size_global_comment = 0;
+@@ -1879,6 +1880,18 @@
    return err;
  }
  
diff --git a/src/minizip/zip.h b/src/minizip/zip.h
index 50dc55e..16dea6b 100644
--- a/src/minizip/zip.h
+++ b/src/minizip/zip.h
@@ -144,6 +144,11 @@ extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname,
                                    zipcharpc* globalcomment,
                                    zlib_filefunc64_def* pzlib_filefunc_def));
 
+extern zipFile ZEXPORT zipOpen3 OF((const void *pathname,
+                                    int append,
+                                    zipcharpc* globalcomment,
+                                    zlib_filefunc64_32_def* pzlib_filefunc64_32_def));
+
 extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
                        const char* filename,
                        const zip_fileinfo* zipfi,
diff --git a/src/minizip/zip.h.diff b/src/minizip/zip.h.diff
index 3150788..f17bddc 100644
--- a/src/minizip/zip.h.diff
+++ b/src/minizip/zip.h.diff
@@ -1,6 +1,18 @@
 --- zip.h.orig	2010-02-15 12:58:22.000000000 +0100
-+++ zip.h	2014-05-24 09:56:28.285932357 +0200
-@@ -311,6 +311,11 @@
++++ zip.h	2014-05-24 13:47:52.838188589 +0200
+@@ -144,6 +144,11 @@
+                                    zipcharpc* globalcomment,
+                                    zlib_filefunc64_def* pzlib_filefunc_def));
+ 
++extern zipFile ZEXPORT zipOpen3 OF((const void *pathname,
++                                    int append,
++                                    zipcharpc* globalcomment,
++                                    zlib_filefunc64_32_def* pzlib_filefunc64_32_def));
++
+ extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
+                        const char* filename,
+                        const zip_fileinfo* zipfi,
+@@ -311,6 +316,11 @@
    Write data in the zipfile
  */