Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 2 cpp check warnings reported by pabs3.

master
Per Inge Mathisen 2011-02-18 15:54:39 +01:00
parent 733ab6e911
commit 48ff5e55d2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/ivis_opengl/imdload.cpp
View File

@ -503,7 +503,14 @@ static iIMDShape *_imd_load_level(const char **ppFileData, const char *FileDataE
iIMDShape *s = NULL;
if (nlevels == 0)
{
return NULL;
}
// Load optional MATERIALS directive
pTmp = pFileData; // remember position
i = sscanf(pFileData, "%255s %n", buffer, &cnt);
ASSERT_OR_RETURN(NULL, i == 1, "Bad directive following LEVEL");
s = (iIMDShape*)malloc(sizeof(iIMDShape));
if (s == NULL)
@ -512,26 +519,18 @@ static iIMDShape *_imd_load_level(const char **ppFileData, const char *FileDataE
debug(LOG_ERROR, "_imd_load_level: Memory allocation error");
return NULL;
}
s->flags = 0;
s->nconnectors = 0; // Default number of connectors must be 0
s->npoints = 0;
s->npolys = 0;
s->points = NULL;
s->polys = NULL;
s->connectors = NULL;
s->next = NULL;
s->shadowEdgeList = NULL;
s->nShadowEdges = 0;
s->texpage = iV_TEX_INVALID;
s->tcmaskpage = iV_TEX_INVALID;
// Load optional MATERIALS directive
pTmp = pFileData; // remember position
i = sscanf(pFileData, "%255s %n", buffer, &cnt);
ASSERT_OR_RETURN(NULL, i == 1, "Bad directive following LEVEL");
memset(s->material, 0, sizeof(s->material));
s->material[LIGHT_AMBIENT][3] = 1.0f;
s->material[LIGHT_DIFFUSE][3] = 1.0f;

1
lib/ivis_opengl/png_util.cpp
View File

@ -323,6 +323,7 @@ void iV_saveImage_JPEG(const char *fileName, const iV_Image *image)
if (jpeg == NULL)
{
debug(LOG_ERROR, "pie_JPEGSaveFile: Couldn't allocate memory\n");
free(buffer);
return;
}