Attachment #286923 for bug #383349

Lines 6-12 Link Here

(-)libsrc/zlib/adler32.c (-1 / +1 lines)
6	/* @(#) $Id: adler32.c,v 1.2 2007/03/14 12:54:14 source Exp $ */	6	/* @(#) $Id: adler32.c,v 1.2 2007/03/14 12:54:14 source Exp $ */
7		7
8	#define ZLIB_INTERNAL	8	#define ZLIB_INTERNAL
9	#include "zlib.h"	9	#include <zlib.h>
10		10
11	#define BASE 65521UL /* largest prime smaller than 65536 */	11	#define BASE 65521UL /* largest prime smaller than 65536 */
12	#define NMAX 5552	12	#define NMAX 5552

Lines 6-12 Link Here

(-)libsrc/zlib/compress.c (-1 / +1 lines)
6	/* @(#) $Id: compress.c,v 1.2 2007/03/14 12:54:14 source Exp $ */	6	/* @(#) $Id: compress.c,v 1.2 2007/03/14 12:54:14 source Exp $ */
7		7
8	#define ZLIB_INTERNAL	8	#define ZLIB_INTERNAL
9	#include "zlib.h"	9	#include <zlib.h>
10		10
11	/* ===========================================================================	11	/* ===========================================================================
12	Compresses the source buffer into the destination buffer. The level	12	Compresses the source buffer into the destination buffer. The level

Lines 3-9 Link Here

(-)libsrc/zlib/contrib/iostream/zfstream.h (-1 / +1 lines)
3	#define zfstream_h	3	#define zfstream_h
4		4
5	#include <fstream.h>	5	#include <fstream.h>
6	#include "zlib.h"	6	#include <zlib.h>
7		7
8	class gzfilebuf : public streambuf {	8	class gzfilebuf : public streambuf {
9		9

Lines 27-33 Link Here

(-)libsrc/zlib/contrib/iostream2/zstream.h (-1 / +1 lines)
27	#include <strstream.h>	27	#include <strstream.h>
28	#include <string.h>	28	#include <string.h>
29	#include <stdio.h>	29	#include <stdio.h>
30	#include "zlib.h"	30	#include <zlib.h>
31		31
32	#if defined(_WIN32)	32	#if defined(_WIN32)
33	# include <fcntl.h>	33	# include <fcntl.h>

Lines 12-18 Link Here

(-)libsrc/zlib/contrib/iostream3/zfstream.h (-1 / +1 lines)
12		12
13	#include <istream> // not iostream, since we don't need cin/cout	13	#include <istream> // not iostream, since we don't need cin/cout
14	#include <ostream>	14	#include <ostream>
15	#include "zlib.h"	15	#include <zlib.h>
16		16
17	/*****************************************************************************/	17	/*****************************************************************************/
18		18




#include <stdlib.h>
#include <string.h>

#include <zlib.h>
#include "ioapi.h"



#define SEEK_SET    0
#endif

voidpf ZCALLBACK fopen_file_func _Z_OF((
   voidpf opaque,
   const char* filename,
   int mode));

uLong ZCALLBACK fread_file_func _Z_OF((
   voidpf opaque,
   voidpf stream,
   void* buf,
   uLong size));

uLong ZCALLBACK fwrite_file_func _Z_OF((
   voidpf opaque,
   voidpf stream,
   const void* buf,
   uLong size));

long ZCALLBACK ftell_file_func _Z_OF((
   voidpf opaque,
   voidpf stream));

long ZCALLBACK fseek_file_func _Z_OF((
   voidpf opaque,
   voidpf stream,
   uLong offset,
   int origin));

int ZCALLBACK fclose_file_func _Z_OF((
   voidpf opaque,
   voidpf stream));

int ZCALLBACK ferror_file_func _Z_OF((
   voidpf opaque,
   voidpf stream));





extern "C" {
#endif

typedef voidpf (ZCALLBACK *open_file_func) _Z_OF((voidpf opaque, const char* filename, int mode));
typedef uLong  (ZCALLBACK *read_file_func) _Z_OF((voidpf opaque, voidpf stream, void* buf, uLong size));
typedef uLong  (ZCALLBACK *write_file_func) _Z_OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
typedef long   (ZCALLBACK *tell_file_func) _Z_OF((voidpf opaque, voidpf stream));
typedef long   (ZCALLBACK *seek_file_func) _Z_OF((voidpf opaque, voidpf stream, uLong offset, int origin));
typedef int    (ZCALLBACK *close_file_func) _Z_OF((voidpf opaque, voidpf stream));
typedef int    (ZCALLBACK *testerror_file_func) _Z_OF((voidpf opaque, voidpf stream));

typedef struct zlib_filefunc_def_s
{




void fill_fopen_filefunc _Z_OF((zlib_filefunc_def* pzlib_filefunc_def));

#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))





#include <stdlib.h>

#include <zlib.h>
#include "ioapi.h"
#include "iowin32.h"


#define INVALID_SET_FILE_POINTER ((DWORD)-1)
#endif

voidpf ZCALLBACK win32_open_file_func _Z_OF((
   voidpf opaque,
   const char* filename,
   int mode));

uLong ZCALLBACK win32_read_file_func _Z_OF((
   voidpf opaque,
   voidpf stream,
   void* buf,
   uLong size));

uLong ZCALLBACK win32_write_file_func _Z_OF((
   voidpf opaque,
   voidpf stream,
   const void* buf,
   uLong size));

long ZCALLBACK win32_tell_file_func _Z_OF((
   voidpf opaque,
   voidpf stream));

long ZCALLBACK win32_seek_file_func _Z_OF((
   voidpf opaque,
   voidpf stream,
   uLong offset,
   int origin));

int ZCALLBACK win32_close_file_func _Z_OF((
   voidpf opaque,
   voidpf stream));

int ZCALLBACK win32_error_file_func _Z_OF((
   voidpf opaque,
   voidpf stream));


Lines 14-20 Link Here

(-)libsrc/zlib/contrib/minizip/iowin32.h (-1 / +1 lines)
14	extern "C" {	14	extern "C" {
15	#endif	15	#endif
16		16
17	void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));	17	void fill_win32_filefunc _Z_OF((zlib_filefunc_def* pzlib_filefunc_def));
18		18
19	#ifdef __cplusplus	19	#ifdef __cplusplus
20	}	20	}

