Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

QuaZip: change the order of void-casts.

Browse source 
MSVC requires void-casting of unused variables to be done after variable
definitions. Change the order, no functional changes.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31171 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2011-12-07 20:13:18 +00:00
parent 16f48e8ebc
commit 6bc8916a58
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rbutil/rbutilqt/quazip/crypt.h
View file

@ -34,10 +34,10 @@
*/ */
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)
{ {
(void) pcrc_32_tab; /* avoid "unused parameter" warning */
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
* with any known compiler so far, though */ * with any known compiler so far, though */
(void) pcrc_32_tab; /* avoid "unused parameter" warning */
temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2; temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
return (int)(((temp * (temp ^ 1)) >> 8) & 0xff); return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);

16
rbutil/rbutilqt/quazip/ioapi.c
View file

@ -70,10 +70,10 @@ voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
const char* filename; const char* filename;
int mode; int mode;
{ {
(void) opaque; /* avoid "unused parameter" warning */
FILE* file = NULL; FILE* file = NULL;
const char* mode_fopen = NULL; const char* mode_fopen = NULL;
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) (void) opaque; /* avoid "unused parameter" warning */
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
mode_fopen = "rb"; mode_fopen = "rb";
else else
if (mode & ZLIB_FILEFUNC_MODE_EXISTING) if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
@ -94,8 +94,8 @@ uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
void* buf; void* buf;
uLong size; uLong size;
{ {
(void) opaque; /* avoid "unused parameter" warning */
uLong ret; uLong ret;
(void) opaque; /* avoid "unused parameter" warning */
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream); ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
return ret; return ret;
} }
@ -107,8 +107,8 @@ uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
const void* buf; const void* buf;
uLong size; uLong size;
{ {
(void) opaque; /* avoid "unused parameter" warning */
uLong ret; uLong ret;
(void) opaque; /* avoid "unused parameter" warning */
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream); ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
return ret; return ret;
} }
@ -117,8 +117,8 @@ long ZCALLBACK ftell_file_func (opaque, stream)
voidpf opaque; voidpf opaque;
voidpf stream; voidpf stream;
{ {
(void) opaque; /* avoid "unused parameter" warning */
long ret; long ret;
(void) opaque; /* avoid "unused parameter" warning */
ret = ftell((FILE *)stream); ret = ftell((FILE *)stream);
return ret; return ret;
} }
@ -129,9 +129,9 @@ long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
uLong offset; uLong offset;
int origin; int origin;
{ {
(void) opaque; /* avoid "unused parameter" warning */
int fseek_origin=0; int fseek_origin=0;
long ret; long ret;
(void) opaque; /* avoid "unused parameter" warning */
switch (origin) switch (origin)
{ {
case ZLIB_FILEFUNC_SEEK_CUR : case ZLIB_FILEFUNC_SEEK_CUR :
@ -154,8 +154,8 @@ int ZCALLBACK fclose_file_func (opaque, stream)
voidpf opaque; voidpf opaque;
voidpf stream; voidpf stream;
{ {
(void) opaque; /* avoid "unused parameter" warning */
int ret; int ret;
(void) opaque; /* avoid "unused parameter" warning */
ret = fclose((FILE *)stream); ret = fclose((FILE *)stream);
return ret; return ret;
} }
@ -164,8 +164,8 @@ int ZCALLBACK ferror_file_func (opaque, stream)
voidpf opaque; voidpf opaque;
voidpf stream; voidpf stream;
{ {
(void) opaque; /* avoid "unused parameter" warning */
int ret; int ret;
(void) opaque; /* avoid "unused parameter" warning */
ret = ferror((FILE *)stream); ret = ferror((FILE *)stream);
return ret; return ret;
} }

4
rbutil/rbutilqt/quazip/zip.c
View file

@ -320,9 +320,9 @@ local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)
const tm_zip* ptm; const tm_zip* ptm;
uLong dosDate; uLong dosDate;
{ {
(void) dosDate; /* avoid "unused parameter" warning */
uLong year = (uLong)ptm->tm_year; uLong year = (uLong)ptm->tm_year;
if (year>1980) (void) dosDate; /* avoid "unused parameter" warning */
if (year>1980)
year-=1980; year-=1980;
else if (year>80) else if (year>80)
year-=80; year-=80;