quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix two bugs cppcheck found

Browse Source
This commit is contained in:
Rudolf Polzer 2011-01-08 20:59:46 +01:00
parent b15b0b849f
commit 6ce0c65e77
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/quake3/q3map2/main.c
View File

@ -989,8 +989,8 @@ int AnalyzeBSP( int argc, char **argv )
lump = (byte*) header + offset; lump = (byte*) header + offset;
lumpInt = LittleLong( (int) *((int*) lump) ); lumpInt = LittleLong( (int) *((int*) lump) );
lumpFloat = LittleFloat( (float) *((float*) lump) ); lumpFloat = LittleFloat( (float) *((float*) lump) );
memcpy( lumpString, (char*) lump, (length < 1024 ? length : 1024) ); memcpy( lumpString, (char*) lump, (length < sizeof(lumpString) ? length : sizeof(lumpString)-1) );
lumpString[ 1024 ] = '\0'; lumpString[ sizeof(lumpString)-1 ] = '\0';
/* print basic lump info */ /* print basic lump info */
Sys_Printf( "Lump: %d\n", i ); Sys_Printf( "Lump: %d\n", i );

2
tools/quake3/q3map2/model.c
View File

@ -229,7 +229,6 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
char *skinfilecontent; char *skinfilecontent;
int skinfilesize; int skinfilesize;
char *skinfileptr, *skinfilenextptr; char *skinfileptr, *skinfilenextptr;
FILE *skinfilehandle;
/* get model */ /* get model */
@ -240,7 +239,6 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
/* load skin file */ /* load skin file */
snprintf(skinfilename, sizeof(skinfilename), "%s_%d.skin", name, skin); snprintf(skinfilename, sizeof(skinfilename), "%s_%d.skin", name, skin);
skinfilename[sizeof(skinfilename)-1] = 0; skinfilename[sizeof(skinfilename)-1] = 0;
skinfilehandle = fopen(skinfilename, "r");
skinfilesize = vfsLoadFile(skinfilename, (void**) &skinfilecontent, 0); skinfilesize = vfsLoadFile(skinfilename, (void**) &skinfilecontent, 0);
if(skinfilesize < 0 && skin != 0) if(skinfilesize < 0 && skin != 0)
{ {