| mz_compat.h | mz_compat.h | |||
|---|---|---|---|---|
| skipping to change at line 123 | skipping to change at line 123 | |||
| ZEXPORT void fill_fopen_filefunc(zlib_filefunc_def *pzlib_filefunc_def); | ZEXPORT void fill_fopen_filefunc(zlib_filefunc_def *pzlib_filefunc_def); | |||
| ZEXPORT void fill_fopen64_filefunc(zlib_filefunc64_def *pzlib_filefunc_def) ; | ZEXPORT void fill_fopen64_filefunc(zlib_filefunc64_def *pzlib_filefunc_def) ; | |||
| ZEXPORT void fill_win32_filefunc(zlib_filefunc_def *pzlib_filefunc_def); | ZEXPORT void fill_win32_filefunc(zlib_filefunc_def *pzlib_filefunc_def); | |||
| ZEXPORT void fill_win32_filefunc64(zlib_filefunc64_def *pzlib_filefunc_def) ; | ZEXPORT void fill_win32_filefunc64(zlib_filefunc64_def *pzlib_filefunc_def) ; | |||
| ZEXPORT void fill_win32_filefunc64A(zlib_filefunc64_def *pzlib_filefunc_def ); | ZEXPORT void fill_win32_filefunc64A(zlib_filefunc64_def *pzlib_filefunc_def ); | |||
| ZEXPORT void fill_memory_filefunc(zlib_filefunc_def *pzlib_filefunc_def); | ZEXPORT void fill_memory_filefunc(zlib_filefunc_def *pzlib_filefunc_def); | |||
| /************************************************************************** */ | /************************************************************************** */ | |||
| #if MZ_COMPAT_VERSION <= 110 | #if !defined(MZ_COMPAT_VERSION) || MZ_COMPAT_VERSION <= 110 | |||
| #define mz_dos_date dosDate | #define mz_dos_date dosDate | |||
| #else | #else | |||
| #define mz_dos_date dos_date | #define mz_dos_date dos_date | |||
| #endif | #endif | |||
| typedef struct tm tm_unz; | typedef struct tm tm_unz; | |||
| typedef struct tm tm_zip; | typedef struct tm tm_zip; | |||
| typedef struct { | typedef struct { | |||
| struct tm tmz_date; /* date in understandable format */ | struct tm tmz_date; /* date in understandable format */ | |||
| skipping to change at line 198 | skipping to change at line 198 | |||
| int raw, int zip64); | int raw, int zip64); | |||
| ZEXPORT int zipOpenNewFileInZip3(zipFile file, const char *filename, co nst zip_fileinfo *zipfi, | ZEXPORT int zipOpenNewFileInZip3(zipFile file, const char *filename, co nst zip_fileinfo *zipfi, | |||
| const void *extrafield_local, uint16_t size_extrafield_local, const voi d *extrafield_global, | const void *extrafield_local, uint16_t size_extrafield_local, const voi d *extrafield_global, | |||
| uint16_t size_extrafield_global, const char *comment, int compression_m ethod, int level, | uint16_t size_extrafield_global, const char *comment, int compression_m ethod, int level, | |||
| int raw, int windowBits, int memLevel, int strategy, const char *passwo rd, | int raw, int windowBits, int memLevel, int strategy, const char *passwo rd, | |||
| unsigned long crc_for_crypting); | unsigned long crc_for_crypting); | |||
| ZEXPORT int zipOpenNewFileInZip3_64(zipFile file, const char *filename, const zip_fileinfo *zipfi, | ZEXPORT int zipOpenNewFileInZip3_64(zipFile file, const char *filename, const zip_fileinfo *zipfi, | |||
| const void *extrafield_local, uint16_t size_extrafield_local, const voi d *extrafield_global, | const void *extrafield_local, uint16_t size_extrafield_local, const voi d *extrafield_global, | |||
| uint16_t size_extrafield_global, const char *comment, int compression_m ethod, int level, | uint16_t size_extrafield_global, const char *comment, int compression_m ethod, int level, | |||
| int raw, int windowBits, int memLevel, int strategy, const char *passwo rd, | int raw, int windowBits, int memLevel, int strategy, const char *passwo rd, | |||
| uint32_t crc_for_crypting, int zip64); | unsigned long crc_for_crypting, int zip64); | |||
| ZEXPORT int zipOpenNewFileInZip4(zipFile file, const char *filename, co nst zip_fileinfo *zipfi, | ZEXPORT int zipOpenNewFileInZip4(zipFile file, const char *filename, co nst zip_fileinfo *zipfi, | |||
| const void *extrafield_local, uint16_t size_extrafield_local, const voi d *extrafield_global, | const void *extrafield_local, uint16_t size_extrafield_local, const voi d *extrafield_global, | |||
| uint16_t size_extrafield_global, const char *comment, int compression_m ethod, int level, | uint16_t size_extrafield_global, const char *comment, int compression_m ethod, int level, | |||
| int raw, int windowBits, int memLevel, int strategy, const char *passwo rd, | int raw, int windowBits, int memLevel, int strategy, const char *passwo rd, | |||
| unsigned long crc_for_crypting, unsigned long version_madeby, unsigned long flag_base); | unsigned long crc_for_crypting, unsigned long version_madeby, unsigned long flag_base); | |||
| ZEXPORT int zipOpenNewFileInZip4_64(zipFile file, const char *filename, const zip_fileinfo *zipfi, | ZEXPORT int zipOpenNewFileInZip4_64(zipFile file, const char *filename, const zip_fileinfo *zipfi, | |||
| const void *extrafield_local, uint16_t size_extrafield_local, const voi d *extrafield_global, | const void *extrafield_local, uint16_t size_extrafield_local, const voi d *extrafield_global, | |||
| uint16_t size_extrafield_global, const char *comment, int compression_m ethod, int level, | uint16_t size_extrafield_global, const char *comment, int compression_m ethod, int level, | |||
| int raw, int windowBits, int memLevel, int strategy, const char *passwo rd, | int raw, int windowBits, int memLevel, int strategy, const char *passwo rd, | |||
| unsigned long crc_for_crypting, unsigned long version_madeby, unsigned long flag_base, int zip64); | unsigned long crc_for_crypting, unsigned long version_madeby, unsigned long flag_base, int zip64); | |||
| skipping to change at line 313 | skipping to change at line 313 | |||
| unsigned long internal_fa; /* internal file attributes 2 bytes */ | unsigned long internal_fa; /* internal file attributes 2 bytes */ | |||
| unsigned long external_fa; /* external file attributes 4 bytes */ | unsigned long external_fa; /* external file attributes 4 bytes */ | |||
| struct tm tmu_date; | struct tm tmu_date; | |||
| uint64_t disk_offset; | uint64_t disk_offset; | |||
| } unz_file_info; | } unz_file_info; | |||
| /************************************************************************** */ | /************************************************************************** */ | |||
| #if !defined(MZ_COMPAT_VERSION) || MZ_COMPAT_VERSION < 110 | ||||
| /* Possible values: | /* Possible values: | |||
| 0 - Uses OS default, e.g. Windows ignores case. | 0 - Uses OS default, e.g. Windows ignores case. | |||
| 1 - Is case sensitive. | 1 - Is case sensitive. | |||
| >= 2 - Ignore case. | >= 2 - Ignore case. | |||
| */ | */ | |||
| typedef int unzFileNameCase; | typedef int unzFileNameCase; | |||
| #else | ||||
| typedef int (*unzFileNameComparer)(unzFile file, const char* filename1, con | ||||
| st char* filename2); | ||||
| #endif | ||||
| typedef int (*unzIteratorFunction)(unzFile file); | typedef int (*unzIteratorFunction)(unzFile file); | |||
| typedef int (*unzIteratorFunction2)(unzFile file, unz_file_info64 *pfile_in fo, char *filename, | typedef int (*unzIteratorFunction2)(unzFile file, unz_file_info64 *pfile_in fo, char *filename, | |||
| uint16_t filename_size, void *extrafield, uint16_t extrafield_size, cha r *comment, | uint16_t filename_size, void *extrafield, uint16_t extrafield_size, cha r *comment, | |||
| uint16_t comment_size); | uint16_t comment_size); | |||
| /************************************************************************** */ | /************************************************************************** */ | |||
| /* Reading a zip file */ | /* Reading a zip file */ | |||
| ZEXPORT unzFile unzOpen(const char *path); | ZEXPORT unzFile unzOpen(const char *path); | |||
| ZEXPORT unzFile unzOpen64(const void *path); | ZEXPORT unzFile unzOpen64(const void *path); | |||
| skipping to change at line 359 | skipping to change at line 363 | |||
| ZEXPORT int unzGetCurrentFileInfo(unzFile file, unz_file_info *pfile_in fo, char *filename, | ZEXPORT int unzGetCurrentFileInfo(unzFile file, unz_file_info *pfile_in fo, char *filename, | |||
| unsigned long filename_size, void *extrafield, unsigned long extrafield _size, char *comment, | unsigned long filename_size, void *extrafield, unsigned long extrafield _size, char *comment, | |||
| unsigned long comment_size); | unsigned long comment_size); | |||
| ZEXPORT int unzGetCurrentFileInfo64(unzFile file, unz_file_info64 * pfi le_info, char *filename, | ZEXPORT int unzGetCurrentFileInfo64(unzFile file, unz_file_info64 * pfi le_info, char *filename, | |||
| unsigned long filename_size, void *extrafield, unsigned long extrafield _size, char *comment, | unsigned long filename_size, void *extrafield, unsigned long extrafield _size, char *comment, | |||
| unsigned long comment_size); | unsigned long comment_size); | |||
| ZEXPORT int unzGoToFirstFile(unzFile file); | ZEXPORT int unzGoToFirstFile(unzFile file); | |||
| ZEXPORT int unzGoToNextFile(unzFile file); | ZEXPORT int unzGoToNextFile(unzFile file); | |||
| #if !defined(MZ_COMPAT_VERSION) || MZ_COMPAT_VERSION < 110 | ||||
| ZEXPORT int unzLocateFile(unzFile file, const char *filename, unzFileNa meCase filename_case); | ZEXPORT int unzLocateFile(unzFile file, const char *filename, unzFileNa meCase filename_case); | |||
| #else | ||||
| ZEXPORT int unzLocateFile(unzFile file, const char* filename, unzFileNa | ||||
| meComparer filename_compare_func); | ||||
| #endif | ||||
| ZEXPORT int unzGetLocalExtrafield(unzFile file, void *buf, unsigned int len); | ZEXPORT int unzGetLocalExtrafield(unzFile file, void *buf, unsigned int len); | |||
| /************************************************************************** */ | /************************************************************************** */ | |||
| /* Raw access to zip file */ | /* Raw access to zip file */ | |||
| typedef struct unz_file_pos_s { | typedef struct unz_file_pos_s { | |||
| uint32_t pos_in_zip_directory; /* offset in zip file directory */ | uint32_t pos_in_zip_directory; /* offset in zip file directory */ | |||
| uint32_t num_of_file; /* # of file */ | uint32_t num_of_file; /* # of file */ | |||
| } unz_file_pos; | } unz_file_pos; | |||
| End of changes. 6 change blocks. | ||||
| 2 lines changed or deleted | 12 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ | ||||