Lines 8-14 Link Here

(-)libsrc/zlib/contrib/minizip/mztools.c (-1 / +1 lines)
8	#include <stdio.h>	8	#include <stdio.h>
9	#include <stdlib.h>	9	#include <stdlib.h>
10	#include <string.h>	10	#include <string.h>
11	#include "zlib.h"	11	#include <zlib.h>
12	#include "unzip.h"	12	#include "unzip.h"
13		13
14	#define READ_8(adr) ((unsigned char)*(adr))	14	#define READ_8(adr) ((unsigned char)*(adr))

Lines 12-18 Link Here

(-)libsrc/zlib/contrib/minizip/mztools.h (-1 / +1 lines)
12	#endif	12	#endif
13		13
14	#ifndef _ZLIB_H	14	#ifndef _ZLIB_H
15	#include "zlib.h"	15	#include <zlib.h>
16	#endif	16	#endif
17		17
18	#include "unzip.h"	18	#include "unzip.h"




#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <zlib.h>
#include "unzip.h"

#ifdef STDC

*/


local int unzlocal_getByte _Z_OF((
    const zlib_filefunc_def* pzlib_filefunc_def,
    voidpf filestream,
    int *pi));

/* ===========================================================================
   Reads a long in LSB order from the given gz_stream. Sets
*/
local int unzlocal_getShort _Z_OF((
    const zlib_filefunc_def* pzlib_filefunc_def,
    voidpf filestream,
    uLong *pX));

    return err;
}

local int unzlocal_getLong _Z_OF((
    const zlib_filefunc_def* pzlib_filefunc_def,
    voidpf filestream,
    uLong *pX));

  Locate the Central directory of a zipfile (at the end, just before
    the global comment)
*/
local uLong unzlocal_SearchCentralDir _Z_OF((
    const zlib_filefunc_def* pzlib_filefunc_def,
    voidpf filestream));


