ioapi.h   ioapi.h 
skipping to change at line 161 skipping to change at line 161
typedef struct zlib_filefunc64_def_s typedef struct zlib_filefunc64_def_s
{ {
open64_file_func zopen64_file; open64_file_func zopen64_file;
read_file_func zread_file; read_file_func zread_file;
write_file_func zwrite_file; write_file_func zwrite_file;
tell64_file_func ztell64_file; tell64_file_func ztell64_file;
seek64_file_func zseek64_file; seek64_file_func zseek64_file;
close_file_func zclose_file; close_file_func zclose_file;
testerror_file_func zerror_file; testerror_file_func zerror_file;
voidpf opaque; voidpf opaque;
close_file_func zfakeclose_file; // for no-auto-close flag
} zlib_filefunc64_def; } zlib_filefunc64_def;
void fill_qiodevice64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def) ); void fill_qiodevice64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def) );
void fill_qiodevice_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); void fill_qiodevice_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
/* now internal definition, only for zip.c and unzip.h */ /* now internal definition, only for zip.c and unzip.h */
typedef struct zlib_filefunc64_32_def_s typedef struct zlib_filefunc64_32_def_s
{ {
zlib_filefunc64_def zfile_func64; zlib_filefunc64_def zfile_func64;
open_file_func zopen32_file; open_file_func zopen32_file;
tell_file_func ztell32_file; tell_file_func ztell32_file;
seek_file_func zseek32_file; seek_file_func zseek32_file;
} zlib_filefunc64_32_def; } zlib_filefunc64_32_def;
#define ZREAD64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func 64.zread_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) #define ZREAD64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func 64.zread_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size))
#define ZWRITE64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func 64.zwrite_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) #define ZWRITE64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func 64.zwrite_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size))
//#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_fi le)) ((filefunc).opaque,filestream)) //#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_fi le)) ((filefunc).opaque,filestream))
//#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_fi le)) ((filefunc).opaque,filestream,pos,mode)) //#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_fi le)) ((filefunc).opaque,filestream,pos,mode))
#define ZCLOSE64(filefunc,filestream) ((*((filefunc).zfile_func 64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream)) #define ZCLOSE64(filefunc,filestream) ((*((filefunc).zfile_func 64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream))
#define ZFAKECLOSE64(filefunc,filestream) ((*((filefunc).zfile_ func64.zfakeclose_file)) ((filefunc).zfile_func64.opaque,filestream))
#define ZERROR64(filefunc,filestream) ((*((filefunc).zfile_func 64.zerror_file)) ((filefunc).zfile_func64.opaque,filestream)) #define ZERROR64(filefunc,filestream) ((*((filefunc).zfile_func 64.zerror_file)) ((filefunc).zfile_func64.opaque,filestream))
voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf file ,int mode)); voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf file ,int mode));
int call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf file stream, ZPOS64_T offset, int origin)); int call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf file stream, ZPOS64_T offset, int origin));
ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf fi lestream)); ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf fi lestream));
void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32); void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
#define ZOPEN64(filefunc,filename,mode) (call_zopen64((&(filefunc)) ,(filename),(mode))) #define ZOPEN64(filefunc,filename,mode) (call_zopen64((&(filefunc)) ,(filename),(mode)))
#define ZTELL64(filefunc,filestream) (call_ztell64((&(filefunc)) ,(filestream))) #define ZTELL64(filefunc,filestream) (call_ztell64((&(filefunc)) ,(filestream)))
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 quazip.h   quazip.h 
skipping to change at line 184 skipping to change at line 184
* constructor, or it is created internally when opening the archive * constructor, or it is created internally when opening the archive
* by its file name. The default API (qioapi.cpp) just delegates * by its file name. The default API (qioapi.cpp) just delegates
* everything to the QIODevice API. Not only this allows to use a * everything to the QIODevice API. Not only this allows to use a
* QIODevice instead of file name, but also has a nice side effect * QIODevice instead of file name, but also has a nice side effect
* of raising the file size limit from 2G to 4G (in non-zip64 archives) . * of raising the file size limit from 2G to 4G (in non-zip64 archives) .
* *
* \note If the zip64 support is needed, the ioApi argument \em must be NULL * \note If the zip64 support is needed, the ioApi argument \em must be NULL
* because due to the backwards compatibility issues it can be used to * because due to the backwards compatibility issues it can be used to
* provide a 32-bit API only. * provide a 32-bit API only.
* *
* \note If the \ref QuaZip::setAutoClose() "no-auto-close" feature is
used,
* then the \a ioApi argument \em should be NULL because the old API
* doesn't support the 'fake close' operation, causing slight memory le
aks
* and other possible troubles (like closing the output device in case
* when an error occurs during opening).
*
* In short: just forget about the \a ioApi argument and you'll be * In short: just forget about the \a ioApi argument and you'll be
* fine. * fine.
**/ **/
bool open(Mode mode, zlib_filefunc_def *ioApi =NULL); bool open(Mode mode, zlib_filefunc_def *ioApi =NULL);
/// Closes ZIP file. /// Closes ZIP file.
/** Call getZipError() to determine if the close was successful. /** Call getZipError() to determine if the close was successful.
* *
* If the file was opened by name, then the underlying QIODevice is clo sed * If the file was opened by name, then the underlying QIODevice is clo sed
* and deleted. * and deleted.
* *
skipping to change at line 430 skipping to change at line 436
By setting this flag to false, it is possible to disable data By setting this flag to false, it is possible to disable data
descriptor writing, thus increasing compatibility with archive descriptor writing, thus increasing compatibility with archive
readers that don't understand this feature of the ZIP file format. readers that don't understand this feature of the ZIP file format.
Setting this flag affects all the QuaZipFile instances that are Setting this flag affects all the QuaZipFile instances that are
opened after this flag is set. opened after this flag is set.
The data descriptor writing mode is enabled by default. The data descriptor writing mode is enabled by default.
Note that if the ZIP archive is written into a QIODevice for which
QIODevice::isSequential() returns \c true, then the data descriptor
is mandatory and will be written even if this flag is set to false.
\param enabled If \c true, enable local descriptor writing, \param enabled If \c true, enable local descriptor writing,
disable it otherwise. disable it otherwise.
\sa QuaZipFile::setDataDescriptorWritingEnabled() \sa QuaZipFile::isDataDescriptorWritingEnabled()
*/ */
void setDataDescriptorWritingEnabled(bool enabled); void setDataDescriptorWritingEnabled(bool enabled);
/// Returns the data descriptor default writing mode. /// Returns the data descriptor default writing mode.
/** /**
\sa setDataDescriptorWritingEnabled() \sa setDataDescriptorWritingEnabled()
*/ */
bool isDataDescriptorWritingEnabled() const; bool isDataDescriptorWritingEnabled() const;
/// Returns a list of files inside the archive. /// Returns a list of files inside the archive.
/** /**
\return A list of file names or an empty list if there \return A list of file names or an empty list if there
 End of changes. 3 change blocks. 
1 lines changed or deleted 13 lines changed or added


 unzip.h   unzip.h 
skipping to change at line 87 skipping to change at line 87
#define UNZ_OK (0) #define UNZ_OK (0)
#define UNZ_END_OF_LIST_OF_FILE (-100) #define UNZ_END_OF_LIST_OF_FILE (-100)
#define UNZ_ERRNO (Z_ERRNO) #define UNZ_ERRNO (Z_ERRNO)
#define UNZ_EOF (0) #define UNZ_EOF (0)
#define UNZ_PARAMERROR (-102) #define UNZ_PARAMERROR (-102)
#define UNZ_BADZIPFILE (-103) #define UNZ_BADZIPFILE (-103)
#define UNZ_INTERNALERROR (-104) #define UNZ_INTERNALERROR (-104)
#define UNZ_CRCERROR (-105) #define UNZ_CRCERROR (-105)
#define UNZ_AUTO_CLOSE 0x01u
#define UNZ_DEFAULT_FLAGS UNZ_AUTO_CLOSE
/* tm_unz contain date/time info */ /* tm_unz contain date/time info */
typedef struct tm_unz_s typedef struct tm_unz_s
{ {
uInt tm_sec; /* seconds after the minute - [0,59] */ uInt tm_sec; /* seconds after the minute - [0,59] */
uInt tm_min; /* minutes after the hour - [0,59] */ uInt tm_min; /* minutes after the hour - [0,59] */
uInt tm_hour; /* hours since midnight - [0,23] */ uInt tm_hour; /* hours since midnight - [0,23] */
uInt tm_mday; /* day of the month - [1,31] */ uInt tm_mday; /* day of the month - [1,31] */
uInt tm_mon; /* months since January - [0,11] */ uInt tm_mon; /* months since January - [0,11] */
uInt tm_year; /* years - [1980..2044] */ uInt tm_year; /* years - [1980..2044] */
} tm_unz; } tm_unz;
skipping to change at line 200 skipping to change at line 203
for read/write the zip file (see ioapi.h) for read/write the zip file (see ioapi.h)
*/ */
extern unzFile ZEXPORT unzOpen2_64 OF((voidpf file, extern unzFile ZEXPORT unzOpen2_64 OF((voidpf file,
zlib_filefunc64_def* pzlib_filefunc_def )); zlib_filefunc64_def* pzlib_filefunc_def ));
/* /*
Open a Zip file, like unz64Open, but provide a set of file low level API Open a Zip file, like unz64Open, but provide a set of file low level API
for read/write the zip file (see ioapi.h) for read/write the zip file (see ioapi.h)
*/ */
/*
* Exported by Sergey A. Tachenov to implement some QuaZIP features. This
* function MAY change signature in order to implement even more features.
* You have been warned!
* */
extern unzFile unzOpenInternal (voidpf file,
zlib_filefunc64_32_def* pzlib_filefunc64_32_
def,
int is64bitOpenFunction, unsigned flags);
extern int ZEXPORT unzClose OF((unzFile file)); extern int ZEXPORT unzClose OF((unzFile file));
/* /*
Close a ZipFile opened with unzipOpen. Close a ZipFile opened with unzipOpen.
If there is files inside the .Zip opened with unzOpenCurrentFile (see lat er), If there is files inside the .Zip opened with unzOpenCurrentFile (see lat er),
these files MUST be closed with unzipCloseCurrentFile before call unzip Close. these files MUST be closed with unzipCloseCurrentFile before call unzip Close.
return UNZ_OK if there is no problem. */ return UNZ_OK if there is no problem. */
extern int ZEXPORT unzGetGlobalInfo OF((unzFile file, extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
unz_global_info *pglobal_info)); unz_global_info *pglobal_info));
skipping to change at line 427 skipping to change at line 439
/************************************************************************** */ /************************************************************************** */
/* Get the current file offset */ /* Get the current file offset */
extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file); extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);
extern uLong ZEXPORT unzGetOffset (unzFile file); extern uLong ZEXPORT unzGetOffset (unzFile file);
/* Set the current file offset */ /* Set the current file offset */
extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos); extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
extern int ZEXPORT unzSetOffset (unzFile file, uLong pos); extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
extern int ZEXPORT unzSetFlags(unzFile file, unsigned flags);
extern int ZEXPORT unzClearFlags(unzFile file, unsigned flags);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _unz64_H */ #endif /* _unz64_H */
 End of changes. 3 change blocks. 
