anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-30 05:12:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nuke compiler warnings in minizip

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23447 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2008-03-04 14:40:17 +00:00
parent da652941d5
commit a84ae5899d
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/support/minizip/crypt.h
View File

@ -32,7 +32,7 @@
/*********************************************************************** /***********************************************************************
* Return the next byte in the pseudo-random sequence * Return the next byte in the pseudo-random sequence
*/ */
static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) static int decrypt_byte(unsigned long* pkeys, const unsigned long* /* pcrc_32_tab */)
{ {
unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an
* unpredictable manner on 16-bit systems; not a problem * unpredictable manner on 16-bit systems; not a problem

14
src/support/minizip/ioapi.c
View File

@ -65,7 +65,7 @@ int ZCALLBACK ferror_file_func OF((
voidpf stream)); voidpf stream));
voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode) voidpf ZCALLBACK fopen_file_func (voidpf /* opaque */, const char* filename, int mode)
{ {
FILE* file = NULL; FILE* file = NULL;
const char* mode_fopen = NULL; const char* mode_fopen = NULL;
@ -84,7 +84,7 @@ voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
} }
uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size) uLong ZCALLBACK fread_file_func (voidpf /* opaque */, voidpf stream, void* buf, uLong size)
{ {
uLong ret; uLong ret;
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream); ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
@ -92,21 +92,21 @@ uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong
} }
uLong ZCALLBACK fwrite_file_func (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; uLong ret;
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream); ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
return ret; return ret;
} }
long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream) long ZCALLBACK ftell_file_func (voidpf /* opaque */, voidpf stream)
{ {
long ret; long ret;
ret = ftell((FILE *)stream); ret = ftell((FILE *)stream);
return ret; return ret;
} }
long ZCALLBACK fseek_file_func (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; int fseek_origin=0;
long ret; long ret;
@ -128,14 +128,14 @@ long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int
return ret; return ret;
} }
int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream) int ZCALLBACK fclose_file_func (voidpf /* opaque */, voidpf stream)
{ {
int ret; int ret;
ret = fclose((FILE *)stream); ret = fclose((FILE *)stream);
return ret; return ret;
} }
int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream) int ZCALLBACK ferror_file_func (voidpf /* opaque */, voidpf stream)
{ {
int ret; int ret;
ret = ferror((FILE *)stream); ret = ferror((FILE *)stream);

5
src/support/minizip/zip.c
View File

@ -187,12 +187,13 @@ local void init_linkedlist(linkedlist_data* ll)
ll->first_block = ll->last_block = NULL; ll->first_block = ll->last_block = NULL;
} }
#if 0
local void free_linkedlist(linkedlist_data* ll) local void free_linkedlist(linkedlist_data* ll)
{ {
free_datablock(ll->first_block); free_datablock(ll->first_block);
ll->first_block = ll->last_block = NULL; ll->first_block = ll->last_block = NULL;
} }
#endif
local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len) local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
{ {
@ -303,7 +304,7 @@ local void ziplocal_putValue_inmemory (void* dest, uLong x, int nbByte)
/****************************************************************************/ /****************************************************************************/
local uLong ziplocal_TmzDateToDosDate(const tm_zip* ptm, uLong dosDate) local uLong ziplocal_TmzDateToDosDate(const tm_zip* ptm, uLong /* dosDate */)
{ {
uLong year = (uLong)ptm->tm_year; uLong year = (uLong)ptm->tm_year;
if (year>1980) if (year>1980)

4
src/support/minizip/zipunzip.cpp
View File

@ -272,7 +272,7 @@ bool zipFiles(string const & zipfile, vector<pair<string, string> > const & file
filename : the filename of the file where date/time must be modified filename : the filename of the file where date/time must be modified
dosdate : the new date at the MSDos format (4 bytes) dosdate : the new date at the MSDos format (4 bytes)
tmu_date : the SAME new date at the tm_unz format */ tmu_date : the SAME new date at the tm_unz format */
void change_file_date(const char * filename, uLong dosdate, tm_unz tmu_date) void change_file_date(const char * filename, uLong /* dosdate */, tm_unz tmu_date)
{ {
#ifdef WIN32 #ifdef WIN32
HANDLE hFile; HANDLE hFile;
@ -310,7 +310,7 @@ void change_file_date(const char * filename, uLong dosdate, tm_unz tmu_date)
int do_extract_currentfile(unzFile uf, int do_extract_currentfile(unzFile uf,
const int * popt_extract_without_path, const int * popt_extract_without_path,
int * popt_overwrite, int * /* popt_overwrite */,
const char * password, const char * password,
const char * dirname) const char * dirname)
{ {