diff options
| author | Xavier Roche <xroche@users.noreply.github.com> | 2014-05-24 11:57:25 +0000 |
|---|---|---|
| committer | Xavier Roche <xroche@users.noreply.github.com> | 2014-05-24 11:57:25 +0000 |
| commit | f078a39677953cf8d3cdaedcb1b3c4db65473308 (patch) | |
| tree | cf1cdf02f43fe9ed520f39dc0fea590ab45d1a22 /src/minizip/zip.c.diff | |
| parent | 65454f4ff15a7e30ba06192fefc6f5f0da3f171a (diff) | |
Minizip warning fixes.
Diffstat (limited to 'src/minizip/zip.c.diff')
| -rw-r--r-- | src/minizip/zip.c.diff | 68 |
1 files changed, 66 insertions, 2 deletions
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; } |