mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-26 14:15:32 +00:00
Change src/support/minizip/* from K&R to ANSI style so that a C++ compiler can compile them
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19698 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng
parent
005c3ea9c0
commit
0f7d814280
@ -87,13 +87,13 @@ static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned lon
|
||||
# define ZCR_SEED2 3141592654UL /* use PI as default pattern */
|
||||
# endif
|
||||
|
||||
static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
|
||||
const char *passwd; /* password string */
|
||||
unsigned char *buf; /* where to write header */
|
||||
int bufSize;
|
||||
unsigned long* pkeys;
|
||||
const unsigned long* pcrc_32_tab;
|
||||
unsigned long crcForCrypting;
|
||||
static int crypthead(
|
||||
const char *passwd, /* password string */
|
||||
unsigned char *buf, /* where to write header */
|
||||
int bufSize,
|
||||
unsigned long* pkeys,
|
||||
const unsigned long* pcrc_32_tab,
|
||||
unsigned long crcForCrypting)
|
||||
{
|
||||
int n; /* index in random header */
|
||||
int t; /* temporary */
|
||||
|
||||
@ -65,10 +65,7 @@ int ZCALLBACK ferror_file_func OF((
|
||||
voidpf stream));
|
||||
|
||||
|
||||
voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
|
||||
voidpf opaque;
|
||||
const char* filename;
|
||||
int mode;
|
||||
voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
|
||||
{
|
||||
FILE* file = NULL;
|
||||
const char* mode_fopen = NULL;
|
||||
@ -87,11 +84,7 @@ voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
|
||||
}
|
||||
|
||||
|
||||
uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
void* buf;
|
||||
uLong size;
|
||||
uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
|
||||
{
|
||||
uLong ret;
|
||||
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
|
||||
@ -99,31 +92,21 @@ uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
|
||||
}
|
||||
|
||||
|
||||
uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
const void* buf;
|
||||
uLong size;
|
||||
uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
|
||||
{
|
||||
uLong ret;
|
||||
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
long ZCALLBACK ftell_file_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
|
||||
{
|
||||
long ret;
|
||||
ret = ftell((FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
uLong offset;
|
||||
int origin;
|
||||
long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin)
|
||||
{
|
||||
int fseek_origin=0;
|
||||
long ret;
|
||||
@ -145,26 +128,21 @@ long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ZCALLBACK fclose_file_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
|
||||
{
|
||||
int ret;
|
||||
ret = fclose((FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ZCALLBACK ferror_file_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
|
||||
{
|
||||
int ret;
|
||||
ret = ferror((FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
void fill_fopen_filefunc (pzlib_filefunc_def)
|
||||
zlib_filefunc_def* pzlib_filefunc_def;
|
||||
void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
|
||||
{
|
||||
pzlib_filefunc_def->zopen_file = fopen_file_func;
|
||||
pzlib_filefunc_def->zread_file = fread_file_func;
|
||||
|
||||
@ -168,10 +168,10 @@ local int unzlocal_getByte OF((
|
||||
voidpf filestream,
|
||||
int *pi));
|
||||
|
||||
local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
|
||||
const zlib_filefunc_def* pzlib_filefunc_def;
|
||||
voidpf filestream;
|
||||
int *pi;
|
||||
local int unzlocal_getByte(
|
||||
const zlib_filefunc_def* pzlib_filefunc_def,
|
||||
voidpf filestream,
|
||||
int *pi)
|
||||
{
|
||||
unsigned char c;
|
||||
int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
|
||||
@ -198,10 +198,10 @@ local int unzlocal_getShort OF((
|
||||
voidpf filestream,
|
||||
uLong *pX));
|
||||
|
||||
local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
|
||||
const zlib_filefunc_def* pzlib_filefunc_def;
|
||||
voidpf filestream;
|
||||
uLong *pX;
|
||||
local int unzlocal_getShort (
|
||||
const zlib_filefunc_def* pzlib_filefunc_def,
|
||||
voidpf filestream,
|
||||
uLong *pX)
|
||||
{
|
||||
uLong x ;
|
||||
int i;
|
||||
@ -226,10 +226,10 @@ local int unzlocal_getLong OF((
|
||||
voidpf filestream,
|
||||
uLong *pX));
|
||||
|
||||
local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
|
||||
const zlib_filefunc_def* pzlib_filefunc_def;
|
||||
voidpf filestream;
|
||||
uLong *pX;
|
||||
local int unzlocal_getLong (
|
||||
const zlib_filefunc_def* pzlib_filefunc_def,
|
||||
voidpf filestream,
|
||||
uLong *pX)
|
||||
{
|
||||
uLong x ;
|
||||
int i;
|
||||
@ -259,9 +259,9 @@ local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
|
||||
|
||||
|
||||
/* My own strcmpi / strcasecmp */
|
||||
local int strcmpcasenosensitive_internal (fileName1,fileName2)
|
||||
const char* fileName1;
|
||||
const char* fileName2;
|
||||
local int strcmpcasenosensitive_internal (
|
||||
const char* fileName1,
|
||||
const char* fileName2)
|
||||
{
|
||||
for (;;)
|
||||
{
|
||||
@ -302,10 +302,10 @@ local int strcmpcasenosensitive_internal (fileName1,fileName2)
|
||||
(like 1 on Unix, 2 on Windows)
|
||||
|
||||
*/
|
||||
extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
|
||||
const char* fileName1;
|
||||
const char* fileName2;
|
||||
int iCaseSensitivity;
|
||||
extern int ZEXPORT unzStringFileNameCompare (
|
||||
const char* fileName1,
|
||||
const char* fileName2,
|
||||
int iCaseSensitivity)
|
||||
{
|
||||
if (iCaseSensitivity==0)
|
||||
iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
|
||||
@ -328,9 +328,9 @@ local uLong unzlocal_SearchCentralDir OF((
|
||||
const zlib_filefunc_def* pzlib_filefunc_def,
|
||||
voidpf filestream));
|
||||
|
||||
local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
|
||||
const zlib_filefunc_def* pzlib_filefunc_def;
|
||||
voidpf filestream;
|
||||
local uLong unzlocal_SearchCentralDir(
|
||||
const zlib_filefunc_def* pzlib_filefunc_def,
|
||||
voidpf filestream)
|
||||
{
|
||||
unsigned char* buf;
|
||||
uLong uSizeFile;
|
||||
@ -394,9 +394,9 @@ local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
|
||||
Else, the return value is a unzFile Handle, usable with other function
|
||||
of this unzip package.
|
||||
*/
|
||||
extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
|
||||
const char *path;
|
||||
zlib_filefunc_def* pzlib_filefunc_def;
|
||||
extern unzFile ZEXPORT unzOpen2 (
|
||||
const char *path,
|
||||
zlib_filefunc_def* pzlib_filefunc_def)
|
||||
{
|
||||
unz_s us;
|
||||
unz_s *s;
|
||||
@ -497,8 +497,8 @@ extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
|
||||
}
|
||||
|
||||
|
||||
extern unzFile ZEXPORT unzOpen (path)
|
||||
const char *path;
|
||||
extern unzFile ZEXPORT unzOpen (
|
||||
const char *path)
|
||||
{
|
||||
return unzOpen2(path, NULL);
|
||||
}
|
||||
@ -508,8 +508,8 @@ extern unzFile ZEXPORT unzOpen (path)
|
||||
If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
|
||||
these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
|
||||
return UNZ_OK if there is no problem. */
|
||||
extern int ZEXPORT unzClose (file)
|
||||
unzFile file;
|
||||
extern int ZEXPORT unzClose (
|
||||
unzFile file)
|
||||
{
|
||||
unz_s* s;
|
||||
if (file==NULL)
|
||||
@ -529,9 +529,9 @@ extern int ZEXPORT unzClose (file)
|
||||
Write info about the ZipFile in the *pglobal_info structure.
|
||||
No preparation of the structure is needed
|
||||
return UNZ_OK if there is no problem. */
|
||||
extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
|
||||
unzFile file;
|
||||
unz_global_info *pglobal_info;
|
||||
extern int ZEXPORT unzGetGlobalInfo (
|
||||
unzFile file,
|
||||
unz_global_info *pglobal_info)
|
||||
{
|
||||
unz_s* s;
|
||||
if (file==NULL)
|
||||
@ -545,9 +545,9 @@ extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
|
||||
/*
|
||||
Translate date/time from Dos format to tm_unz (readable more easilty)
|
||||
*/
|
||||
local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
|
||||
uLong ulDosDate;
|
||||
tm_unz* ptm;
|
||||
local void unzlocal_DosDateToTmuDate (
|
||||
uLong ulDosDate,
|
||||
tm_unz* ptm)
|
||||
{
|
||||
uLong uDate;
|
||||
uDate = (uLong)(ulDosDate>>16);
|
||||
@ -574,21 +574,16 @@ local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
|
||||
char *szComment,
|
||||
uLong commentBufferSize));
|
||||
|
||||
local int unzlocal_GetCurrentFileInfoInternal (file,
|
||||
pfile_info,
|
||||
pfile_info_internal,
|
||||
szFileName, fileNameBufferSize,
|
||||
extraField, extraFieldBufferSize,
|
||||
szComment, commentBufferSize)
|
||||
unzFile file;
|
||||
unz_file_info *pfile_info;
|
||||
unz_file_info_internal *pfile_info_internal;
|
||||
char *szFileName;
|
||||
uLong fileNameBufferSize;
|
||||
void *extraField;
|
||||
uLong extraFieldBufferSize;
|
||||
char *szComment;
|
||||
uLong commentBufferSize;
|
||||
local int unzlocal_GetCurrentFileInfoInternal (
|
||||
unzFile file,
|
||||
unz_file_info *pfile_info,
|
||||
unz_file_info_internal *pfile_info_internal,
|
||||
char *szFileName,
|
||||
uLong fileNameBufferSize,
|
||||
void *extraField,
|
||||
uLong extraFieldBufferSize,
|
||||
char *szComment,
|
||||
uLong commentBufferSize)
|
||||
{
|
||||
unz_s* s;
|
||||
unz_file_info file_info;
|
||||
@ -741,19 +736,15 @@ local int unzlocal_GetCurrentFileInfoInternal (file,
|
||||
No preparation of the structure is needed
|
||||
return UNZ_OK if there is no problem.
|
||||
*/
|
||||
extern int ZEXPORT unzGetCurrentFileInfo (file,
|
||||
pfile_info,
|
||||
szFileName, fileNameBufferSize,
|
||||
extraField, extraFieldBufferSize,
|
||||
szComment, commentBufferSize)
|
||||
unzFile file;
|
||||
unz_file_info *pfile_info;
|
||||
char *szFileName;
|
||||
uLong fileNameBufferSize;
|
||||
void *extraField;
|
||||
uLong extraFieldBufferSize;
|
||||
char *szComment;
|
||||
uLong commentBufferSize;
|
||||
extern int ZEXPORT unzGetCurrentFileInfo (
|
||||
unzFile file,
|
||||
unz_file_info *pfile_info,
|
||||
char *szFileName,
|
||||
uLong fileNameBufferSize,
|
||||
void *extraField,
|
||||
uLong extraFieldBufferSize,
|
||||
char *szComment,
|
||||
uLong commentBufferSize)
|
||||
{
|
||||
return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
|
||||
szFileName,fileNameBufferSize,
|
||||
@ -765,8 +756,8 @@ extern int ZEXPORT unzGetCurrentFileInfo (file,
|
||||
Set the current file of the zipfile to the first file.
|
||||
return UNZ_OK if there is no problem
|
||||
*/
|
||||
extern int ZEXPORT unzGoToFirstFile (file)
|
||||
unzFile file;
|
||||
extern int ZEXPORT unzGoToFirstFile (
|
||||
unzFile file)
|
||||
{
|
||||
int err=UNZ_OK;
|
||||
unz_s* s;
|
||||
@ -787,8 +778,8 @@ extern int ZEXPORT unzGoToFirstFile (file)
|
||||
return UNZ_OK if there is no problem
|
||||
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
|
||||
*/
|
||||
extern int ZEXPORT unzGoToNextFile (file)
|
||||
unzFile file;
|
||||
extern int ZEXPORT unzGoToNextFile (
|
||||
unzFile file)
|
||||
{
|
||||
unz_s* s;
|
||||
int err;
|
||||
@ -821,10 +812,10 @@ extern int ZEXPORT unzGoToNextFile (file)
|
||||
UNZ_OK if the file is found. It becomes the current file.
|
||||
UNZ_END_OF_LIST_OF_FILE if the file is not found
|
||||
*/
|
||||
extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
|
||||
unzFile file;
|
||||
const char *szFileName;
|
||||
int iCaseSensitivity;
|
||||
extern int ZEXPORT unzLocateFile (
|
||||
unzFile file,
|
||||
const char *szFileName,
|
||||
int iCaseSensitivity)
|
||||
{
|
||||
unz_s* s;
|
||||
int err;
|
||||
@ -900,9 +891,9 @@ typedef struct unz_file_pos_s
|
||||
} unz_file_pos;
|
||||
*/
|
||||
|
||||
extern int ZEXPORT unzGetFilePos(file, file_pos)
|
||||
unzFile file;
|
||||
unz_file_pos* file_pos;
|
||||
extern int ZEXPORT unzGetFilePos(
|
||||
unzFile file,
|
||||
unz_file_pos* file_pos)
|
||||
{
|
||||
unz_s* s;
|
||||
|
||||
@ -918,9 +909,9 @@ extern int ZEXPORT unzGetFilePos(file, file_pos)
|
||||
return UNZ_OK;
|
||||
}
|
||||
|
||||
extern int ZEXPORT unzGoToFilePos(file, file_pos)
|
||||
unzFile file;
|
||||
unz_file_pos* file_pos;
|
||||
extern int ZEXPORT unzGoToFilePos(
|
||||
unzFile file,
|
||||
unz_file_pos* file_pos)
|
||||
{
|
||||
unz_s* s;
|
||||
int err;
|
||||
@ -954,13 +945,11 @@ extern int ZEXPORT unzGoToFilePos(file, file_pos)
|
||||
store in *piSizeVar the size of extra info in local header
|
||||
(filename and size of extra field data)
|
||||
*/
|
||||
local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
|
||||
poffset_local_extrafield,
|
||||
psize_local_extrafield)
|
||||
unz_s* s;
|
||||
uInt* piSizeVar;
|
||||
uLong *poffset_local_extrafield;
|
||||
uInt *psize_local_extrafield;
|
||||
local int unzlocal_CheckCurrentFileCoherencyHeader (
|
||||
unz_s* s,
|
||||
uInt* piSizeVar,
|
||||
uLong *poffset_local_extrafield,
|
||||
uInt *psize_local_extrafield)
|
||||
{
|
||||
uLong uMagic,uData,uFlags;
|
||||
uLong size_filename;
|
||||
@ -1044,12 +1033,12 @@ local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
|
||||
Open for reading data the current file in the zipfile.
|
||||
If there is no error and the file is opened, the return value is UNZ_OK.
|
||||
*/
|
||||
extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
|
||||
unzFile file;
|
||||
int* method;
|
||||
int* level;
|
||||
int raw;
|
||||
const char* password;
|
||||
extern int ZEXPORT unzOpenCurrentFile3 (
|
||||
unzFile file,
|
||||
int* method,
|
||||
int* level,
|
||||
int raw,
|
||||
const char* password)
|
||||
{
|
||||
int err=UNZ_OK;
|
||||
uInt iSizeVar;
|
||||
@ -1130,7 +1119,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
|
||||
pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
|
||||
pfile_in_zip_read_info->stream.zfree = (free_func)0;
|
||||
pfile_in_zip_read_info->stream.opaque = (voidpf)0;
|
||||
pfile_in_zip_read_info->stream.next_in = (voidpf)0;
|
||||
pfile_in_zip_read_info->stream.next_in = (Bytef*)0;
|
||||
pfile_in_zip_read_info->stream.avail_in = 0;
|
||||
|
||||
err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
|
||||
@ -1189,24 +1178,24 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
|
||||
return UNZ_OK;
|
||||
}
|
||||
|
||||
extern int ZEXPORT unzOpenCurrentFile (file)
|
||||
unzFile file;
|
||||
extern int ZEXPORT unzOpenCurrentFile (
|
||||
unzFile file)
|
||||
{
|
||||
return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
|
||||
}
|
||||
|
||||
extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
|
||||
unzFile file;
|
||||
const char* password;
|
||||
extern int ZEXPORT unzOpenCurrentFilePassword (
|
||||
unzFile file,
|
||||
const char* password)
|
||||
{
|
||||
return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
|
||||
}
|
||||
|
||||
extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
|
||||
unzFile file;
|
||||
int* method;
|
||||
int* level;
|
||||
int raw;
|
||||
extern int ZEXPORT unzOpenCurrentFile2 (
|
||||
unzFile file,
|
||||
int* method,
|
||||
int* level,
|
||||
int raw)
|
||||
{
|
||||
return unzOpenCurrentFile3(file, method, level, raw, NULL);
|
||||
}
|
||||
@ -1221,10 +1210,10 @@ extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
|
||||
return <0 with error code if there is an error
|
||||
(UNZ_ERRNO for IO error, or zLib error for uncompress error)
|
||||
*/
|
||||
extern int ZEXPORT unzReadCurrentFile (file, buf, len)
|
||||
unzFile file;
|
||||
voidp buf;
|
||||
unsigned len;
|
||||
extern int ZEXPORT unzReadCurrentFile (
|
||||
unzFile file,
|
||||
voidp buf,
|
||||
unsigned len)
|
||||
{
|
||||
int err=UNZ_OK;
|
||||
uInt iRead = 0;
|
||||
@ -1382,8 +1371,8 @@ extern int ZEXPORT unzReadCurrentFile (file, buf, len)
|
||||
/*
|
||||
Give the current position in uncompressed data
|
||||
*/
|
||||
extern z_off_t ZEXPORT unztell (file)
|
||||
unzFile file;
|
||||
extern z_off_t ZEXPORT unztell (
|
||||
unzFile file)
|
||||
{
|
||||
unz_s* s;
|
||||
file_in_zip_read_info_s* pfile_in_zip_read_info;
|
||||
@ -1402,8 +1391,8 @@ extern z_off_t ZEXPORT unztell (file)
|
||||
/*
|
||||
return 1 if the end of file was reached, 0 elsewhere
|
||||
*/
|
||||
extern int ZEXPORT unzeof (file)
|
||||
unzFile file;
|
||||
extern int ZEXPORT unzeof (
|
||||
unzFile file)
|
||||
{
|
||||
unz_s* s;
|
||||
file_in_zip_read_info_s* pfile_in_zip_read_info;
|
||||
@ -1435,10 +1424,10 @@ extern int ZEXPORT unzeof (file)
|
||||
the return value is the number of bytes copied in buf, or (if <0)
|
||||
the error code
|
||||
*/
|
||||
extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
|
||||
unzFile file;
|
||||
voidp buf;
|
||||
unsigned len;
|
||||
extern int ZEXPORT unzGetLocalExtrafield (
|
||||
unzFile file,
|
||||
voidp buf,
|
||||
unsigned len)
|
||||
{
|
||||
unz_s* s;
|
||||
file_in_zip_read_info_s* pfile_in_zip_read_info;
|
||||
@ -1486,8 +1475,8 @@ extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
|
||||
Close the file in zip opened with unzipOpenCurrentFile
|
||||
Return UNZ_CRCERROR if all the file was read but the CRC is not good
|
||||
*/
|
||||
extern int ZEXPORT unzCloseCurrentFile (file)
|
||||
unzFile file;
|
||||
extern int ZEXPORT unzCloseCurrentFile (
|
||||
unzFile file)
|
||||
{
|
||||
int err=UNZ_OK;
|
||||
|
||||
@ -1529,10 +1518,10 @@ extern int ZEXPORT unzCloseCurrentFile (file)
|
||||
uSizeBuf is the size of the szComment buffer.
|
||||
return the number of byte copied or an error code <0
|
||||
*/
|
||||
extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
|
||||
unzFile file;
|
||||
char *szComment;
|
||||
uLong uSizeBuf;
|
||||
extern int ZEXPORT unzGetGlobalComment (
|
||||
unzFile file,
|
||||
char *szComment,
|
||||
uLong uSizeBuf)
|
||||
{
|
||||
int err=UNZ_OK;
|
||||
unz_s* s;
|
||||
@ -1561,13 +1550,13 @@ extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
|
||||
}
|
||||
|
||||
/* Additions by RX '2004 */
|
||||
extern uLong ZEXPORT unzGetOffset (file)
|
||||
unzFile file;
|
||||
extern uLong ZEXPORT unzGetOffset (
|
||||
unzFile file)
|
||||
{
|
||||
unz_s* s;
|
||||
|
||||
if (file==NULL)
|
||||
return UNZ_PARAMERROR;
|
||||
return (uLong)UNZ_PARAMERROR;
|
||||
s=(unz_s*)file;
|
||||
if (!s->current_file_ok)
|
||||
return 0;
|
||||
@ -1577,9 +1566,9 @@ extern uLong ZEXPORT unzGetOffset (file)
|
||||
return s->pos_in_central_dir;
|
||||
}
|
||||
|
||||
extern int ZEXPORT unzSetOffset (file, pos)
|
||||
unzFile file;
|
||||
uLong pos;
|
||||
extern int ZEXPORT unzSetOffset (
|
||||
unzFile file,
|
||||
uLong pos)
|
||||
{
|
||||
unz_s* s;
|
||||
int err;
|
||||
|
||||
@ -172,8 +172,7 @@ local linkedlist_datablock_internal* allocate_new_datablock()
|
||||
return ldi;
|
||||
}
|
||||
|
||||
local void free_datablock(ldi)
|
||||
linkedlist_datablock_internal* ldi;
|
||||
local void free_datablock(linkedlist_datablock_internal*ldi)
|
||||
{
|
||||
while (ldi!=NULL)
|
||||
{
|
||||
@ -183,24 +182,19 @@ local void free_datablock(ldi)
|
||||
}
|
||||
}
|
||||
|
||||
local void init_linkedlist(ll)
|
||||
linkedlist_data* ll;
|
||||
local void init_linkedlist(linkedlist_data* ll)
|
||||
{
|
||||
ll->first_block = ll->last_block = NULL;
|
||||
}
|
||||
|
||||
local void free_linkedlist(ll)
|
||||
linkedlist_data* ll;
|
||||
local void free_linkedlist(linkedlist_data* ll)
|
||||
{
|
||||
free_datablock(ll->first_block);
|
||||
ll->first_block = ll->last_block = NULL;
|
||||
}
|
||||
|
||||
|
||||
local int add_data_in_datablock(ll,buf,len)
|
||||
linkedlist_data* ll;
|
||||
const void* buf;
|
||||
uLong len;
|
||||
local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
|
||||
{
|
||||
linkedlist_datablock_internal* ldi;
|
||||
const unsigned char* from_copy;
|
||||
@ -263,11 +257,8 @@ local int add_data_in_datablock(ll,buf,len)
|
||||
|
||||
local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,
|
||||
voidpf filestream, uLong x, int nbByte));
|
||||
local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
|
||||
const zlib_filefunc_def* pzlib_filefunc_def;
|
||||
voidpf filestream;
|
||||
uLong x;
|
||||
int nbByte;
|
||||
local int ziplocal_putValue (const zlib_filefunc_def* pzlib_filefunc_def,
|
||||
voidpf filestream, uLong x, int nbByte)
|
||||
{
|
||||
unsigned char buf[4];
|
||||
int n;
|
||||
@ -291,10 +282,7 @@ local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
|
||||
}
|
||||
|
||||
local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));
|
||||
local void ziplocal_putValue_inmemory (dest, x, nbByte)
|
||||
void* dest;
|
||||
uLong x;
|
||||
int nbByte;
|
||||
local void ziplocal_putValue_inmemory (void* dest, uLong x, int nbByte)
|
||||
{
|
||||
unsigned char* buf=(unsigned char*)dest;
|
||||
int n;
|
||||
@ -315,9 +303,7 @@ local void ziplocal_putValue_inmemory (dest, x, nbByte)
|
||||
/****************************************************************************/
|
||||
|
||||
|
||||
local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)
|
||||
const tm_zip* ptm;
|
||||
uLong dosDate;
|
||||
local uLong ziplocal_TmzDateToDosDate(const tm_zip* ptm, uLong dosDate)
|
||||
{
|
||||
uLong year = (uLong)ptm->tm_year;
|
||||
if (year>1980)
|
||||
@ -337,10 +323,8 @@ local int ziplocal_getByte OF((
|
||||
voidpf filestream,
|
||||
int *pi));
|
||||
|
||||
local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi)
|
||||
const zlib_filefunc_def* pzlib_filefunc_def;
|
||||
voidpf filestream;
|
||||
int *pi;
|
||||
local int ziplocal_getByte(const zlib_filefunc_def* pzlib_filefunc_def,
|
||||
voidpf filestream, int *pi)
|
||||
{
|
||||
unsigned char c;
|
||||
int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
|
||||
@ -367,10 +351,7 @@ local int ziplocal_getShort OF((
|
||||
voidpf filestream,
|
||||
uLong *pX));
|
||||
|
||||
local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX)
|
||||
const zlib_filefunc_def* pzlib_filefunc_def;
|
||||
voidpf filestream;
|
||||
uLong *pX;
|
||||
local int ziplocal_getShort ( const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream, uLong * pX)
|
||||
{
|
||||
uLong x ;
|
||||
int i;
|
||||
@ -395,10 +376,8 @@ local int ziplocal_getLong OF((
|
||||
voidpf filestream,
|
||||
uLong *pX));
|
||||
|
||||
local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX)
|
||||
const zlib_filefunc_def* pzlib_filefunc_def;
|
||||
voidpf filestream;
|
||||
uLong *pX;
|
||||
local int ziplocal_getLong (const zlib_filefunc_def* pzlib_filefunc_def,
|
||||
voidpf filestream, uLong * pX)
|
||||
{
|
||||
uLong x ;
|
||||
int i;
|
||||
@ -437,9 +416,8 @@ local uLong ziplocal_SearchCentralDir OF((
|
||||
const zlib_filefunc_def* pzlib_filefunc_def,
|
||||
voidpf filestream));
|
||||
|
||||
local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)
|
||||
const zlib_filefunc_def* pzlib_filefunc_def;
|
||||
voidpf filestream;
|
||||
local uLong ziplocal_SearchCentralDir(const zlib_filefunc_def* pzlib_filefunc_def,
|
||||
voidpf filestream)
|
||||
{
|
||||
unsigned char* buf;
|
||||
uLong uSizeFile;
|
||||
@ -496,11 +474,8 @@ local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)
|
||||
#endif /* !NO_ADDFILEINEXISTINGZIP*/
|
||||
|
||||
/************************************************************/
|
||||
extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc_def)
|
||||
const char *pathname;
|
||||
int append;
|
||||
zipcharpc* globalcomment;
|
||||
zlib_filefunc_def* pzlib_filefunc_def;
|
||||
extern zipFile ZEXPORT zipOpen2 (const char * pathname, int append,
|
||||
zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc_def)
|
||||
{
|
||||
zip_internal ziinit;
|
||||
zip_internal* zi;
|
||||
@ -615,7 +590,7 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc
|
||||
|
||||
if (size_comment>0)
|
||||
{
|
||||
ziinit.globalcomment = ALLOC(size_comment+1);
|
||||
ziinit.globalcomment = (char*)ALLOC(size_comment+1);
|
||||
if (ziinit.globalcomment)
|
||||
{
|
||||
size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment);
|
||||
@ -680,35 +655,28 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc
|
||||
}
|
||||
}
|
||||
|
||||
extern zipFile ZEXPORT zipOpen (pathname, append)
|
||||
const char *pathname;
|
||||
int append;
|
||||
extern zipFile ZEXPORT zipOpen (const char * pathname, int append)
|
||||
{
|
||||
return zipOpen2(pathname,append,NULL,NULL);
|
||||
}
|
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
|
||||
extrafield_local, size_extrafield_local,
|
||||
extrafield_global, size_extrafield_global,
|
||||
comment, method, level, raw,
|
||||
windowBits, memLevel, strategy,
|
||||
password, crcForCrypting)
|
||||
zipFile file;
|
||||
const char* filename;
|
||||
const zip_fileinfo* zipfi;
|
||||
const void* extrafield_local;
|
||||
uInt size_extrafield_local;
|
||||
const void* extrafield_global;
|
||||
uInt size_extrafield_global;
|
||||
const char* comment;
|
||||
int method;
|
||||
int level;
|
||||
int raw;
|
||||
int windowBits;
|
||||
int memLevel;
|
||||
int strategy;
|
||||
const char* password;
|
||||
uLong crcForCrypting;
|
||||
extern int ZEXPORT zipOpenNewFileInZip3 (
|
||||
zipFile file,
|
||||
const char* filename,
|
||||
const zip_fileinfo* zipfi,
|
||||
const void* extrafield_local,
|
||||
uInt size_extrafield_local,
|
||||
const void* extrafield_global,
|
||||
uInt size_extrafield_global,
|
||||
const char* comment,
|
||||
int method,
|
||||
int level,
|
||||
int raw,
|
||||
int windowBits,
|
||||
int memLevel,
|
||||
int strategy,
|
||||
const char* password,
|
||||
uLong crcForCrypting)
|
||||
{
|
||||
zip_internal* zi;
|
||||
uInt size_filename;
|
||||
@ -896,21 +864,18 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
|
||||
return err;
|
||||
}
|
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,
|
||||
extrafield_local, size_extrafield_local,
|
||||
extrafield_global, size_extrafield_global,
|
||||
comment, method, level, raw)
|
||||
zipFile file;
|
||||
const char* filename;
|
||||
const zip_fileinfo* zipfi;
|
||||
const void* extrafield_local;
|
||||
uInt size_extrafield_local;
|
||||
const void* extrafield_global;
|
||||
uInt size_extrafield_global;
|
||||
const char* comment;
|
||||
int method;
|
||||
int level;
|
||||
int raw;
|
||||
extern int ZEXPORT zipOpenNewFileInZip2(
|
||||
zipFile file,
|
||||
const char* filename,
|
||||
const zip_fileinfo* zipfi,
|
||||
const void* extrafield_local,
|
||||
uInt size_extrafield_local,
|
||||
const void* extrafield_global,
|
||||
uInt size_extrafield_global,
|
||||
const char* comment,
|
||||
int method,
|
||||
int level,
|
||||
int raw)
|
||||
{
|
||||
return zipOpenNewFileInZip3 (file, filename, zipfi,
|
||||
extrafield_local, size_extrafield_local,
|
||||
@ -920,20 +885,17 @@ extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,
|
||||
NULL, 0);
|
||||
}
|
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,
|
||||
extrafield_local, size_extrafield_local,
|
||||
extrafield_global, size_extrafield_global,
|
||||
comment, method, level)
|
||||
zipFile file;
|
||||
const char* filename;
|
||||
const zip_fileinfo* zipfi;
|
||||
const void* extrafield_local;
|
||||
uInt size_extrafield_local;
|
||||
const void* extrafield_global;
|
||||
uInt size_extrafield_global;
|
||||
const char* comment;
|
||||
int method;
|
||||
int level;
|
||||
extern int ZEXPORT zipOpenNewFileInZip (
|
||||
zipFile file,
|
||||
const char* filename,
|
||||
const zip_fileinfo* zipfi,
|
||||
const void* extrafield_local,
|
||||
uInt size_extrafield_local,
|
||||
const void* extrafield_global,
|
||||
uInt size_extrafield_global,
|
||||
const char* comment,
|
||||
int method,
|
||||
int level)
|
||||
{
|
||||
return zipOpenNewFileInZip2 (file, filename, zipfi,
|
||||
extrafield_local, size_extrafield_local,
|
||||
@ -941,8 +903,8 @@ extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,
|
||||
comment, method, level, 0);
|
||||
}
|
||||
|
||||
local int zipFlushWriteBuffer(zi)
|
||||
zip_internal* zi;
|
||||
local int zipFlushWriteBuffer(
|
||||
zip_internal* zi)
|
||||
{
|
||||
int err=ZIP_OK;
|
||||
|
||||
@ -963,10 +925,10 @@ local int zipFlushWriteBuffer(zi)
|
||||
return err;
|
||||
}
|
||||
|
||||
extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
|
||||
zipFile file;
|
||||
const void* buf;
|
||||
unsigned len;
|
||||
extern int ZEXPORT zipWriteInFileInZip (
|
||||
zipFile file,
|
||||
const void* buf,
|
||||
unsigned len)
|
||||
{
|
||||
zip_internal* zi;
|
||||
int err=ZIP_OK;
|
||||
@ -978,9 +940,9 @@ extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
|
||||
if (zi->in_opened_file_inzip == 0)
|
||||
return ZIP_PARAMERROR;
|
||||
|
||||
zi->ci.stream.next_in = (void*)buf;
|
||||
zi->ci.stream.next_in = (Bytef*)buf;
|
||||
zi->ci.stream.avail_in = len;
|
||||
zi->ci.crc32 = crc32(zi->ci.crc32,buf,len);
|
||||
zi->ci.crc32 = crc32(zi->ci.crc32,(Bytef*)buf,len);
|
||||
|
||||
while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
|
||||
{
|
||||
@ -1028,10 +990,10 @@ extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
|
||||
return err;
|
||||
}
|
||||
|
||||
extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)
|
||||
zipFile file;
|
||||
uLong uncompressed_size;
|
||||
uLong crc32;
|
||||
extern int ZEXPORT zipCloseFileInZipRaw (
|
||||
zipFile file,
|
||||
uLong uncompressed_size,
|
||||
uLong crc32)
|
||||
{
|
||||
zip_internal* zi;
|
||||
uLong compressed_size;
|
||||
@ -1124,15 +1086,13 @@ extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)
|
||||
return err;
|
||||
}
|
||||
|
||||
extern int ZEXPORT zipCloseFileInZip (file)
|
||||
zipFile file;
|
||||
extern int ZEXPORT zipCloseFileInZip (zipFile file)
|
||||
{
|
||||
return zipCloseFileInZipRaw (file,0,0);
|
||||
}
|
||||
|
||||
extern int ZEXPORT zipClose (file, global_comment)
|
||||
zipFile file;
|
||||
const char* global_comment;
|
||||
extern int ZEXPORT zipClose (zipFile file,
|
||||
const char* global_comment)
|
||||
{
|
||||
zip_internal* zi;
|
||||
int err = 0;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user