From 5681b7b60a13737847fe59ab7b43ee0884dc6ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 18 Aug 2017 23:17:50 +0200 Subject: minizip: Sync with pristine contrib/minizip from zlib 1.2.4 Godot-specific changes are undone in this commit, they will be readded and properly documented in the following commit. --- thirdparty/minizip/zip.h | 71 ++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 36 deletions(-) (limited to 'thirdparty/minizip/zip.h') diff --git a/thirdparty/minizip/zip.h b/thirdparty/minizip/zip.h index 37478b34c0..8aaebb6234 100644 --- a/thirdparty/minizip/zip.h +++ b/thirdparty/minizip/zip.h @@ -1,4 +1,5 @@ -/* Version 1.1, February 14h, 2010 +/* zip.h -- IO on .zip files using zlib + Version 1.1, February 14h, 2010 part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) @@ -6,7 +7,7 @@ Modifications for Zip64 support Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) - For more info read LICENSE-MiniZip.txt + For more info read MiniZip_info.txt --------------------------------------------------------------------------- @@ -39,8 +40,6 @@ #ifndef _zip12_H #define _zip12_H -#include - #ifdef __cplusplus extern "C" { #endif @@ -114,8 +113,8 @@ typedef const char* zipcharpc; #define APPEND_STATUS_CREATEAFTER (1) #define APPEND_STATUS_ADDINZIP (2) -extern zipFile ZEXPORT zipOpen (const char *pathname, int append); -extern zipFile ZEXPORT zipOpen64 (const void *pathname, int append); +extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append)); +extern zipFile ZEXPORT zipOpen64 OF((const void *pathname, int append)); /* Create a zipfile. pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on @@ -135,17 +134,17 @@ extern zipFile ZEXPORT zipOpen64 (const void *pathname, int append); Of couse, you can use RAW reading and writing to copy the file you did not want delte */ -extern zipFile ZEXPORT zipOpen2 (const char *pathname, +extern zipFile ZEXPORT zipOpen2 OF((const char *pathname, int append, zipcharpc* globalcomment, - zlib_filefunc_def* pzlib_filefunc_def); + zlib_filefunc_def* pzlib_filefunc_def)); -extern zipFile ZEXPORT zipOpen2_64 (const void *pathname, +extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname, int append, zipcharpc* globalcomment, - zlib_filefunc64_def* pzlib_filefunc_def); + zlib_filefunc64_def* pzlib_filefunc_def)); -extern int ZEXPORT zipOpenNewFileInZip (zipFile file, +extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file, const char* filename, const zip_fileinfo* zipfi, const void* extrafield_local, @@ -154,9 +153,9 @@ extern int ZEXPORT zipOpenNewFileInZip (zipFile file, uInt size_extrafield_global, const char* comment, int method, - int level); + int level)); -extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, +extern int ZEXPORT zipOpenNewFileInZip64 OF((zipFile file, const char* filename, const zip_fileinfo* zipfi, const void* extrafield_local, @@ -166,7 +165,7 @@ extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* comment, int method, int level, - int zip64); + int zip64)); /* Open a file in the ZIP for writing. @@ -185,7 +184,7 @@ extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, */ -extern int ZEXPORT zipOpenNewFileInZip2 (zipFile file, +extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file, const char* filename, const zip_fileinfo* zipfi, const void* extrafield_local, @@ -195,10 +194,10 @@ extern int ZEXPORT zipOpenNewFileInZip2 (zipFile file, const char* comment, int method, int level, - int raw); + int raw)); -extern int ZEXPORT zipOpenNewFileInZip2_64 (zipFile file, +extern int ZEXPORT zipOpenNewFileInZip2_64 OF((zipFile file, const char* filename, const zip_fileinfo* zipfi, const void* extrafield_local, @@ -209,12 +208,12 @@ extern int ZEXPORT zipOpenNewFileInZip2_64 (zipFile file, int method, int level, int raw, - int zip64); + int zip64)); /* Same than zipOpenNewFileInZip, except if raw=1, we write raw file */ -extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, +extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file, const char* filename, const zip_fileinfo* zipfi, const void* extrafield_local, @@ -229,9 +228,9 @@ extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, int memLevel, int strategy, const char* password, - uLong crcForCrypting); + uLong crcForCrypting)); -extern int ZEXPORT zipOpenNewFileInZip3_64 (zipFile file, +extern int ZEXPORT zipOpenNewFileInZip3_64 OF((zipFile file, const char* filename, const zip_fileinfo* zipfi, const void* extrafield_local, @@ -248,7 +247,7 @@ extern int ZEXPORT zipOpenNewFileInZip3_64 (zipFile file, const char* password, uLong crcForCrypting, int zip64 - ); + )); /* Same than zipOpenNewFileInZip2, except @@ -257,7 +256,7 @@ extern int ZEXPORT zipOpenNewFileInZip3_64 (zipFile file, crcForCrypting : crc of file to compress (needed for crypting) */ -extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, +extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file, const char* filename, const zip_fileinfo* zipfi, const void* extrafield_local, @@ -275,10 +274,10 @@ extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, uLong crcForCrypting, uLong versionMadeBy, uLong flagBase - ); + )); -extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, +extern int ZEXPORT zipOpenNewFileInZip4_64 OF((zipFile file, const char* filename, const zip_fileinfo* zipfi, const void* extrafield_local, @@ -297,7 +296,7 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, uLong versionMadeBy, uLong flagBase, int zip64 - ); + )); /* Same than zipOpenNewFileInZip4, except versionMadeBy : value for Version made by field @@ -305,25 +304,25 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, */ -extern int ZEXPORT zipWriteInFileInZip (zipFile file, +extern int ZEXPORT zipWriteInFileInZip OF((zipFile file, const void* buf, - unsigned len); + unsigned len)); /* Write data in the zipfile */ -extern int ZEXPORT zipCloseFileInZip (zipFile file); +extern int ZEXPORT zipCloseFileInZip OF((zipFile file)); /* Close the current file in the zipfile */ -extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, +extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file, uLong uncompressed_size, - uLong crc32); + uLong crc32)); -extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, +extern int ZEXPORT zipCloseFileInZipRaw64 OF((zipFile file, ZPOS64_T uncompressed_size, - uLong crc32); + uLong crc32)); /* Close the current file in the zipfile, for file opened with @@ -331,14 +330,14 @@ extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, uncompressed_size and crc32 are value for the uncompressed size */ -extern int ZEXPORT zipClose (zipFile file, - const char* global_comment); +extern int ZEXPORT zipClose OF((zipFile file, + const char* global_comment)); /* Close the zipfile */ -extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader); +extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader)); /* zipRemoveExtraInfoBlock - Added by Mathias Svensson -- cgit v1.2.3