/*
  Get Info about the current file in the zipfile, with internal only info
*/
local int unzlocal_GetCurrentFileInfoInternal _Z_OF((unzFile file,
                                                  unz_file_info *pfile_info,
                                                  unz_file_info_internal
                                                  *pfile_info_internal,




#endif

#ifndef _ZLIB_H
#include <zlib.h>
#endif

#ifndef _ZLIBIOAPI_H

    tm_unz tmu_date;
} unz_file_info;

extern int ZEXPORT unzStringFileNameCompare _Z_OF((const char* fileName1,
                                                 const char* fileName2,
                                                 int iCaseSensitivity));
/*

*/


extern unzFile ZEXPORT unzOpen _Z_OF((const char *path));
/*
  Open a Zip file. path contain the full pathname (by example,
     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer

       of this unzip package.
*/

extern unzFile ZEXPORT unzOpen2 _Z_OF((const char *path,
                                    zlib_filefunc_def* pzlib_filefunc_def));
/*
   Open a Zip file, like unzOpen, but provide a set of file low level API
      for read/write the zip file (see ioapi.h)
*/

extern int ZEXPORT unzClose _Z_OF((unzFile file));
/*
  Close a ZipFile opened with unzipOpen.
  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
  return UNZ_OK if there is no problem. */

extern int ZEXPORT unzGetGlobalInfo _Z_OF((unzFile file,
                                        unz_global_info *pglobal_info));
/*
  Write info about the ZipFile in the *pglobal_info structure.

  return UNZ_OK if there is no problem. */


extern int ZEXPORT unzGetGlobalComment _Z_OF((unzFile file,
                                           char *szComment,
                                           uLong uSizeBuf));
/*

/***************************************************************************/
/* Unzip package allow you browse the directory of the zipfile */

extern int ZEXPORT unzGoToFirstFile _Z_OF((unzFile file));
/*
  Set the current file of the zipfile to the first file.
  return UNZ_OK if there is no problem
*/

extern int ZEXPORT unzGoToNextFile _Z_OF((unzFile file));
/*
  Set the current file of the zipfile to the next 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 unzLocateFile _Z_OF((unzFile file,
                     const char *szFileName,
                     int iCaseSensitivity));
/*


/* ****************************************** */

extern int ZEXPORT unzGetCurrentFileInfo _Z_OF((unzFile file,
                         unz_file_info *pfile_info,
                         char *szFileName,
                         uLong fileNameBufferSize,

   from it, and close it (you can close it before reading all the file)
   */

extern int ZEXPORT unzOpenCurrentFile _Z_OF((unzFile file));
/*
  Open for reading data the current file in the zipfile.
  If there is no error, the return value is UNZ_OK.
*/

extern int ZEXPORT unzOpenCurrentFilePassword _Z_OF((unzFile file,
                                                  const char* password));
/*
  Open for reading data the current file in the zipfile.

  If there is no error, the return value is UNZ_OK.
*/

extern int ZEXPORT unzOpenCurrentFile2 _Z_OF((unzFile file,
                                           int* method,
                                           int* level,
                                           int raw));

         but you CANNOT set method parameter as NULL
*/

extern int ZEXPORT unzOpenCurrentFile3 _Z_OF((unzFile file,
                                           int* method,
                                           int* level,
                                           int raw,

*/


extern int ZEXPORT unzCloseCurrentFile _Z_OF((unzFile file));
/*
  Close the file in zip opened with unzOpenCurrentFile
  Return UNZ_CRCERROR if all the file was read but the CRC is not good
*/

extern int ZEXPORT unzReadCurrentFile _Z_OF((unzFile file,
                      voidp buf,
                      unsigned len));
/*

    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
*/

extern z_off_t ZEXPORT unztell _Z_OF((unzFile file));
/*
  Give the current position in uncompressed data
*/

extern int ZEXPORT unzeof _Z_OF((unzFile file));
/*
  return 1 if the end of file was reached, 0 elsewhere
*/

extern int ZEXPORT unzGetLocalExtrafield _Z_OF((unzFile file,
                                             voidp buf,
                                             unsigned len));
/*




#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <zlib.h>
#include "zip.h"

#ifdef STDC

   nbByte == 1, 2 or 4 (byte, short or long)
*/

local int ziplocal_putValue _Z_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;

        return ZIP_OK;
}

local void ziplocal_putValue_inmemory _Z_OF((void* dest, uLong x, int nbByte));
local void ziplocal_putValue_inmemory (dest, x, nbByte)
    void* dest;
    uLong x;


/****************************************************************************/

local int ziplocal_getByte _Z_OF((
    const zlib_filefunc_def* pzlib_filefunc_def,
    voidpf filestream,
    int *pi));

/* ===========================================================================
   Reads a long in LSB order from the given gz_stream. Sets
*/
local int ziplocal_getShort _Z_OF((
    const zlib_filefunc_def* pzlib_filefunc_def,
    voidpf filestream,
    uLong *pX));

    return err;
}

local int ziplocal_getLong _Z_OF((
    const zlib_filefunc_def* pzlib_filefunc_def,
    voidpf filestream,
    uLong *pX));

  Locate the Central directory of a zipfile (at the end, just before
    the global comment)
*/
local uLong ziplocal_SearchCentralDir _Z_OF((
    const zlib_filefunc_def* pzlib_filefunc_def,
    voidpf filestream));





#endif

#ifndef _ZLIB_H
#include <zlib.h>
#endif

#ifndef _ZLIBIOAPI_H

#define APPEND_STATUS_CREATEAFTER   (1)
#define APPEND_STATUS_ADDINZIP      (2)

extern zipFile ZEXPORT zipOpen _Z_OF((const char *pathname, int append));
/*
  Create a zipfile.
     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on

   Of couse, you can use RAW reading and writing to copy the file you did not want delte
*/

extern zipFile ZEXPORT zipOpen2 _Z_OF((const char *pathname,
                                   int append,
                                   zipcharpc* globalcomment,
                                   zlib_filefunc_def* pzlib_filefunc_def));

extern int ZEXPORT zipOpenNewFileInZip _Z_OF((zipFile file,
                       const char* filename,
                       const zip_fileinfo* zipfi,
                       const void* extrafield_local,

*/


extern int ZEXPORT zipOpenNewFileInZip2 _Z_OF((zipFile file,
                                            const char* filename,
                                            const zip_fileinfo* zipfi,
                                            const void* extrafield_local,

  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
 */

extern int ZEXPORT zipOpenNewFileInZip3 _Z_OF((zipFile file,
                                            const char* filename,
                                            const zip_fileinfo* zipfi,
                                            const void* extrafield_local,

 */


extern int ZEXPORT zipWriteInFileInZip _Z_OF((zipFile file,
                       const void* buf,
                       unsigned len));
/*
  Write data in the zipfile
*/

extern int ZEXPORT zipCloseFileInZip _Z_OF((zipFile file));
/*
  Close the current file in the zipfile
*/

extern int ZEXPORT zipCloseFileInZipRaw _Z_OF((zipFile file,
                                            uLong uncompressed_size,
                                            uLong crc32));
/*

  uncompressed_size and crc32 are value for the uncompressed size
*/

extern int ZEXPORT zipClose _Z_OF((zipFile file,
                const char* global_comment));
/*
  Close the zipfile

Lines 2-8 Link Here

(-)libsrc/zlib/contrib/testzlib/testzlib.c (-1 / +1 lines)
2	#include <stdlib.h>	2	#include <stdlib.h>
3	#include <windows.h>	3	#include <windows.h>
4		4
5	#include "zlib.h"	5	#include <zlib.h>
6		6
7		7
8	void MyDoMinus64(LARGE_INTEGER *R,LARGE_INTEGER A,LARGE_INTEGER B)	8	void MyDoMinus64(LARGE_INTEGER *R,LARGE_INTEGER A,LARGE_INTEGER B)

Lines 12-18 Link Here

(-)libsrc/zlib/contrib/untgz/untgz.c (-1 / +1 lines)
12	#include <time.h>	12	#include <time.h>
13	#include <errno.h>	13	#include <errno.h>
14		14
15	#include "zlib.h"	15	#include <zlib.h>
16		16
17	#ifdef unix	17	#ifdef unix
18	# include <unistd.h>	18	# include <unistd.h>

Lines 16-22 Link Here

(-)libsrc/zlib/minigzip.c (-1 / +1 lines)
16	/* @(#) $Id: minigzip.c,v 1.2 2007/03/14 12:54:14 source Exp $ */	16	/* @(#) $Id: minigzip.c,v 1.2 2007/03/14 12:54:14 source Exp $ */
17		17
18	#include <stdio.h>	18	#include <stdio.h>
19	#include "zlib.h"	19	#include <zlib.h>
20		20
21	#ifdef STDC	21	#ifdef STDC
22	# include <string.h>	22	# include <string.h>

Lines 6-12 Link Here

(-)libsrc/zlib/uncompr.c (-1 / +1 lines)
6	/* @(#) $Id: uncompr.c,v 1.2 2007/03/14 12:54:14 source Exp $ */	6	/* @(#) $Id: uncompr.c,v 1.2 2007/03/14 12:54:14 source Exp $ */
7		7
8	#define ZLIB_INTERNAL	8	#define ZLIB_INTERNAL
9	#include "zlib.h"	9	#include <zlib.h>
10		10
11	/* ===========================================================================	11	/* ===========================================================================
12	Decompresses the source buffer into the destination buffer. sourceLen is	12	Decompresses the source buffer into the destination buffer. sourceLen is

Lines 14-20 Link Here

(-)libsrc/zlib/zutil.h (-1 / +1 lines)
14	#define ZUTIL_H	14	#define ZUTIL_H
15		15
16	#define ZLIB_INTERNAL	16	#define ZLIB_INTERNAL
17	#include "zlib.h"	17	#include <zlib.h>
18		18
19	#ifdef STDC	19	#ifdef STDC
20	# ifndef _WIN32_WCE	20	# ifndef _WIN32_WCE

Return to bug 383349

Lines 38-44 Link Here

(-)libsrc/zlib/contrib/minizip/unzip.c (-6 / +6 lines)
38	#include <stdio.h>	38	#include <stdio.h>
39	#include <stdlib.h>	39	#include <stdlib.h>
40	#include <string.h>	40	#include <string.h>
41	#include "zlib.h"	41	#include <zlib.h>
42	#include "unzip.h"	42	#include "unzip.h"
43		43
44	#ifdef STDC	44	#ifdef STDC
Lines 163-169 Link Here
163	*/	163	*/
164		164
165		165
166	local int unzlocal_getByte OF((	166	local int unzlocal_getByte _Z_OF((
167	const zlib_filefunc_def* pzlib_filefunc_def,	167	const zlib_filefunc_def* pzlib_filefunc_def,
168	voidpf filestream,	168	voidpf filestream,
169	int *pi));	169	int *pi));
Lines 193-199 Link Here
193	/* ===========================================================================	193	/* ===========================================================================
194	Reads a long in LSB order from the given gz_stream. Sets	194	Reads a long in LSB order from the given gz_stream. Sets
195	*/	195	*/
196	local int unzlocal_getShort OF((	196	local int unzlocal_getShort _Z_OF((
197	const zlib_filefunc_def* pzlib_filefunc_def,	197	const zlib_filefunc_def* pzlib_filefunc_def,
198	voidpf filestream,	198	voidpf filestream,
199	uLong *pX));	199	uLong *pX));
Lines 221-227 Link Here
221	return err;	221	return err;
222	}	222	}
223		223
224	local int unzlocal_getLong OF((	224	local int unzlocal_getLong _Z_OF((
225	const zlib_filefunc_def* pzlib_filefunc_def,	225	const zlib_filefunc_def* pzlib_filefunc_def,
226	voidpf filestream,	226	voidpf filestream,
227	uLong *pX));	227	uLong *pX));
Lines 324-330 Link Here
324	Locate the Central directory of a zipfile (at the end, just before	324	Locate the Central directory of a zipfile (at the end, just before
325	the global comment)	325	the global comment)
326	*/	326	*/
327	local uLong unzlocal_SearchCentralDir OF((	327	local uLong unzlocal_SearchCentralDir _Z_OF((
328	const zlib_filefunc_def* pzlib_filefunc_def,	328	const zlib_filefunc_def* pzlib_filefunc_def,
329	voidpf filestream));	329	voidpf filestream));
330		330
Lines 563-569 Link Here
563	/*	563	/*
564	Get Info about the current file in the zipfile, with internal only info	564	Get Info about the current file in the zipfile, with internal only info
565	*/	565	*/
566	local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,	566	local int unzlocal_GetCurrentFileInfoInternal _Z_OF((unzFile file,
567	unz_file_info *pfile_info,	567	unz_file_info *pfile_info,
568	unz_file_info_internal	568	unz_file_info_internal
569	*pfile_info_internal,	569	*pfile_info_internal,

Lines 50-56 Link Here

(-)libsrc/zlib/contrib/minizip/unzip.h (-20 / +20 lines)
50	#endif	50	#endif
51		51
52	#ifndef _ZLIB_H	52	#ifndef _ZLIB_H
53	#include "zlib.h"	53	#include <zlib.h>
54	#endif	54	#endif
55		55
56	#ifndef _ZLIBIOAPI_H	56	#ifndef _ZLIBIOAPI_H
Lines 119-125 Link Here
119	tm_unz tmu_date;	119	tm_unz tmu_date;
120	} unz_file_info;	120	} unz_file_info;
121		121
122	extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,	122	extern int ZEXPORT unzStringFileNameCompare _Z_OF((const char* fileName1,
123	const char* fileName2,	123	const char* fileName2,
124	int iCaseSensitivity));	124	int iCaseSensitivity));
125	/*	125	/*
Lines 132-138 Link Here
132	*/	132	*/
133		133
134		134
135	extern unzFile ZEXPORT unzOpen OF((const char *path));	135	extern unzFile ZEXPORT unzOpen _Z_OF((const char *path));
136	/*	136	/*
137	Open a Zip file. path contain the full pathname (by example,	137	Open a Zip file. path contain the full pathname (by example,
138	on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer	138	on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
Lines 143-163 Link Here
143	of this unzip package.	143	of this unzip package.
144	*/	144	*/
145		145
146	extern unzFile ZEXPORT unzOpen2 OF((const char *path,	146	extern unzFile ZEXPORT unzOpen2 _Z_OF((const char *path,
147	zlib_filefunc_def* pzlib_filefunc_def));	147	zlib_filefunc_def* pzlib_filefunc_def));
148	/*	148	/*
149	Open a Zip file, like unzOpen, but provide a set of file low level API	149	Open a Zip file, like unzOpen, but provide a set of file low level API
150	for read/write the zip file (see ioapi.h)	150	for read/write the zip file (see ioapi.h)
151	*/	151	*/
152		152
153	extern int ZEXPORT unzClose OF((unzFile file));	153	extern int ZEXPORT unzClose _Z_OF((unzFile file));
154	/*	154	/*
155	Close a ZipFile opened with unzipOpen.	155	Close a ZipFile opened with unzipOpen.
156	If there is files inside the .Zip opened with unzOpenCurrentFile (see later),	156	If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
157	these files MUST be closed with unzipCloseCurrentFile before call unzipClose.	157	these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
158	return UNZ_OK if there is no problem. */	158	return UNZ_OK if there is no problem. */
159		159
160	extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,	160	extern int ZEXPORT unzGetGlobalInfo _Z_OF((unzFile file,
161	unz_global_info *pglobal_info));	161	unz_global_info *pglobal_info));
162	/*	162	/*
163	Write info about the ZipFile in the *pglobal_info structure.	163	Write info about the ZipFile in the *pglobal_info structure.
Lines 165-171 Link Here
165	return UNZ_OK if there is no problem. */	165	return UNZ_OK if there is no problem. */
166		166
167		167
168	extern int ZEXPORT unzGetGlobalComment OF((unzFile file,	168	extern int ZEXPORT unzGetGlobalComment _Z_OF((unzFile file,
169	char *szComment,	169	char *szComment,
170	uLong uSizeBuf));	170	uLong uSizeBuf));
171	/*	171	/*
Lines 178-197 Link Here
178	/***************************************************************************/	178	/***************************************************************************/
179	/* Unzip package allow you browse the directory of the zipfile */	179	/* Unzip package allow you browse the directory of the zipfile */
180		180
181	extern int ZEXPORT unzGoToFirstFile OF((unzFile file));	181	extern int ZEXPORT unzGoToFirstFile _Z_OF((unzFile file));
182	/*	182	/*
183	Set the current file of the zipfile to the first file.	183	Set the current file of the zipfile to the first file.
184	return UNZ_OK if there is no problem	184	return UNZ_OK if there is no problem
185	*/	185	*/
186		186
187	extern int ZEXPORT unzGoToNextFile OF((unzFile file));	187	extern int ZEXPORT unzGoToNextFile _Z_OF((unzFile file));
188	/*	188	/*
189	Set the current file of the zipfile to the next file.	189	Set the current file of the zipfile to the next file.
190	return UNZ_OK if there is no problem	190	return UNZ_OK if there is no problem
191	return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.	191	return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
192	*/	192	*/
193		193
194	extern int ZEXPORT unzLocateFile OF((unzFile file,	194	extern int ZEXPORT unzLocateFile _Z_OF((unzFile file,
195	const char *szFileName,	195	const char *szFileName,
196	int iCaseSensitivity));	196	int iCaseSensitivity));
197	/*	197	/*
Lines 223-229 Link Here
223		223
224	/* ****************************************** */	224	/* ****************************************** */
225		225
226	extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,	226	extern int ZEXPORT unzGetCurrentFileInfo _Z_OF((unzFile file,
227	unz_file_info *pfile_info,	227	unz_file_info *pfile_info,
228	char *szFileName,	228	char *szFileName,
229	uLong fileNameBufferSize,	229	uLong fileNameBufferSize,
Lines 249-261 Link Here
249	from it, and close it (you can close it before reading all the file)	249	from it, and close it (you can close it before reading all the file)
250	*/	250	*/
251		251
252	extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));	252	extern int ZEXPORT unzOpenCurrentFile _Z_OF((unzFile file));
253	/*	253	/*
254	Open for reading data the current file in the zipfile.	254	Open for reading data the current file in the zipfile.
255	If there is no error, the return value is UNZ_OK.	255	If there is no error, the return value is UNZ_OK.
256	*/	256	*/
257		257
258	extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,	258	extern int ZEXPORT unzOpenCurrentFilePassword _Z_OF((unzFile file,
259	const char* password));	259	const char* password));
260	/*	260	/*
261	Open for reading data the current file in the zipfile.	261	Open for reading data the current file in the zipfile.
Lines 263-269 Link Here
263	If there is no error, the return value is UNZ_OK.	263	If there is no error, the return value is UNZ_OK.
264	*/	264	*/
265		265
266	extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,	266	extern int ZEXPORT unzOpenCurrentFile2 _Z_OF((unzFile file,
267	int* method,	267	int* method,
268	int* level,	268	int* level,
269	int raw));	269	int raw));
Lines 276-282 Link Here
276	but you CANNOT set method parameter as NULL	276	but you CANNOT set method parameter as NULL
277	*/	277	*/
278		278
279	extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,	279	extern int ZEXPORT unzOpenCurrentFile3 _Z_OF((unzFile file,
280	int* method,	280	int* method,
281	int* level,	281	int* level,
282	int raw,	282	int raw,
Lines 291-303 Link Here
291	*/	291	*/
292		292
293		293
294	extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));	294	extern int ZEXPORT unzCloseCurrentFile _Z_OF((unzFile file));
295	/*	295	/*
296	Close the file in zip opened with unzOpenCurrentFile	296	Close the file in zip opened with unzOpenCurrentFile
297	Return UNZ_CRCERROR if all the file was read but the CRC is not good	297	Return UNZ_CRCERROR if all the file was read but the CRC is not good
298	*/	298	*/
299		299
300	extern int ZEXPORT unzReadCurrentFile OF((unzFile file,	300	extern int ZEXPORT unzReadCurrentFile _Z_OF((unzFile file,
301	voidp buf,	301	voidp buf,
302	unsigned len));	302	unsigned len));
303	/*	303	/*
Lines 311-327 Link Here
311	(UNZ_ERRNO for IO error, or zLib error for uncompress error)	311	(UNZ_ERRNO for IO error, or zLib error for uncompress error)
312	*/	312	*/
313		313
314	extern z_off_t ZEXPORT unztell OF((unzFile file));	314	extern z_off_t ZEXPORT unztell _Z_OF((unzFile file));
315	/*	315	/*
316	Give the current position in uncompressed data	316	Give the current position in uncompressed data
317	*/	317	*/
318		318
319	extern int ZEXPORT unzeof OF((unzFile file));	319	extern int ZEXPORT unzeof _Z_OF((unzFile file));
320	/*	320	/*
321	return 1 if the end of file was reached, 0 elsewhere	321	return 1 if the end of file was reached, 0 elsewhere
322	*/	322	*/
323		323
324	extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,	324	extern int ZEXPORT unzGetLocalExtrafield _Z_OF((unzFile file,
325	voidp buf,	325	voidp buf,
326	unsigned len));	326	unsigned len));
327	/*	327	/*

Lines 14-20 Link Here

(-)libsrc/zlib/contrib/minizip/zip.c (-7 / +7 lines)
14	#include <stdlib.h>	14	#include <stdlib.h>
15	#include <string.h>	15	#include <string.h>
16	#include <time.h>	16	#include <time.h>
17	#include "zlib.h"	17	#include <zlib.h>
18	#include "zip.h"	18	#include "zip.h"
19		19
20	#ifdef STDC	20	#ifdef STDC
Lines 261-267 Link Here
261	nbByte == 1, 2 or 4 (byte, short or long)	261	nbByte == 1, 2 or 4 (byte, short or long)
262	*/	262	*/
263		263
264	local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,	264	local int ziplocal_putValue _Z_OF((const zlib_filefunc_def* pzlib_filefunc_def,
265	voidpf filestream, uLong x, int nbByte));	265	voidpf filestream, uLong x, int nbByte));
266	local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)	266	local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
267	const zlib_filefunc_def* pzlib_filefunc_def;	267	const zlib_filefunc_def* pzlib_filefunc_def;
Lines 290-296 Link Here
290	return ZIP_OK;	290	return ZIP_OK;
291	}	291	}
292		292
293	local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));	293	local void ziplocal_putValue_inmemory _Z_OF((void* dest, uLong x, int nbByte));
294	local void ziplocal_putValue_inmemory (dest, x, nbByte)	294	local void ziplocal_putValue_inmemory (dest, x, nbByte)
295	void* dest;	295	void* dest;
296	uLong x;	296	uLong x;
Lines 332-338 Link Here
332		332
333	/****************************************************************************/	333	/****************************************************************************/
334		334
335	local int ziplocal_getByte OF((	335	local int ziplocal_getByte _Z_OF((
336	const zlib_filefunc_def* pzlib_filefunc_def,	336	const zlib_filefunc_def* pzlib_filefunc_def,
337	voidpf filestream,	337	voidpf filestream,
338	int *pi));	338	int *pi));
Lines 362-368 Link Here
362	/* ===========================================================================	362	/* ===========================================================================
363	Reads a long in LSB order from the given gz_stream. Sets	363	Reads a long in LSB order from the given gz_stream. Sets
364	*/	364	*/
365	local int ziplocal_getShort OF((	365	local int ziplocal_getShort _Z_OF((
366	const zlib_filefunc_def* pzlib_filefunc_def,	366	const zlib_filefunc_def* pzlib_filefunc_def,
367	voidpf filestream,	367	voidpf filestream,
368	uLong *pX));	368	uLong *pX));
Lines 390-396 Link Here
390	return err;	390	return err;
391	}	391	}
392		392
393	local int ziplocal_getLong OF((	393	local int ziplocal_getLong _Z_OF((
394	const zlib_filefunc_def* pzlib_filefunc_def,	394	const zlib_filefunc_def* pzlib_filefunc_def,
395	voidpf filestream,	395	voidpf filestream,
396	uLong *pX));	396	uLong *pX));
Lines 433-439 Link Here
433	Locate the Central directory of a zipfile (at the end, just before	433	Locate the Central directory of a zipfile (at the end, just before
434	the global comment)	434	the global comment)
435	*/	435	*/
436	local uLong ziplocal_SearchCentralDir OF((	436	local uLong ziplocal_SearchCentralDir _Z_OF((
437	const zlib_filefunc_def* pzlib_filefunc_def,	437	const zlib_filefunc_def* pzlib_filefunc_def,
438	voidpf filestream));	438	voidpf filestream));
439		439

