summaryrefslogtreecommitdiff
path: root/rsc
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 /rsc
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 'rsc')
-rw-r--r--rsc/source/parser/rsclex.cxx3
-rw-r--r--rsc/source/tools/rscdef.cxx3
2 files changed, 2 insertions, 4 deletions
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index 6f906e67a746..d8517e142749 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -357,8 +357,7 @@ void EndParser()
delete pStringContainer;
pStringContainer = NULL;
- if( pExp )
- delete pExp;
+ delete pExp;
pTC = NULL;
pFI = NULL;
pExp = NULL;
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index 7daa2f0ec531..ac1fb17b2ce8 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.cxx
@@ -155,8 +155,7 @@ void RscDefine::DecRef()
void RscDefine::DefineToNumber()
{
- if( pExp )
- delete pExp;
+ delete pExp;
pExp = NULL;
SetName(OString::number(lId));
}