1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 11:38:21 +02:00

Remove unnecessary delete statements

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

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) 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]; bfParser->mParserData->mCharIdData = new uint8[length];
memcpy(bfParser->mParserData->mCharIdData, data, length); memcpy(bfParser->mParserData->mCharIdData, data, length);
} }

View file

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

View file

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

View file

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