ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #363 from tkoeppe/zipbrace

Browse source 
[quake3/common/unzip.c] Add braces to make nested if/else less brittle
This commit is contained in:
Timothee "TTimo" Besset 2016-08-16 06:21:24 -06:00 committed by GitHub
commit d1109f70e5
1 changed files with 111 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
tools/quake3/common/unzip.c
View file

@ -1856,19 +1856,24 @@ static int unzlocal_GetCurrentFileInfoInternal (unzFile file,
uLong uMagic;
long lSeek=0;
if (file==NULL)
if (file == NULL) {
return UNZ_PARAMERROR;
s=(unz_s*)file;
if (fseek(s->file,s->pos_in_central_dir+s->byte_before_the_zipfile,SEEK_SET)!=0)
err=UNZ_ERRNO;
}
s = (unz_s*)file;
if (fseek(s->file, s->pos_in_central_dir + s->byte_before_the_zipfile, SEEK_SET) != 0) {
err=UNZ_ERRNO;
}
/* we check the magic */
if (err==UNZ_OK)
if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK)
if (err == UNZ_OK) {
if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK) {
err = UNZ_ERRNO;
else if (uMagic!=0x02014b50)
} else if (uMagic != 0x02014b50) {
err = UNZ_BADZIPFILE;
}
}
if (unzlocal_getShort(s->file,&file_info.version) != UNZ_OK)
err=UNZ_ERRNO;
@ -1918,16 +1923,15 @@ static int unzlocal_GetCurrentFileInfoInternal (unzFile file,
err=UNZ_ERRNO;
lSeek += file_info.size_filename;
if ((err==UNZ_OK) && (szFileName!=NULL))
{
if ((err == UNZ_OK) && (szFileName != NULL)) {
uLong uSizeRead ;
if (file_info.size_filename<fileNameBufferSize)
{
if (file_info.size_filename<fileNameBufferSize) {
*(szFileName+file_info.size_filename)='\0';
uSizeRead = file_info.size_filename;
}
else
} else {
uSizeRead = fileNameBufferSize;
}
if ((file_info.size_filename>0) && (fileNameBufferSize>0)) {
size_t gametype;
@ -1937,26 +1941,28 @@ static int unzlocal_GetCurrentFileInfoInternal (unzFile file,
gametype = fread(szFileName, (uInt)uSizeRead, 1, s->file);
}
if (gametype!=1)
if (gametype != 1) {
err = UNZ_ERRNO;
}
}
lSeek -= uSizeRead;
}
if ((err==UNZ_OK) && (extraField!=NULL))
{
if ((err == UNZ_OK) && (extraField != NULL)) {
uLong uSizeRead ;
if (file_info.size_file_extra<extraFieldBufferSize)
if (file_info.size_file_extra < extraFieldBufferSize) {
uSizeRead = file_info.size_file_extra;
else
} else {
uSizeRead = extraFieldBufferSize;
}
if (lSeek!=0)
if (fseek(s->file,lSeek,SEEK_CUR)==0)
if (lSeek != 0) {
if (fseek(s->file, lSeek, SEEK_CUR) == 0) {
lSeek=0;
else
} else {
err=UNZ_ERRNO;
}
}
if ((file_info.size_file_extra > 0) && (extraFieldBufferSize > 0)) {
size_t gametype;
if (unz_GAME_QL == 1) {
@ -1964,31 +1970,31 @@ static int unzlocal_GetCurrentFileInfoInternal (unzFile file,
} else {
gametype = fread(extraField, (uInt)uSizeRead, 1, s->file);
}
if (gametype!=1)
if (gametype != 1) {
err=UNZ_ERRNO;
}
}
lSeek += file_info.size_file_extra - uSizeRead;
}
else
} else {
lSeek += file_info.size_file_extra;
}
if ((err==UNZ_OK) && (szComment!=NULL))
{
if ((err == UNZ_OK) && (szComment != NULL)) {
uLong uSizeRead ;
if (file_info.size_file_comment<commentBufferSize)
{
if (file_info.size_file_comment < commentBufferSize) {
*(szComment+file_info.size_file_comment) = '\0';
uSizeRead = file_info.size_file_comment;
}
else
} else {
uSizeRead = commentBufferSize;
}
if (lSeek!=0)
if (fseek(s->file,lSeek,SEEK_CUR)==0)
if (lSeek != 0) {
if (fseek(s->file, lSeek, SEEK_CUR) ==0 ) {
lSeek=0;
else
} else {
err=UNZ_ERRNO;
}
}
if ((file_info.size_file_comment>0) && (commentBufferSize>0)) {
size_t gametype;
if (unz_GAME_QL == 1) {
@ -1996,19 +2002,22 @@ static int unzlocal_GetCurrentFileInfoInternal (unzFile file,
} else {
gametype = fread(szComment, (uInt)uSizeRead, 1, s->file);
}
if (gametype!=1)
if (gametype!=1) {
err=UNZ_ERRNO;
}
lSeek+=file_info.size_file_comment - uSizeRead;
}
else
lSeek += file_info.size_file_comment - uSizeRead;
} else {
lSeek+=file_info.size_file_comment;
}
if ((err==UNZ_OK) && (pfile_info!=NULL))
if ((err==UNZ_OK) && (pfile_info!=NULL)) {
*pfile_info=file_info;
}
if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
if ((err==UNZ_OK) && (pfile_info_internal!=NULL)) {
*pfile_info_internal=file_info_internal;
}
return err;
}
@ -2153,15 +2162,17 @@ static int unzlocal_CheckCurrentFileCoherencyHeader (unz_s* s, uInt* piSizeVar,
*psize_local_extrafield = 0;
if (fseek(s->file, s->cur_file_info_internal.offset_curfile +
s->byte_before_the_zipfile,SEEK_SET)!=0)
s->byte_before_the_zipfile, SEEK_SET) != 0) {
return UNZ_ERRNO;
}
if (err==UNZ_OK)
if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK)
if (err == UNZ_OK) {
if (unzlocal_getLong(s->file, &uMagic) != UNZ_OK) {
err=UNZ_ERRNO;
else if (uMagic!=0x04034b50)
} else if (uMagic!=0x04034b50) {
err=UNZ_BADZIPFILE;
}
}
if (unzlocal_getShort(s->file,&uData) != UNZ_OK)
err=UNZ_ERRNO;
@ -2340,7 +2351,7 @@ extern int unzReadCurrentFile (unzFile file, void *buf, unsigned len)
return UNZ_PARAMERROR;
if ((pfile_in_zip_read_info->read_buffer == NULL))
if (pfile_in_zip_read_info->read_buffer == NULL)
return UNZ_END_OF_LIST_OF_FILE;
if (len == 0)
return 0;
@ -2353,17 +2364,17 @@ extern int unzReadCurrentFile (unzFile file, void *buf, unsigned len)
pfile_in_zip_read_info->stream.avail_out =
(uInt)pfile_in_zip_read_info->rest_read_uncompressed;
while (pfile_in_zip_read_info->stream.avail_out>0)
{
while (pfile_in_zip_read_info->stream.avail_out > 0) {
if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
(pfile_in_zip_read_info->rest_read_compressed>0))
{
(pfile_in_zip_read_info->rest_read_compressed > 0)) {
uInt uReadThis = UNZ_BUFSIZE;
size_t gametype;
if (pfile_in_zip_read_info->rest_read_compressed<uReadThis) {
uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed; }
if (uReadThis == 0) {
return UNZ_EOF; }
return UNZ_EOF;
}
if (s->cur_file_info.compressed_size == pfile_in_zip_read_info->rest_read_compressed) {
if (fseek(pfile_in_zip_read_info->file,
pfile_in_zip_read_info->pos_in_zipfile +
@ -2379,8 +2390,9 @@ extern int unzReadCurrentFile (unzFile file, void *buf, unsigned len)
gametype = fread(pfile_in_zip_read_info->read_buffer,uReadThis,1,
pfile_in_zip_read_info->file);
}
if (gametype!=1)
if (gametype!=1) {
return UNZ_ERRNO;
}
pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
@ -2390,8 +2402,7 @@ extern int unzReadCurrentFile (unzFile file, void *buf, unsigned len)
pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
}
if (pfile_in_zip_read_info->compression_method==0)
{
if (pfile_in_zip_read_info->compression_method==0) {
uInt uDoCopy,i ;
if (pfile_in_zip_read_info->stream.avail_out <
pfile_in_zip_read_info->stream.avail_in)
@ -2413,9 +2424,7 @@ extern int unzReadCurrentFile (unzFile file, void *buf, unsigned len)
pfile_in_zip_read_info->stream.next_in += uDoCopy;
pfile_in_zip_read_info->stream.total_out += uDoCopy;
iRead += uDoCopy;
}
else
{
} else {
uLong uTotalOutBefore,uTotalOutAfter;
const Byte *bufBefore;
uLong uOutThis;
@ -2436,11 +2445,9 @@ extern int unzReadCurrentFile (unzFile file, void *buf, unsigned len)
uOutThis = uTotalOutAfter-uTotalOutBefore;
pfile_in_zip_read_info->crc32 =
crc32(pfile_in_zip_read_info->crc32,bufBefore,
(uInt)(uOutThis));
crc32(pfile_in_zip_read_info->crc32, bufBefore, (uInt)(uOutThis));
pfile_in_zip_read_info->rest_read_uncompressed -=
uOutThis;
pfile_in_zip_read_info->rest_read_uncompressed -= uOutThis;
iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);