TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 07:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: Removal of unnecessary null checks around delete

Browse Source 
Fixes #934
This commit is contained in:
rdb 2020-05-05 10:40:31 +02:00
parent 5030ad6b13
commit 1ff11c1e16
3 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/grutil/meshDrawer2D.cxx
View File

@ -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; delete _vertex;
if (_uv != nullptr) delete _uv; delete _uv;
if (_color != nullptr) delete _color; delete _color;
_vertex = new GeomVertexRewriter(_vdata, "vertex"); _vertex = new GeomVertexRewriter(_vdata, "vertex");
_uv = new GeomVertexRewriter(_vdata, "texcoord"); _uv = new GeomVertexRewriter(_vdata, "texcoord");

4
panda/src/nativenet/time_accumulator.h
View File

@ -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;
}
} }
/** /**

30
pandatool/src/lwoegg/lwoToEggConverter.cxx
View File

@ -199,39 +199,25 @@ void LwoToEggConverter::
cleanup() { cleanup() {
_lwo_header.clear(); _lwo_header.clear();
if (_generic_layer != nullptr) { delete _generic_layer;
delete _generic_layer; _generic_layer = nullptr;
_generic_layer = nullptr;
}
Layers::iterator li; for (CLwoLayer *layer : _layers) {
for (li = _layers.begin(); li != _layers.end(); ++li) { delete layer;
CLwoLayer *layer = (*li);
if (layer != nullptr) {
delete layer;
}
} }
_layers.clear(); _layers.clear();
Clips::iterator ci; for (CLwoClip *clip : _clips) {
for (ci = _clips.begin(); ci != _clips.end(); ++ci) { delete clip;
CLwoClip *clip = (*ci);
if (clip != nullptr) {
delete clip;
}
} }
_clips.clear(); _clips.clear();
Points::iterator pi; for (CLwoPoints *points : _points) {
for (pi = _points.begin(); pi != _points.end(); ++pi) {
CLwoPoints *points = (*pi);
delete points; delete points;
} }
_points.clear(); _points.clear();
Polygons::iterator gi; for (CLwoPolygons *polygons : _polygons) {
for (gi = _polygons.begin(); gi != _polygons.end(); ++gi) {
CLwoPolygons *polygons = (*gi);
delete polygons; delete polygons;
} }
_polygons.clear(); _polygons.clear();