Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 12:32:20 +02:00
Code Activity

Remove unnecessary delete statements

Browse source 
If a value is null, the C++ delete statement will do nothing, so there is bo need to explicitly check if the value is null.
This commit is contained in:
JamesOrson 2020-07-10 15:43:39 -07:00 • committed by James Orson
parent 7f726ef9ba
commit e76becf4c6
12 changed files with 22 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BeefySysLib/FileHandleStream.cpp
View file

@ -13,8 +13,7 @@ FileHandleStream::FileHandleStream()
FileHandleStream::~FileHandleStream()
{
if (mCacheBuffer != NULL)
delete mCacheBuffer;
delete mCacheBuffer;
if (mFileHandle != NULL)
::CloseHandle_File(mFileHandle);
}

3
BeefySysLib/FileStream.cpp
View file

@ -16,8 +16,7 @@ FileStream::FileStream()
FileStream::~FileStream()
{
if (mCacheBuffer != NULL)
delete mCacheBuffer;
delete mCacheBuffer;
if (mFP != NULL)
fclose(mFP);
}

3
BeefySysLib/img/PSDReader.cpp
View file

@ -176,8 +176,7 @@ PSDReader::PSDReader()
PSDReader::~PSDReader()
{
if (mFS != NULL)
delete mFS;
delete mFS;
for (int i = 0; i < (int) mPSDLayerInfoVector.size(); i++)
delete mPSDLayerInfoVector[i];
PSDPatternMap::iterator itr = mPSDPatternMap.begin();

9
BeefySysLib/platform/win/DSoundManager.cpp
View file

@ -417,11 +417,10 @@ void DSoundManager::ReleaseSounds()
void DSoundManager::ReleaseChannels()
{
for (int i = 0; i < MAX_CHANNELS; i++)
if (mPlayingSounds[i] != NULL)
{
delete mPlayingSounds[i];
mPlayingSounds[i] = NULL;
}
{
delete mPlayingSounds[i];
mPlayingSounds[i] = NULL;
}
}
void DSoundManager::ReleaseFreeChannels()

7
BeefySysLib/util/BSpline.cpp
View file

@ -31,11 +31,8 @@ BSpline2D::~BSpline2D()
void BSpline2D::AddPt(float x, float y)
{
if (mUVals != NULL)
{
delete mUVals;
mUVals = NULL;
}
delete mUVals;
mUVals = NULL;
Point2D pt;
pt.mX = x;

14
IDEHelper/Compiler/BfContext.cpp
View file

@ -925,11 +925,8 @@ void BfContext::RebuildType(BfType* type, bool deleteOnDemandTypes, bool rebuild
}
else
{
if (typeInst->mHotTypeData != NULL)
{
delete typeInst->mHotTypeData;
typeInst->mHotTypeData = NULL;
}
delete typeInst->mHotTypeData;
typeInst->mHotTypeData = NULL;
}
auto typeDef = typeInst->mTypeDef;
@ -1010,11 +1007,8 @@ void BfContext::RebuildType(BfType* type, bool deleteOnDemandTypes, bool rebuild
typeInst->mIsSplattable = false;
typeInst->mHasPackingHoles = false;
typeInst->mWantsGCMarking = false;
if (typeInst->mTypeInfoEx != NULL)
{
delete typeInst->mTypeInfoEx;
typeInst->mTypeInfoEx = NULL;
}
delete typeInst->mTypeInfoEx;
typeInst->mTypeInfoEx = NULL;
if (typeInst->IsGenericTypeInstance())
{

3
IDEHelper/Compiler/BfDefBuilder.cpp
View file

@ -1583,8 +1583,7 @@ void BfDefBuilder::Visit(BfTypeDeclaration* typeDeclaration)
if (prevRevisionTypeDef->mDefState == BfTypeDef::DefState_AwaitingNewVersion)
{
if (prevRevisionTypeDef->mNextRevision != NULL)
delete prevRevisionTypeDef->mNextRevision;
delete prevRevisionTypeDef->mNextRevision;
prevRevisionTypeDef->mNextRevision = mCurTypeDef;
BF_ASSERT(mCurTypeDef->mSystem != NULL);
mCurActualTypeDef = prevRevisionTypeDef;

4
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -6028,8 +6028,8 @@ BfType* BfModule::ResolveGenericType(BfType* unspecializedType, BfTypeVector* ty
delegateType = dlgType;
}
if (delegateType->mTypeDef != NULL)
delete delegateType->mTypeDef;
delete delegateType->mTypeDef;
delegateType->mTypeDef = NULL;
BfDelegateInfo* delegateInfo = delegateType->GetDelegateInfo();
delegateInfo->mParams.Clear();

3
IDEHelper/Compiler/BfParser.cpp
View file

@ -3403,8 +3403,7 @@ BF_EXPORT void BF_CALLTYPE BfParser_SetSource(BfParser* bfParser, const char* da
BF_EXPORT void BF_CALLTYPE BfParser_SetCharIdData(BfParser* bfParser, uint8* data, int length)
{
if (bfParser->mParserData->mCharIdData != NULL)
delete bfParser->mParserData->mCharIdData;
delete bfParser->mParserData->mCharIdData;
bfParser->mParserData->mCharIdData = new uint8[length];
memcpy(bfParser->mParserData->mCharIdData, data, length);
}

3
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -1878,8 +1878,7 @@ BfGenericTypeInfo::~BfGenericTypeInfo()
{
for (auto genericParamInstance : mGenericParams)
genericParamInstance->Release();
if (mGenericExtensionInfo != NULL)
delete mGenericExtensionInfo;
delete mGenericExtensionInfo;
}
BfGenericTypeInfo::GenericParamsVector* BfTypeInstance::GetGenericParamsVector(BfTypeDef* declaringTypeDef)

3
IDEHelper/Compiler/BfSource.cpp
View file

@ -38,8 +38,7 @@ BfSource::~BfSource()
{
int sourceCount = gSourceCount--;
if (mSourceData != NULL)
delete mSourceData;
delete mSourceData;
if (mSrcAllocSize >= 0)
delete mSrc;

6
IDEHelper/Compiler/BfSystem.cpp
View file

@ -694,8 +694,7 @@ void BfTypeDef::PopulateMemberSets()
BfTypeDef::~BfTypeDef()
{
BfLogSysM("BfTypeDef::~BfTypeDef %08X\n", this);
if (mNextRevision != NULL)
delete mNextRevision;
delete mNextRevision;
FreeMembers();
if (mSource != NULL)
@ -3139,8 +3138,7 @@ void BfSystem::RemoveDeletedParsers()
}
BfLogSys(this, "Removing Queued Parser: %p\n", bfParser);
if (bfParser != NULL)
delete bfParser;
delete bfParser;
CheckLockYield();
}
}