Core/Misc: Remove redundant null pointer checks before delete (#2679)

Co-authored-by: Ujp8LfXBJ6wCPR <github@lillecarl.com>

Co-authored-by: Ujp8LfXBJ6wCPR <github@lillecarl.com>
This commit is contained in:
Viste
2020-02-20 20:33:28 +03:00
committed by GitHub
parent 0cabb8e7e1
commit a7970b711a
4 changed files with 9 additions and 6 deletions
+6 -3
View File
@@ -2320,9 +2320,12 @@ void Guild::DeleteMember(uint64 guid, bool isDisbanding, bool isKicked, bool can
// Call script on remove before member is actually removed from guild (and database) // Call script on remove before member is actually removed from guild (and database)
sScriptMgr->OnGuildRemoveMember(this, player, isDisbanding, isKicked); sScriptMgr->OnGuildRemoveMember(this, player, isDisbanding, isKicked);
if (Member* member = GetMember(guid)) auto memberItr = m_members.find(lowguid);
delete member; if (memberItr != m_members.end())
m_members.erase(lowguid); {
delete memberItr->second;
m_members.erase(memberItr);
}
// If player not online data in data field will be loaded from guild tabs no need to update it !! // If player not online data in data field will be loaded from guild tabs no need to update it !!
if (player) if (player)
+1 -1
View File
@@ -64,7 +64,7 @@ bool FileLoader::prepareLoadedData()
void FileLoader::free() void FileLoader::free()
{ {
if (data) delete[] data; delete[] data;
data = 0; data = 0;
data_size = 0; data_size = 0;
version = 0; version = 0;
+1 -1
View File
@@ -111,7 +111,7 @@ void MPQFile::seekRelative(int offset)
void MPQFile::close() void MPQFile::close()
{ {
if (buffer) delete[] buffer; delete[] buffer;
buffer = 0; buffer = 0;
eof = true; eof = true;
} }
+1 -1
View File
@@ -111,7 +111,7 @@ void MPQFile::seekRelative(int offset)
void MPQFile::close() void MPQFile::close()
{ {
if (buffer) delete[] buffer; delete[] buffer;
buffer = 0; buffer = 0;
eof = true; eof = true;
} }