Reverted diff, groumph.

4 files changed, 93 insertions, 93 deletions

diff --git a/src/minizip/ioapi.c.diff b/src/minizip/ioapi.c.diff
index 5a1ba0e..05d3e4a 100644
--- a/src/minizip/ioapi.c.diff
+++ b/src/minizip/ioapi.c.diff
@@ -1,48 +1,48 @@
---- ioapi.c	2014-05-24 13:27:22.516230485 +0200
-+++ ioapi.c.orig	2012-01-21 20:58:45.000000000 +0100
-@@ -73,7 +73,6 @@
+--- ioapi.c.orig	2012-01-21 20:58:45.000000000 +0100
++++ 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;
      p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
--    p_filefunc64_32->zfile_func64.zflush_file = p_filefunc32->zflush_file;
++    p_filefunc64_32->zfile_func64.zflush_file = p_filefunc32->zflush_file;
      p_filefunc64_32->zfile_func64.ztell64_file = NULL;
      p_filefunc64_32->zfile_func64.zseek64_file = NULL;
      p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
-@@ -90,8 +89,6 @@
+@@ -89,6 +90,8 @@
  static uLong   ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
  static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
  static long    ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
--static int     ZCALLBACK fflush_file_func OF((voidpf opaque, voidpf stream));
--
++static int     ZCALLBACK fflush_file_func OF((voidpf opaque, voidpf stream));
++
  static int     ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
  static int     ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
  
-@@ -209,12 +206,6 @@
+@@ -206,6 +209,12 @@
      return ret;
  }
  
--static int ZCALLBACK fflush_file_func (voidpf opaque, voidpf stream)
--{
--    int ret;
--    ret = fflush((FILE *)stream);
--    return ret;
--}
++static int ZCALLBACK fflush_file_func (voidpf opaque, voidpf stream)
++{
++    int ret;
++    ret = fflush((FILE *)stream);
++    return ret;
++}
  
  static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
  {
-@@ -238,7 +229,6 @@
+@@ -229,6 +238,7 @@
      pzlib_filefunc_def->zwrite_file = fwrite_file_func;
      pzlib_filefunc_def->ztell_file = ftell_file_func;
      pzlib_filefunc_def->zseek_file = fseek_file_func;
--    pzlib_filefunc_def->zflush_file = fflush_file_func;
++    pzlib_filefunc_def->zflush_file = fflush_file_func;
      pzlib_filefunc_def->zclose_file = fclose_file_func;
      pzlib_filefunc_def->zerror_file = ferror_file_func;
      pzlib_filefunc_def->opaque = NULL;
-@@ -251,7 +241,6 @@
+@@ -241,6 +251,7 @@
      pzlib_filefunc_def->zwrite_file = fwrite_file_func;
      pzlib_filefunc_def->ztell64_file = ftell64_file_func;
      pzlib_filefunc_def->zseek64_file = fseek64_file_func;
--    pzlib_filefunc_def->zflush_file = fflush_file_func;
++    pzlib_filefunc_def->zflush_file = fflush_file_func;
      pzlib_filefunc_def->zclose_file = fclose_file_func;
      pzlib_filefunc_def->zerror_file = ferror_file_func;
      pzlib_filefunc_def->opaque = NULL;
diff --git a/src/minizip/ioapi.h.diff b/src/minizip/ioapi.h.diff
index 7946a20..1cb407a 100644
--- a/src/minizip/ioapi.h.diff
+++ b/src/minizip/ioapi.h.diff
@@ -1,59 +1,59 @@
---- ioapi.h	2014-06-08 21:54:18.326360527 +0200
-+++ ioapi.h.orig	2012-01-17 03:51:31.000000000 +0100
-@@ -67,24 +67,6 @@
+--- ioapi.h.orig	2012-01-17 03:51:31.000000000 +0100
++++ ioapi.h	2014-06-08 21:54:18.326360527 +0200
+@@ -67,6 +67,24 @@
  #endif
  #endif
  
--/* As reported by sammyx, z_crc_t and z_const are not defined in pre-1.2.70 releases of zlib */
--/* See <https://github.com/madler/zlib/commit/6c9bd474aa08312ef2e2e9655a80e18db24a1680#diff-d466aa66f7e453e0c8a7719229cff391R391> */
--#if ZLIB_VERNUM < 0x1270
--
--#ifdef Z_U4
--   typedef Z_U4 z_crc_t;
--#else
--   typedef unsigned long z_crc_t;
--#endif
--
--#if defined(ZLIB_CONST) && !defined(z_const)
--#  define z_const const
--#else
--#  define z_const
--#endif
--
--#endif
--
++/* As reported by sammyx, z_crc_t and z_const are not defined in pre-1.2.70 releases of zlib */
++/* See <https://github.com/madler/zlib/commit/6c9bd474aa08312ef2e2e9655a80e18db24a1680#diff-d466aa66f7e453e0c8a7719229cff391R391> */
++#if ZLIB_VERNUM < 0x1270
++
++#ifdef Z_U4
++   typedef Z_U4 z_crc_t;
++#else
++   typedef unsigned long z_crc_t;
++#endif
++
++#if defined(ZLIB_CONST) && !defined(z_const)
++#  define z_const const
++#else
++#  define z_const
++#endif
++
++#endif
++
  /*
  #ifndef ZPOS64_T
    #ifdef _WIN32
-@@ -153,7 +135,6 @@
+@@ -135,6 +153,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));
  typedef uLong    (ZCALLBACK *write_file_func)     OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
--typedef int      (ZCALLBACK *flush_file_func)     OF((voidpf opaque, voidpf stream));
++typedef int      (ZCALLBACK *flush_file_func)     OF((voidpf opaque, voidpf stream));
  typedef int      (ZCALLBACK *close_file_func)     OF((voidpf opaque, voidpf stream));
  typedef int      (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
  
-@@ -167,7 +148,6 @@
+@@ -148,6 +167,7 @@
      open_file_func      zopen_file;
      read_file_func      zread_file;
      write_file_func     zwrite_file;
--    flush_file_func     zflush_file;
++    flush_file_func     zflush_file;
      tell_file_func      ztell_file;
      seek_file_func      zseek_file;
      close_file_func     zclose_file;
-@@ -184,7 +164,6 @@
+@@ -164,6 +184,7 @@
      open64_file_func    zopen64_file;
      read_file_func      zread_file;
      write_file_func     zwrite_file;
--    flush_file_func     zflush_file;
++    flush_file_func     zflush_file;
      tell64_file_func    ztell64_file;
      seek64_file_func    zseek64_file;
      close_file_func     zclose_file;
-@@ -207,7 +186,6 @@
+@@ -186,6 +207,7 @@
  
  #define ZREAD64(filefunc,filestream,buf,size)     ((*((filefunc).zfile_func64.zread_file))   ((filefunc).zfile_func64.opaque,filestream,buf,size))
  #define ZWRITE64(filefunc,filestream,buf,size)    ((*((filefunc).zfile_func64.zwrite_file))  ((filefunc).zfile_func64.opaque,filestream,buf,size))
--#define ZFLUSH64(filefunc,filestream)             ((*((filefunc).zfile_func64.zflush_file))  ((filefunc).zfile_func64.opaque,filestream))
++#define ZFLUSH64(filefunc,filestream)             ((*((filefunc).zfile_func64.zflush_file))  ((filefunc).zfile_func64.opaque,filestream))
  //#define ZTELL64(filefunc,filestream)            ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
  //#define ZSEEK64(filefunc,filestream,pos,mode)   ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
  #define ZCLOSE64(filefunc,filestream)             ((*((filefunc).zfile_func64.zclose_file))  ((filefunc).zfile_func64.opaque,filestream))
diff --git a/src/minizip/zip.c.diff b/src/minizip/zip.c.diff
index bfa67f5..204d985 100644
--- a/src/minizip/zip.c.diff
+++ b/src/minizip/zip.c.diff
@@ -1,11 +1,11 @@
---- zip.c	2014-05-24 13:52:45.570151611 +0200
-+++ zip.c.orig	2013-02-24 08:32:30.000000000 +0100
+--- zip.c.orig	2013-02-24 08:32:30.000000000 +0100
++++ 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(void)
-+local linkedlist_datablock_internal* allocate_new_datablock()
+-local linkedlist_datablock_internal* allocate_new_datablock()
++local linkedlist_datablock_internal* allocate_new_datablock(void)
  {
      linkedlist_datablock_internal* ldi;
      ldi = (linkedlist_datablock_internal*)
@@ -13,8 +13,8 @@
    return relativeOffset;
  }
  
--local int LoadCentralDirectoryRecord(zip64_internal* pziinit)
-+int LoadCentralDirectoryRecord(zip64_internal* pziinit)
+-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)*/
@@ -22,8 +22,8 @@
      return zipOpen3(pathname,append,NULL,NULL);
  }
  
