From 1ff11c1e164cbe36e44e045f350c40047b0da5af Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 5 May 2020 10:40:31 +0200
Subject: [PATCH] cleanup: Removal of unnecessary null checks around `delete`

Fixes #934
---
 panda/src/grutil/meshDrawer2D.cxx          |  6 ++---
 panda/src/nativenet/time_accumulator.h     |  4 +--
 pandatool/src/lwoegg/lwoToEggConverter.cxx | 30 ++++++----------------
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/panda/src/grutil/meshDrawer2D.cxx b/panda/src/grutil/meshDrawer2D.cxx
index a34f4b7d34..235b5478ea 100644
--- a/panda/src/grutil/meshDrawer2D.cxx
+++ b/panda/src/grutil/meshDrawer2D.cxx
@@ -88,9 +88,9 @@ void MeshDrawer2D::generator(int budget) {
 void MeshDrawer2D::begin() {
 
   // recreate our rewriters
-  if (_vertex != nullptr) delete _vertex;
-  if (_uv != nullptr)     delete _uv;
-  if (_color != nullptr)  delete _color;
+  delete _vertex;
+  delete _uv;
+  delete _color;
 
   _vertex = new GeomVertexRewriter(_vdata, "vertex");
   _uv = new GeomVertexRewriter(_vdata, "texcoord");
diff --git a/panda/src/nativenet/time_accumulator.h b/panda/src/nativenet/time_accumulator.h
index d6ff391d11..11fabd3538 100644
--- a/panda/src/nativenet/time_accumulator.h
+++ b/panda/src/nativenet/time_accumulator.h
@@ -58,9 +58,7 @@ Time_Accumulator() :
  */
 inline Time_Accumulator::
 ~Time_Accumulator() {
-  if (_accum_start != nullptr) {
-    delete _accum_start;
-  }
+  delete _accum_start;
 }
 
 /**
diff --git a/pandatool/src/lwoegg/lwoToEggConverter.cxx b/pandatool/src/lwoegg/lwoToEggConverter.cxx
index 42844f19f0..524d60a8cf 100644
--- a/pandatool/src/lwoegg/lwoToEggConverter.cxx
+++ b/pandatool/src/lwoegg/lwoToEggConverter.cxx
@@ -199,39 +199,25 @@ void LwoToEggConverter::
 cleanup() {
   _lwo_header.clear();
 
-  if (_generic_layer != nullptr) {
-    delete _generic_layer;
-    _generic_layer = nullptr;
-  }
+  delete _generic_layer;
+  _generic_layer = nullptr;
 
-  Layers::iterator li;
-  for (li = _layers.begin(); li != _layers.end(); ++li) {
-    CLwoLayer *layer = (*li);
-    if (layer != nullptr) {
-      delete layer;
-    }
+  for (CLwoLayer *layer : _layers) {
+    delete layer;
   }
   _layers.clear();
 
-  Clips::iterator ci;
-  for (ci = _clips.begin(); ci != _clips.end(); ++ci) {
-    CLwoClip *clip = (*ci);
-    if (clip != nullptr) {
-      delete clip;
-    }
+  for (CLwoClip *clip : _clips) {
+    delete clip;
   }
   _clips.clear();
 
-  Points::iterator pi;
-  for (pi = _points.begin(); pi != _points.end(); ++pi) {
-    CLwoPoints *points = (*pi);
+  for (CLwoPoints *points : _points) {
     delete points;
   }
   _points.clear();
 
-  Polygons::iterator gi;
-  for (gi = _polygons.begin(); gi != _polygons.end(); ++gi) {
-    CLwoPolygons *polygons = (*gi);
+  for (CLwoPolygons *polygons : _polygons) {
     delete polygons;
   }
   _polygons.clear();