recommit the innocuous fixes from cppcheck - the va_end calls were deleting pointers and breaking things further down the line

This commit is contained in:
DarthArgus
2015-04-02 19:40:05 -05:00
parent db15932436
commit bc33f176c2
7 changed files with 11 additions and 13 deletions
@@ -278,9 +278,9 @@ void FileManifest::addNewManifestEntry(const char *fileName, int fileSize)
if (fileSize)
((insertReturn.first)->second)->size = fileSize;
// delete the new entry we created
delete entry;
}
delete entry;
#else
return;
#endif
@@ -299,9 +299,7 @@ void FileManifest::addStoredManifestEntry(const char *fileName, const char * sce
std::pair<ManifestMap::iterator, bool> insertReturn = s_manifest.insert(std::pair<const uint32, FileManifestEntry*>(crc, entry));
// if the insert failed, delete the entry we created
if (!insertReturn.second)
delete entry;
delete entry;
}
// -----------------------------------------------------------------------