Lines 51-57 Link Here

(-)libsrc/zlib/contrib/minizip/zip.h (-10 / +10 lines)
51	#endif	51	#endif
52		52
53	#ifndef _ZLIB_H	53	#ifndef _ZLIB_H
54	#include "zlib.h"	54	#include <zlib.h>
55	#endif	55	#endif
56		56
57	#ifndef _ZLIBIOAPI_H	57	#ifndef _ZLIBIOAPI_H
Lines 111-117 Link Here
111	#define APPEND_STATUS_CREATEAFTER (1)	111	#define APPEND_STATUS_CREATEAFTER (1)
112	#define APPEND_STATUS_ADDINZIP (2)	112	#define APPEND_STATUS_ADDINZIP (2)
113		113
114	extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));	114	extern zipFile ZEXPORT zipOpen _Z_OF((const char *pathname, int append));
115	/*	115	/*
116	Create a zipfile.	116	Create a zipfile.
117	pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on	117	pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
Lines 131-142 Link Here
131	Of couse, you can use RAW reading and writing to copy the file you did not want delte	131	Of couse, you can use RAW reading and writing to copy the file you did not want delte
132	*/	132	*/
133		133
134	extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,	134	extern zipFile ZEXPORT zipOpen2 _Z_OF((const char *pathname,
135	int append,	135	int append,
136	zipcharpc* globalcomment,	136	zipcharpc* globalcomment,
137	zlib_filefunc_def* pzlib_filefunc_def));	137	zlib_filefunc_def* pzlib_filefunc_def));
138		138
139	extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,	139	extern int ZEXPORT zipOpenNewFileInZip _Z_OF((zipFile file,
140	const char* filename,	140	const char* filename,
141	const zip_fileinfo* zipfi,	141	const zip_fileinfo* zipfi,
142	const void* extrafield_local,	142	const void* extrafield_local,
Lines 160-166 Link Here
160	*/	160	*/
161		161
162		162
163	extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,	163	extern int ZEXPORT zipOpenNewFileInZip2 _Z_OF((zipFile file,
164	const char* filename,	164	const char* filename,
165	const zip_fileinfo* zipfi,	165	const zip_fileinfo* zipfi,
166	const void* extrafield_local,	166	const void* extrafield_local,
Lines 176-182 Link Here
176	Same than zipOpenNewFileInZip, except if raw=1, we write raw file	176	Same than zipOpenNewFileInZip, except if raw=1, we write raw file
177	*/	177	*/
178		178
179	extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,	179	extern int ZEXPORT zipOpenNewFileInZip3 _Z_OF((zipFile file,
180	const char* filename,	180	const char* filename,
181	const zip_fileinfo* zipfi,	181	const zip_fileinfo* zipfi,
182	const void* extrafield_local,	182	const void* extrafield_local,
Lines 201-219 Link Here
201	*/	201	*/
202		202
203		203
204	extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,	204	extern int ZEXPORT zipWriteInFileInZip _Z_OF((zipFile file,
205	const void* buf,	205	const void* buf,
206	unsigned len));	206	unsigned len));
207	/*	207	/*
208	Write data in the zipfile	208	Write data in the zipfile
209	*/	209	*/
210		210
211	extern int ZEXPORT zipCloseFileInZip OF((zipFile file));	211	extern int ZEXPORT zipCloseFileInZip _Z_OF((zipFile file));
212	/*	212	/*
213	Close the current file in the zipfile	213	Close the current file in the zipfile
214	*/	214	*/
215		215
216	extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,	216	extern int ZEXPORT zipCloseFileInZipRaw _Z_OF((zipFile file,
217	uLong uncompressed_size,	217	uLong uncompressed_size,
218	uLong crc32));	218	uLong crc32));
219	/*	219	/*
Lines 222-228 Link Here
222	uncompressed_size and crc32 are value for the uncompressed size	222	uncompressed_size and crc32 are value for the uncompressed size
223	*/	223	*/
224		224
225	extern int ZEXPORT zipClose OF((zipFile file,	225	extern int ZEXPORT zipClose _Z_OF((zipFile file,
226	const char* global_comment));	226	const char* global_comment));
227	/*	227	/*
228	Close the zipfile	228	Close the zipfile

Lines 10-16 Link Here

(-)libsrc/zlib/contrib/minizip/ioapi.c (-8 / +8 lines)
10	#include <stdlib.h>	10	#include <stdlib.h>
11	#include <string.h>	11	#include <string.h>
12		12
13	#include "zlib.h"	13	#include <zlib.h>
14	#include "ioapi.h"	14	#include "ioapi.h"
15		15
16		16
Lines 29-66 Link Here
29	#define SEEK_SET 0	29	#define SEEK_SET 0
30	#endif	30	#endif
31		31
32	voidpf ZCALLBACK fopen_file_func OF((	32	voidpf ZCALLBACK fopen_file_func _Z_OF((
33	voidpf opaque,	33	voidpf opaque,
34	const char* filename,	34	const char* filename,
35	int mode));	35	int mode));
36		36
37	uLong ZCALLBACK fread_file_func OF((	37	uLong ZCALLBACK fread_file_func _Z_OF((
38	voidpf opaque,	38	voidpf opaque,
39	voidpf stream,	39	voidpf stream,
40	void* buf,	40	void* buf,
41	uLong size));	41	uLong size));
42		42
43	uLong ZCALLBACK fwrite_file_func OF((	43	uLong ZCALLBACK fwrite_file_func _Z_OF((
44	voidpf opaque,	44	voidpf opaque,
45	voidpf stream,	45	voidpf stream,
46	const void* buf,	46	const void* buf,
47	uLong size));	47	uLong size));
48		48
49	long ZCALLBACK ftell_file_func OF((	49	long ZCALLBACK ftell_file_func _Z_OF((
50	voidpf opaque,	50	voidpf opaque,
51	voidpf stream));	51	voidpf stream));
52		52
53	long ZCALLBACK fseek_file_func OF((	53	long ZCALLBACK fseek_file_func _Z_OF((
54	voidpf opaque,	54	voidpf opaque,
55	voidpf stream,	55	voidpf stream,
56	uLong offset,	56	uLong offset,
57	int origin));	57	int origin));
58		58
59	int ZCALLBACK fclose_file_func OF((	59	int ZCALLBACK fclose_file_func _Z_OF((
60	voidpf opaque,	60	voidpf opaque,
61	voidpf stream));	61	voidpf stream));
62		62
63	int ZCALLBACK ferror_file_func OF((	63	int ZCALLBACK ferror_file_func _Z_OF((
64	voidpf opaque,	64	voidpf opaque,
65	voidpf stream));	65	voidpf stream));
66		66

Lines 35-47 Link Here

(-)libsrc/zlib/contrib/minizip/ioapi.h (-8 / +8 lines)
35	extern "C" {	35	extern "C" {
36	#endif	36	#endif
37		37
38	typedef voidpf (ZCALLBACK open_file_func) OF((voidpf opaque, const char filename, int mode));	38	typedef voidpf (ZCALLBACK open_file_func) _Z_OF((voidpf opaque, const char filename, int mode));
39	typedef uLong (ZCALLBACK read_file_func) OF((voidpf opaque, voidpf stream, void buf, uLong size));	39	typedef uLong (ZCALLBACK read_file_func) _Z_OF((voidpf opaque, voidpf stream, void buf, uLong size));
40	typedef uLong (ZCALLBACK write_file_func) OF((voidpf opaque, voidpf stream, const void buf, uLong size));	40	typedef uLong (ZCALLBACK write_file_func) _Z_OF((voidpf opaque, voidpf stream, const void buf, uLong size));
41	typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));	41	typedef long (ZCALLBACK *tell_file_func) _Z_OF((voidpf opaque, voidpf stream));
42	typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));	42	typedef long (ZCALLBACK *seek_file_func) _Z_OF((voidpf opaque, voidpf stream, uLong offset, int origin));
43	typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));	43	typedef int (ZCALLBACK *close_file_func) _Z_OF((voidpf opaque, voidpf stream));
44	typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));	44	typedef int (ZCALLBACK *testerror_file_func) _Z_OF((voidpf opaque, voidpf stream));
45		45
46	typedef struct zlib_filefunc_def_s	46	typedef struct zlib_filefunc_def_s
47	{	47	{
Lines 57-63 Link Here
57		57
58		58
59		59
60	void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));	60	void fill_fopen_filefunc _Z_OF((zlib_filefunc_def* pzlib_filefunc_def));
61		61
62	#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))	62	#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
63	#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))	63	#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))

Lines 9-15 Link Here

(-)libsrc/zlib/contrib/minizip/iowin32.c (-8 / +8 lines)
9		9
10	#include <stdlib.h>	10	#include <stdlib.h>
11		11
12	#include "zlib.h"	12	#include <zlib.h>
13	#include "ioapi.h"	13	#include "ioapi.h"
14	#include "iowin32.h"	14	#include "iowin32.h"
15		15
Lines 21-58 Link Here
21	#define INVALID_SET_FILE_POINTER ((DWORD)-1)	21	#define INVALID_SET_FILE_POINTER ((DWORD)-1)
22	#endif	22	#endif
23		23
24	voidpf ZCALLBACK win32_open_file_func OF((	24	voidpf ZCALLBACK win32_open_file_func _Z_OF((
25	voidpf opaque,	25	voidpf opaque,
26	const char* filename,	26	const char* filename,
27	int mode));	27	int mode));
28		28
29	uLong ZCALLBACK win32_read_file_func OF((	29	uLong ZCALLBACK win32_read_file_func _Z_OF((
30	voidpf opaque,	30	voidpf opaque,
31	voidpf stream,	31	voidpf stream,
32	void* buf,	32	void* buf,
33	uLong size));	33	uLong size));
34		34
35	uLong ZCALLBACK win32_write_file_func OF((	35	uLong ZCALLBACK win32_write_file_func _Z_OF((
36	voidpf opaque,	36	voidpf opaque,
37	voidpf stream,	37	voidpf stream,
38	const void* buf,	38	const void* buf,
39	uLong size));	39	uLong size));
40		40
41	long ZCALLBACK win32_tell_file_func OF((	41	long ZCALLBACK win32_tell_file_func _Z_OF((
42	voidpf opaque,	42	voidpf opaque,
43	voidpf stream));	43	voidpf stream));
44		44
45	long ZCALLBACK win32_seek_file_func OF((	45	long ZCALLBACK win32_seek_file_func _Z_OF((
46	voidpf opaque,	46	voidpf opaque,
47	voidpf stream,	47	voidpf stream,
48	uLong offset,	48	uLong offset,
49	int origin));	49	int origin));
50		50
51	int ZCALLBACK win32_close_file_func OF((	51	int ZCALLBACK win32_close_file_func _Z_OF((
52	voidpf opaque,	52	voidpf opaque,
53	voidpf stream));	53	voidpf stream));
54		54
55	int ZCALLBACK win32_error_file_func OF((	55	int ZCALLBACK win32_error_file_func _Z_OF((
56	voidpf opaque,	56	voidpf opaque,
57	voidpf stream));	57	voidpf stream));
58		58