summaryrefslogtreecommitdiff
path: root/tools
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 /tools
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 'tools')
-rw-r--r--tools/source/stream/stream.cxx3
-rw-r--r--tools/source/stream/strmunx.cxx3
-rw-r--r--tools/source/stream/strmwnt.cxx3
3 files changed, 3 insertions, 6 deletions
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 79c3717b895c..529f7e27e91e 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -433,8 +433,7 @@ SvStream::~SvStream()
if ( xLockBytes.Is() )
Flush();
- if( pRWBuf )
- delete[] pRWBuf;
+ delete[] pRWBuf;
}
void SvStream::ClearError()
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index c8e5986daa6a..1a7ab56ab19e 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -302,8 +302,7 @@ SvFileStream::~SvFileStream()
unlockFile( 0, 0, this );
- if (pInstanceData)
- delete pInstanceData;
+ delete pInstanceData;
}
sal_Size SvFileStream::GetData( void* pData, sal_Size nSize )
diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index dd49f6d2702f..6076205c12ac 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.cxx
@@ -129,8 +129,7 @@ SvFileStream::SvFileStream()
SvFileStream::~SvFileStream()
{
Close();
- if (pInstanceData)
- delete pInstanceData;
+ delete pInstanceData;
}
/// Does not check for EOF, makes isEof callable