Remove unneeded NULL checks

It's perfectly safe to delete NULL pointers, so simplify things by
removing these checks.

diff --git a/common/rfb/CSecurityStack.cxx b/common/rfb/CSecurityStack.cxx
index 55f3133ea6bc90b9c4351d4685178331a35c870d..2541d81efa6de1a7089d84cd3fe6f9f1fea1b9d5 100644 (file)
--- a/common/rfb/CSecurityStack.cxx
+++ b/common/rfb/CSecurityStack.cxx
@@ -32,10 +32,8 @@ CSecurityStack::CSecurityStack(CConnection* cc, int Type, const char* Name,
 
 CSecurityStack::~CSecurityStack()
 {
-  if (state0)
-    delete state0;
-  if (state1)
-    delete state1;
+  delete state0;
+  delete state1;
 }
 
 bool CSecurityStack::processMsg()

diff --git a/common/rfb/CSecurityVeNCrypt.cxx b/common/rfb/CSecurityVeNCrypt.cxx
index 98dad494b43dcbc64a764d0fbe0c43e503c98a48..a6b270e17277b298c95140733304e2d29f1a6809 100644 (file)
--- a/common/rfb/CSecurityVeNCrypt.cxx
+++ b/common/rfb/CSecurityVeNCrypt.cxx
@@ -55,8 +55,7 @@ CSecurityVeNCrypt::CSecurityVeNCrypt(CConnection* cc, SecurityClient* sec)
 
 CSecurityVeNCrypt::~CSecurityVeNCrypt()
 {
-  if (availableTypes)
-       delete[] availableTypes;
+  delete[] availableTypes;
 }
 
 bool CSecurityVeNCrypt::processMsg()

diff --git a/common/rfb/SSecurityStack.cxx b/common/rfb/SSecurityStack.cxx
index 74509e7175c25e5660f007ea66a653431c993f64..8139511347c464e8f27f4e288e81faaec328a9e3 100644 (file)
--- a/common/rfb/SSecurityStack.cxx
+++ b/common/rfb/SSecurityStack.cxx
@@ -28,10 +28,8 @@ SSecurityStack::SSecurityStack(SConnection* sc, int Type,
 
 SSecurityStack::~SSecurityStack()
 {
-  if (state0)
-    delete state0;
-  if (state1)
-    delete state1;
+  delete state0;
+  delete state1;
 }
 
 bool SSecurityStack::processMsg()

diff --git a/common/rfb/SSecurityVeNCrypt.cxx b/common/rfb/SSecurityVeNCrypt.cxx
index 135742c09feeb6422b255faa99b54085260521dd..70d50d20735c98a06cef35dcbd0dcfc42d43111a 100644 (file)
--- a/common/rfb/SSecurityVeNCrypt.cxx
+++ b/common/rfb/SSecurityVeNCrypt.cxx
@@ -57,11 +57,7 @@ SSecurityVeNCrypt::SSecurityVeNCrypt(SConnection* sc, SecurityServer *sec)
 SSecurityVeNCrypt::~SSecurityVeNCrypt()
 {
   delete ssecurity;
-
-  if (subTypes) {
-    delete [] subTypes;
-    subTypes = NULL;
-  }
+  delete [] subTypes;
 }
 
 bool SSecurityVeNCrypt::processMsg()