0 lines changed or deleted 16 lines changed or added


 zip.h   zip.h 
skipping to change at line 87 skipping to change at line 87
#define ZIP_OK (0) #define ZIP_OK (0)
#define ZIP_EOF (0) #define ZIP_EOF (0)
#define ZIP_ERRNO (Z_ERRNO) #define ZIP_ERRNO (Z_ERRNO)
#define ZIP_PARAMERROR (-102) #define ZIP_PARAMERROR (-102)
#define ZIP_BADZIPFILE (-103) #define ZIP_BADZIPFILE (-103)
#define ZIP_INTERNALERROR (-104) #define ZIP_INTERNALERROR (-104)
#define ZIP_WRITE_DATA_DESCRIPTOR 0x8u #define ZIP_WRITE_DATA_DESCRIPTOR 0x8u
#define ZIP_AUTO_CLOSE 0x1u #define ZIP_AUTO_CLOSE 0x1u
#define ZIP_SEQUENTIAL 0x2u
#define ZIP_DEFAULT_FLAGS (ZIP_AUTO_CLOSE | ZIP_WRITE_DATA_DESCRIPTOR)
#ifndef DEF_MEM_LEVEL #ifndef DEF_MEM_LEVEL
# if MAX_MEM_LEVEL >= 8 # if MAX_MEM_LEVEL >= 8
# define DEF_MEM_LEVEL 8 # define DEF_MEM_LEVEL 8
# else # else
# define DEF_MEM_LEVEL MAX_MEM_LEVEL # define DEF_MEM_LEVEL MAX_MEM_LEVEL
# endif # endif
#endif #endif
/* default memLevel */ /* default memLevel */
skipping to change at line 155 skipping to change at line 157
extern zipFile ZEXPORT zipOpen2 OF((voidpf file, extern zipFile ZEXPORT zipOpen2 OF((voidpf file,
int append, int append,
zipcharpc* globalcomment, zipcharpc* globalcomment,
zlib_filefunc_def* pzlib_filefunc_def)); zlib_filefunc_def* pzlib_filefunc_def));
extern zipFile ZEXPORT zipOpen2_64 OF((voidpf file, extern zipFile ZEXPORT zipOpen2_64 OF((voidpf file,
int append, int append,
zipcharpc* globalcomment, zipcharpc* globalcomment,
zlib_filefunc64_def* pzlib_filefunc_def) ); zlib_filefunc64_def* pzlib_filefunc_def) );
/*
* Exported by Sergey A. Tachenov to suit the needs of QuaZIP.
* Note that this function MAY change signature in order to
* provide new QuaZIP features. You have been warned!
* */
extern zipFile ZEXPORT zipOpen3 (voidpf file,
int append,
zipcharpc* globalcomment,
zlib_filefunc64_32_def* pzlib_filefunc64_3
2_def,
unsigned flags);
extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file, extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
const char* filename, const char* filename,
const zip_fileinfo* zipfi, const zip_fileinfo* zipfi,
const void* extrafield_local, const void* extrafield_local,
uInt size_extrafield_local, uInt size_extrafield_local,
const void* extrafield_global, const void* extrafield_global,
uInt size_extrafield_global, uInt size_extrafield_global,
const char* comment, const char* comment,
int method, int method,
int level)); int level));
 End of changes. 2 change blocks. 
0 lines changed or deleted 14 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/