From 5be5124e702fa3194238d8526db18078bafd2cc0 Mon Sep 17 00:00:00 2001
From: Brendan LE GLAUNEC <brendan.leglaunec@etixgroup.com>
Date: Thu, 3 Nov 2016 16:34:54 +0100
Subject: [PATCH] Remove unnecessary null pointer checks

---
 .../mysql_cache_manager/src/db_conn.cpp       |  5 ++--
 cameradar_standalone/src/cachemanager.cpp     | 27 ++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/cache_managers/mysql_cache_manager/src/db_conn.cpp b/cache_managers/mysql_cache_manager/src/db_conn.cpp
index 4746bb9..c17f0d8 100644
--- a/cache_managers/mysql_cache_manager/src/db_conn.cpp
+++ b/cache_managers/mysql_cache_manager/src/db_conn.cpp
@@ -81,7 +81,7 @@ db_connection::execute(const std::string& request) {
             return_value = { execute_result::no_row_updated, "No row updated" };
         }
     } catch (sql::SQLException& e) { return_value = { execute_result::sql_error, e.what() }; }
-    if (stmt) { delete stmt; }
+    delete stmt;
 
     return return_value;
 }
@@ -103,8 +103,7 @@ db_connection::query(const std::string& query) {
     } catch (sql::SQLException& e) {
         return_value = { nullptr, execute_result::sql_error, e.what() };
     }
-
-    if (stmt) { delete stmt; }
+    delete stmt;
 
     return return_value;
 }
diff --git a/cameradar_standalone/src/cachemanager.cpp b/cameradar_standalone/src/cachemanager.cpp
index 4a7feaa..61aa8d9 100644
--- a/cameradar_standalone/src/cachemanager.cpp
+++ b/cameradar_standalone/src/cachemanager.cpp
@@ -13,10 +13,10 @@
 // limitations under the License.
 
 #include "cachemanager.h" // for cache_manager
+#include <algorithm>      // for move
 #include <dlfcn.h>        // for dlerror, dlclose, dlopen, dlsym, etc
 #include <logger.h>       // for LOG_ERR_
 #include <stdbool.h>      // for bool, false, true
-#include <algorithm>      // for move
 
 #include <errno.h>
 
@@ -46,10 +46,7 @@ cache_manager::cache_manager(cache_manager&& old)
 }
 
 cache_manager::~cache_manager() {
-    if (this->ptr) {
-        delete this->ptr;
-        this->ptr = nullptr;
-    }
+    delete this->ptr;
     if (this->handle) { dlclose(handle); }
 }
 
@@ -105,13 +102,25 @@ cache_manager_iface* cache_manager::operator->() { return this->ptr; }
 
 const cache_manager_iface* cache_manager::operator->() const { return this->ptr; }
 
-bool operator==(std::nullptr_t nullp, const cache_manager& p) { return p.ptr == nullp; }
+bool
+operator==(std::nullptr_t nullp, const cache_manager& p) {
+    return p.ptr == nullp;
+}
 
-bool operator==(const cache_manager& p, std::nullptr_t nullp) { return p.ptr == nullp; }
+bool
+operator==(const cache_manager& p, std::nullptr_t nullp) {
+    return p.ptr == nullp;
+}
 
-bool operator!=(std::nullptr_t nullp, const cache_manager& p) { return p.ptr != nullp; }
+bool
+operator!=(std::nullptr_t nullp, const cache_manager& p) {
+    return p.ptr != nullp;
+}
 
-bool operator!=(const cache_manager& p, std::nullptr_t nullp) { return p.ptr != nullp; }
+bool
+operator!=(const cache_manager& p, std::nullptr_t nullp) {
+    return p.ptr != nullp;
+}
 
 cache_manager_base&
 cache_manager_base::get_instance() {