github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-16 02:03:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove redundant null checks

Browse source 
Attempting to delete a null pointer is a noop in C++.

Closes #2864.

[1] https://isocpp.org/wiki/faq/freestore-mgmt#delete-handles-null
This commit is contained in:
NotTsunami 2020-02-03 16:38:46 -05:00
parent c78604c7d3
commit 6748e8d787
14 changed files with 37 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/base/net/geoipmanager.cpp
View file

@ -63,8 +63,7 @@ GeoIPManager::GeoIPManager()
GeoIPManager::~GeoIPManager()
{
if (m_geoIPDatabase)
delete m_geoIPDatabase;
delete m_geoIPDatabase;
}
void GeoIPManager::initInstance()
@ -75,10 +74,8 @@ void GeoIPManager::initInstance()
void GeoIPManager::freeInstance()
{
if (m_instance) {
delete m_instance;
m_instance = nullptr;
}
delete m_instance;
m_instance = nullptr;
}
GeoIPManager *GeoIPManager::instance()
@ -88,10 +85,8 @@ GeoIPManager *GeoIPManager::instance()
void GeoIPManager::loadDatabase()
{
if (m_geoIPDatabase) {
delete m_geoIPDatabase;
m_geoIPDatabase = nullptr;
}
delete m_geoIPDatabase;
m_geoIPDatabase = nullptr;
const QString filepath = Utils::Fs::expandPathAbs(
QString("%1%2/%3").arg(specialFolderLocation(SpecialFolder::Data), GEOIP_FOLDER, GEOIP_FILENAME));
@ -398,7 +393,7 @@ void GeoIPManager::configure()
if (m_enabled && !m_geoIPDatabase) {
loadDatabase();
}
else if (!m_enabled && m_geoIPDatabase) {
else if (!m_enabled) {
delete m_geoIPDatabase;
m_geoIPDatabase = nullptr;
}
@ -423,8 +418,7 @@ void GeoIPManager::downloadFinished(const DownloadResult &result)
GeoIPDatabase *geoIPDatabase = GeoIPDatabase::load(data, error);
if (geoIPDatabase) {
if (!m_geoIPDatabase || (geoIPDatabase->buildEpoch() > m_geoIPDatabase->buildEpoch())) {
if (m_geoIPDatabase)
delete m_geoIPDatabase;
delete m_geoIPDatabase;
m_geoIPDatabase = geoIPDatabase;
LogMsg(tr("GeoIP database loaded. Type: %1. Build time: %2.")
.arg(m_geoIPDatabase->type(), m_geoIPDatabase->buildEpoch().toString()),