--local int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
-+int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
+-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;
@@ -31,8 +31,8 @@
      return zipCloseFileInZipRaw (file,0,0);
  }
  
--local int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
-+int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
+-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;
@@ -40,46 +40,46 @@
      return err;
  }
  
--local int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
-+int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+-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,8 +1813,7 @@
+@@ -1813,7 +1813,8 @@
    }
    return err;
  }
--
--local int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
-+int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+-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;
  
-@@ -1862,7 +1861,7 @@
+@@ -1861,7 +1862,7 @@
     return err;
  }
  
--local int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
-+int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
+-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;
-@@ -1880,18 +1879,6 @@
+@@ -1879,6 +1880,18 @@
    return err;
  }
  
--extern int ZEXPORT zipFlush (zipFile file)
--{
--    zip64_internal* zi;
--
--    if (file == NULL)
--        return ZIP_PARAMERROR;
--
--    zi = (zip64_internal*)file;
--
--    return ZFLUSH64(zi->z_filefunc,zi->filestream);
--}
--
++extern int ZEXPORT zipFlush (zipFile file)
++{
++    zip64_internal* zi;
++
++    if (file == NULL)
++        return ZIP_PARAMERROR;
++
++    zi = (zip64_internal*)file;
++
++    return ZFLUSH64(zi->z_filefunc,zi->filestream);
++}
++
  extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
  {
      zip64_internal* zi;
diff --git a/src/minizip/zip.h.diff b/src/minizip/zip.h.diff
index c214530..f17bddc 100644
--- a/src/minizip/zip.h.diff
+++ b/src/minizip/zip.h.diff
@@ -1,26 +1,26 @@
---- zip.h	2014-05-24 13:47:52.838188589 +0200
-+++ zip.h.orig	2010-02-15 12:58:22.000000000 +0100
-@@ -144,11 +144,6 @@
+--- zip.h.orig	2010-02-15 12:58:22.000000000 +0100
++++ 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 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,
-@@ -316,11 +311,6 @@
+@@ -311,6 +316,11 @@
    Write data in the zipfile
  */
  
--extern int ZEXPORT zipFlush OF((zipFile file));
--/*
--  Flush the zipfile output
--*/
--
++extern int ZEXPORT zipFlush OF((zipFile file));
++/*
++  Flush the zipfile output
++*/
++
  extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
  /*
    Close the current file in the zipfile