summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2015-06-13 22:15:31 +0200
committerNoel Grandin <noel@peralex.com>2015-06-15 14:46:41 +0200
commit4729774b244db7a175077ed0c70aa48be62bc60e (patch)
tree9f0f2e329d269835d4c20a8183a2772b734608f3 /extensions
parent9db80b1499e09cde000160434728f7b231c30db8 (diff)
remove unnecessary check for null when calling delete
Idea originally from caolan. Found using the following command: find . -name *.cxx | xargs /opt/local/bin/grep -zlP '(?m)if\s*\(\s*\w+\s*\)\s*delete\s+\w+\;' Change-Id: I3338f4e22193a6dfd6219c8c75835224a3392763
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/inc/componentmodule.cxx3
-rw-r--r--extensions/source/plugin/base/xplugin.cxx3
2 files changed, 2 insertions, 4 deletions
diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index bc19b5aaa073..44b5311a1f21 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -66,8 +66,7 @@ namespace COMPMOD_NAMESPACE
OModuleImpl::~OModuleImpl()
{
- if (m_pResources)
- delete m_pResources;
+ delete m_pResources;
}
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index e4d89d53b57a..f5f54fe4c4be 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -1038,8 +1038,7 @@ PluginInputStream::~PluginInputStream()
}
else
osl::File::remove( aFile );
- if( m_pContent )
- delete m_pContent;
+ delete m_pContent;
}
PluginStreamType PluginInputStream::getStreamType()