Remove unnecessary null pointer checks (Fix #5)

Author: mckelvin

libmc/__init__.py

@@ -14,10 +14,10 @@
 )
 
 __VERSION__ = '0.5.0'
-__version__ = "c5566db"
-__author__ = "mckelvin"
-__email__ = "kelvin0576@gmail.com"
-__date__ = "Sat Apr 4 13:07:39 2015 +0800"
+__version__ = "v0.5.0-3-gdce6e6f"
+__author__ = "PAN, Myautsai"
+__email__ = "[email protected].com"
+__date__ = "Sun Apr 5 11:48:29 2015 +0800"
 
 
 class Client(PyClient):

src/ConnectionPool.cpp

@@ -34,10 +34,8 @@ int ConnectionPool::s_pollTimeout = MC_DEFAULT_POLL_TIMEOUT;
 
 
 ConnectionPool::~ConnectionPool() {
-  if (m_conns != NULL) {
-    delete[] m_conns;
-    m_conns = NULL;
-  }
+  delete[] m_conns;
+  m_conns = NULL;
 }
 
 
@@ -64,11 +62,8 @@ void ConnectionPool::setHashFunction(hash_function_options_t fn_opt) {
 
 int ConnectionPool::init(const char* const * hosts, const uint32_t* ports, const size_t n,
                          const uint32_t* weights) {
-  if (m_conns != NULL) {
-    delete[] m_conns;
-    m_conns = NULL;
-    m_connSelector.reset();
-  }
+  delete[] m_conns;
+  m_connSelector.reset();
   int rv = 0;
   m_nConns = n;
   m_conns = new Connection[m_nConns];

src/DataBlock.cpp

@@ -32,9 +32,7 @@ size_t DataBlock::s_minCapacity(MIN_DATABLOCK_CAPACITY);
 
 
 DataBlock::~DataBlock() {
-  if (m_data != NULL) {
-    delete[] m_data;
-  }
+  delete[] m_data;
 }
 
 

src/Result.cpp

@@ -31,10 +31,10 @@ RetrievalResult::RetrievalResult(const RetrievalResult& other) {
 
 
 RetrievalResult::~RetrievalResult() {
-  if (key.size() > 1 && m_inner.key != NULL) { // copy happened
+  if (key.size() > 1) { // copy happened
     delete[] m_inner.key;
   }
-  if (data_block.size() > 1 && m_inner.data_block != NULL) {
+  if (data_block.size() > 1) {
     delete[] m_inner.data_block;
   }
   freeTokenData(key);
@@ -69,7 +69,7 @@ LineResult::LineResult(const LineResult& other) {
 
 
 LineResult::~LineResult() {
-  if (this->line.size() > 1 && this->m_inner != NULL) {
+  if (this->line.size() > 1) {
     delete[] this->m_inner;
   }
   freeTokenData(this->line);