swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-31 01:15:48 -04:00
Code Issues Projects Releases Wiki Activity

fix some cppcheck detected issues

Browse Source
This commit is contained in:
DarthArgus
2015-07-28 14:52:33 -05:00
parent 0eeacb3709
commit 33139d7b5c
5 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedDebug/src/shared/DataLint.cpp
+20 -20
View File
@@ -323,26 +323,6 @@ void DataLint::report()
writeError(assetErrorFileAllWarning, *warningListIter, totalErrorCountAllWarning);
}
}
if (assetErrorFileAll) { fclose(assetErrorFileAll); }
if (assetErrorFileAllFatal) { fclose(assetErrorFileAllFatal); }
if (assetErrorFileAllWarning) { fclose(assetErrorFileAllWarning); }
if (assetErrorFileObjectTemplate) { fclose(assetErrorFileObjectTemplate); }
if (m_mode == M_client)
{
if (assetErrorFileAppearance) { fclose(assetErrorFileAppearance); }
if (assetErrorFileArrangementDescriptor) { fclose(assetErrorFileArrangementDescriptor); }
if (assetErrorFileLocalizedStringTable) { fclose(assetErrorFileLocalizedStringTable); }
if (assetErrorFilePortalProperty) { fclose(assetErrorFilePortalProperty); }
if (assetErrorFileShaderTemplate) { fclose(assetErrorFileShaderTemplate); }
if (assetErrorFileSkyBox) { fclose(assetErrorFileSkyBox); }
if (assetErrorFileSlotDescriptor) { fclose(assetErrorFileSlotDescriptor); }
if (assetErrorFileSoundTemplate) { fclose(assetErrorFileSoundTemplate); }
if (assetErrorFileTerrain) { fclose(assetErrorFileTerrain); }
if (assetErrorFileTexture) { fclose(assetErrorFileTexture); }
if (assetErrorFileTextureRenderer) { fclose(assetErrorFileTextureRenderer); }
}
}
// UnSupported Assets
@@ -411,6 +391,26 @@ void DataLint::report()
fclose(fp);
}
if (assetErrorFileAll) { fclose(assetErrorFileAll); }
if (assetErrorFileAllFatal) { fclose(assetErrorFileAllFatal); }
if (assetErrorFileAllWarning) { fclose(assetErrorFileAllWarning); }
if (assetErrorFileObjectTemplate) { fclose(assetErrorFileObjectTemplate); }
if (m_mode == M_client)
{
if (assetErrorFileAppearance) { fclose(assetErrorFileAppearance); }
if (assetErrorFileArrangementDescriptor) { fclose(assetErrorFileArrangementDescriptor); }
if (assetErrorFileLocalizedStringTable) { fclose(assetErrorFileLocalizedStringTable); }
if (assetErrorFilePortalProperty) { fclose(assetErrorFilePortalProperty); }
if (assetErrorFileShaderTemplate) { fclose(assetErrorFileShaderTemplate); }
if (assetErrorFileSkyBox) { fclose(assetErrorFileSkyBox); }
if (assetErrorFileSlotDescriptor) { fclose(assetErrorFileSlotDescriptor); }
if (assetErrorFileSoundTemplate) { fclose(assetErrorFileSoundTemplate); }
if (assetErrorFileTerrain) { fclose(assetErrorFileTerrain); }
if (assetErrorFileTexture) { fclose(assetErrorFileTexture); }
if (assetErrorFileTextureRenderer) { fclose(assetErrorFileTextureRenderer); }
}
}
}
engine/shared/library/sharedDebug/src/shared/Profiler.cpp
+5 -3
View File
@@ -215,14 +215,16 @@ VisibleExpandableEntry * VisibleExpandableEntry::findOrAddExpandableChild(char c
bool VisibleExpandableEntry::pruneInvisibleChildren()
{
for (Children::iterator i = m_children.begin(); i != m_children.end(); )
{
if ((*i)->m_visible == false)
{
delete *i;
m_children.erase(i);
i = m_children.erase(i);
}
else
{
++i;
}
}
bool const result = ms_destroyedSelected;
ms_destroyedSelected = false;
return result;