diff options
author | Xavier Roche <xroche@users.noreply.github.com> | 2014-06-08 20:00:57 +0000 |
---|---|---|
committer | Xavier Roche <xroche@users.noreply.github.com> | 2014-06-08 20:00:57 +0000 |
commit | eeee43acb768e8919559927ebffc31bc91447bec (patch) | |
tree | 284c2ff49fb164007326f9f4a2b4b3f36e6b92ae /src/minizip/zip.c.diff | |
parent | 91946b783499479fe65955bdad7865fd967934ea (diff) |
Added minizip orig files.
Diffstat (limited to 'src/minizip/zip.c.diff')
-rw-r--r-- | src/minizip/zip.c.diff | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/src/minizip/zip.c.diff b/src/minizip/zip.c.diff index 204d985..bfa67f5 100644 --- a/src/minizip/zip.c.diff +++ b/src/minizip/zip.c.diff @@ -1,11 +1,11 @@ ---- zip.c.orig 2013-02-24 08:32:30.000000000 +0100 -+++ zip.c 2014-05-24 13:52:45.570151611 +0200 +--- zip.c 2014-05-24 13:52:45.570151611 +0200 ++++ zip.c.orig 2013-02-24 08:32:30.000000000 +0100 @@ -186,7 +186,7 @@ #include "crypt.h" #endif --local linkedlist_datablock_internal* allocate_new_datablock() -+local linkedlist_datablock_internal* allocate_new_datablock(void) +-local linkedlist_datablock_internal* allocate_new_datablock(void) ++local linkedlist_datablock_internal* allocate_new_datablock() { linkedlist_datablock_internal* ldi; ldi = (linkedlist_datablock_internal*) @@ -13,8 +13,8 @@ return relativeOffset; } --int LoadCentralDirectoryRecord(zip64_internal* pziinit) -+local int LoadCentralDirectoryRecord(zip64_internal* pziinit) +-local int LoadCentralDirectoryRecord(zip64_internal* pziinit) ++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); } --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) +-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) { /* write the local header */ int err; @@ -31,8 +31,8 @@ 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) +-local int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip) ++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; } --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) +-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 err = ZIP_OK; -@@ -1813,7 +1813,8 @@ +@@ -1813,8 +1813,7 @@ } 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) +- +-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 err = ZIP_OK; -@@ -1861,7 +1862,7 @@ +@@ -1862,7 +1861,7 @@ return err; } --int Write_GlobalComment(zip64_internal* zi, const char* global_comment) -+local int Write_GlobalComment(zip64_internal* zi, const char* global_comment) +-local int Write_GlobalComment(zip64_internal* zi, const char* global_comment) ++int Write_GlobalComment(zip64_internal* zi, const char* global_comment) { int err = ZIP_OK; uInt size_global_comment = 0; -@@ -1879,6 +1880,18 @@ +@@ -1880,18 +1879,6 @@ 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; |