Browse Source

cleanup: Removal of unnecessary null checks around `delete`

Fixes #934
rdb 5 years ago
parent
commit
1ff11c1e16

+ 3 - 3
panda/src/grutil/meshDrawer2D.cxx

@@ -88,9 +88,9 @@ void MeshDrawer2D::generator(int budget) {
 void MeshDrawer2D::begin() {
 void MeshDrawer2D::begin() {
 
 
   // recreate our rewriters
   // 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");
   _vertex = new GeomVertexRewriter(_vdata, "vertex");
   _uv = new GeomVertexRewriter(_vdata, "texcoord");
   _uv = new GeomVertexRewriter(_vdata, "texcoord");

+ 1 - 3
panda/src/nativenet/time_accumulator.h

@@ -58,9 +58,7 @@ Time_Accumulator() :
  */
  */
 inline Time_Accumulator::
 inline Time_Accumulator::
 ~Time_Accumulator() {
 ~Time_Accumulator() {
-  if (_accum_start != nullptr) {
-    delete _accum_start;
-  }
+  delete _accum_start;
 }
 }
 
 
 /**
 /**

+ 8 - 22
pandatool/src/lwoegg/lwoToEggConverter.cxx

@@ -199,39 +199,25 @@ void LwoToEggConverter::
 cleanup() {
 cleanup() {
   _lwo_header.clear();
   _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();
   _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();
   _clips.clear();
 
 
-  Points::iterator pi;
-  for (pi = _points.begin(); pi != _points.end(); ++pi) {
-    CLwoPoints *points = (*pi);
+  for (CLwoPoints *points : _points) {
     delete points;
     delete points;
   }
   }
   _points.clear();
   _points.clear();
 
 
-  Polygons::iterator gi;
-  for (gi = _polygons.begin(); gi != _polygons.end(); ++gi) {
-    CLwoPolygons *polygons = (*gi);
+  for (CLwoPolygons *polygons : _polygons) {
     delete polygons;
     delete polygons;
   }
   }
   _polygons.clear();
   _polygons.clear();