From 744f06cc8f077c605ed67e38a6b490bd7c6810d1 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 27 Oct 2019 19:49:30 -0400
Subject: [PATCH] clang-tidy: enable readability-delete-null-pointer and fix

---
 .clang-tidy                                              | 1 -
 src/lib/drivers/device/ringbuffer.cpp                    | 4 +---
 src/modules/airspeed_selector/airspeed_selector_main.cpp | 4 +---
 src/modules/events/send_event.cpp                        | 9 ++-------
 src/modules/mavlink/mavlink_ftp.cpp                      | 9 ++-------
 src/modules/mc_pos_control/mc_pos_control_main.cpp       | 4 +---
 src/modules/uORB/uORBDeviceNode.cpp                      | 4 +---
 7 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index cf57ac80a6..de59db208f 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -87,7 +87,6 @@ Checks:          '*,
                   -readability-avoid-const-params-in-decls,
                   -readability-braces-around-statements,
                   -readability-container-size-empty,
-                  -readability-delete-null-pointer,
                   -readability-else-after-return,
                   -readability-function-size,
                   -readability-implicit-bool-cast,
diff --git a/src/lib/drivers/device/ringbuffer.cpp b/src/lib/drivers/device/ringbuffer.cpp
index 1ad65f3cd2..92c9fcf753 100644
--- a/src/lib/drivers/device/ringbuffer.cpp
+++ b/src/lib/drivers/device/ringbuffer.cpp
@@ -53,9 +53,7 @@ RingBuffer::RingBuffer(unsigned num_items, size_t item_size) :
 
 RingBuffer::~RingBuffer()
 {
-	if (_buf != nullptr) {
-		delete[] _buf;
-	}
+	delete[] _buf;
 }
 
 unsigned
diff --git a/src/modules/airspeed_selector/airspeed_selector_main.cpp b/src/modules/airspeed_selector/airspeed_selector_main.cpp
index 80044ae8a0..5b54c6cd5a 100644
--- a/src/modules/airspeed_selector/airspeed_selector_main.cpp
+++ b/src/modules/airspeed_selector/airspeed_selector_main.cpp
@@ -182,9 +182,7 @@ AirspeedModule::~AirspeedModule()
 
 	perf_free(_perf_elapsed);
 
-	if (_airspeed_validator != nullptr) {
-		delete[] _airspeed_validator;
-	}
+	delete[] _airspeed_validator;
 }
 
 int
diff --git a/src/modules/events/send_event.cpp b/src/modules/events/send_event.cpp
index 6e1143bf8b..0a1ffa64cd 100644
--- a/src/modules/events/send_event.cpp
+++ b/src/modules/events/send_event.cpp
@@ -81,13 +81,8 @@ SendEvent::SendEvent() : ModuleParams(nullptr)
 
 SendEvent::~SendEvent()
 {
-	if (_status_display != nullptr) {
-		delete _status_display;
-	}
-
-	if (_rc_loss_alarm != nullptr) {
-		delete _rc_loss_alarm;
-	}
+	delete _status_display;
+	delete _rc_loss_alarm;
 }
 
 int SendEvent::start()
diff --git a/src/modules/mavlink/mavlink_ftp.cpp b/src/modules/mavlink/mavlink_ftp.cpp
index 5831c45b4a..e3a43dbf47 100644
--- a/src/modules/mavlink/mavlink_ftp.cpp
+++ b/src/modules/mavlink/mavlink_ftp.cpp
@@ -57,13 +57,8 @@ MavlinkFTP::MavlinkFTP(Mavlink *mavlink) :
 
 MavlinkFTP::~MavlinkFTP()
 {
-	if (_work_buffer1) {
-		delete[] _work_buffer1;
-	}
-
-	if (_work_buffer2) {
-		delete[] _work_buffer2;
-	}
+	delete[] _work_buffer1;
+	delete[] _work_buffer2;
 }
 
 unsigned
diff --git a/src/modules/mc_pos_control/mc_pos_control_main.cpp b/src/modules/mc_pos_control/mc_pos_control_main.cpp
index 9639357436..00eda12882 100644
--- a/src/modules/mc_pos_control/mc_pos_control_main.cpp
+++ b/src/modules/mc_pos_control/mc_pos_control_main.cpp
@@ -297,9 +297,7 @@ MulticopterPositionControl::MulticopterPositionControl() :
 
 MulticopterPositionControl::~MulticopterPositionControl()
 {
-	if (_wv_controller != nullptr) {
-		delete _wv_controller;
-	}
+	delete _wv_controller;
 
 	perf_free(_cycle_perf);
 }
diff --git a/src/modules/uORB/uORBDeviceNode.cpp b/src/modules/uORB/uORBDeviceNode.cpp
index e152f89177..a34fbbe859 100644
--- a/src/modules/uORB/uORBDeviceNode.cpp
+++ b/src/modules/uORB/uORBDeviceNode.cpp
@@ -66,9 +66,7 @@ uORB::DeviceNode::DeviceNode(const struct orb_metadata *meta, const uint8_t inst
 
 uORB::DeviceNode::~DeviceNode()
 {
-	if (_data != nullptr) {
-		delete[] _data;
-	}
+	delete[] _data;
 
 	CDev::unregister_driver_and_memory();
 }