From e4573ef0fe524d90f1563e8740e932ef7f22cd93 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 5 May 2020 14:45:40 +0200 Subject: [PATCH] cleanup: Remove more unnecessary nullptr checks before delete Follow-up to #934 --- direct/src/dcparser/dcClass.cxx | 4 +--- direct/src/dcparser/dcPackerCatalog.cxx | 4 +--- direct/src/dcparser/dcPackerInterface.cxx | 4 +--- direct/src/dcparser/dcSwitch.cxx | 12 +++--------- dtool/src/cppparser/cppManifest.cxx | 4 +--- panda/src/downloader/bioStreamPtr.cxx | 6 ++---- panda/src/egg/eggTransform.I | 16 ++++------------ panda/src/express/multifile.cxx | 2 +- panda/src/gobj/geomVertexColumn.cxx | 5 +---- panda/src/grutil/meshDrawer.I | 8 ++++---- panda/src/grutil/meshDrawer.cxx | 8 ++++---- panda/src/grutil/meshDrawer2D.I | 6 +++--- panda/src/pgraph/transformState.cxx | 6 ++---- pandatool/src/daeegg/daeToEggConverter.cxx | 4 +--- pandatool/src/eggcharbase/eggCharacterFilter.cxx | 4 +--- pandatool/src/eggcharbase/eggComponentData.cxx | 8 ++------ pandatool/src/flt/fltRecordReader.cxx | 6 ++---- pandatool/src/lwoegg/cLwoSurface.cxx | 4 +--- pandatool/src/lwoegg/cLwoSurfaceBlock.cxx | 4 +--- pandatool/src/maya/mayaShaderColorDef.cxx | 4 +--- pandatool/src/mayaegg/mayaNodeDesc.cxx | 4 +--- pandatool/src/pstatserver/pStatThreadData.cxx | 4 +--- 22 files changed, 39 insertions(+), 88 deletions(-) diff --git a/direct/src/dcparser/dcClass.cxx b/direct/src/dcparser/dcClass.cxx index f1d6955981..e6a5fce230 100644 --- a/direct/src/dcparser/dcClass.cxx +++ b/direct/src/dcparser/dcClass.cxx @@ -85,9 +85,7 @@ DCClass(DCFile *dc_file, const string &name, bool is_struct, bool bogus_class) : */ DCClass:: ~DCClass() { - if (_constructor != nullptr) { - delete _constructor; - } + delete _constructor; Fields::iterator fi; for (fi = _fields.begin(); fi != _fields.end(); ++fi) { diff --git a/direct/src/dcparser/dcPackerCatalog.cxx b/direct/src/dcparser/dcPackerCatalog.cxx index 594c7b6742..86966aed1c 100644 --- a/direct/src/dcparser/dcPackerCatalog.cxx +++ b/direct/src/dcparser/dcPackerCatalog.cxx @@ -44,9 +44,7 @@ DCPackerCatalog(const DCPackerCatalog ©) : */ DCPackerCatalog:: ~DCPackerCatalog() { - if (_live_catalog != nullptr) { - delete _live_catalog; - } + delete _live_catalog; SwitchCatalogs::iterator si; for (si = _switch_catalogs.begin(); si != _switch_catalogs.end(); ++si) { diff --git a/direct/src/dcparser/dcPackerInterface.cxx b/direct/src/dcparser/dcPackerInterface.cxx index db51d2712c..54784391c4 100644 --- a/direct/src/dcparser/dcPackerInterface.cxx +++ b/direct/src/dcparser/dcPackerInterface.cxx @@ -60,9 +60,7 @@ DCPackerInterface(const DCPackerInterface ©) : */ DCPackerInterface:: ~DCPackerInterface() { - if (_catalog != nullptr) { - delete _catalog; - } + delete _catalog; } /** diff --git a/direct/src/dcparser/dcSwitch.cxx b/direct/src/dcparser/dcSwitch.cxx index 041533efbe..dba5dacad0 100644 --- a/direct/src/dcparser/dcSwitch.cxx +++ b/direct/src/dcparser/dcSwitch.cxx @@ -42,21 +42,15 @@ DCSwitch:: nassertv(_key_parameter != nullptr); delete _key_parameter; - Cases::iterator ci; - for (ci = _cases.begin(); ci != _cases.end(); ++ci) { - SwitchCase *dcase = (*ci); + for (SwitchCase *dcase : _cases) { delete dcase; } - CaseFields::iterator fi; - for (fi = _case_fields.begin(); fi != _case_fields.end(); ++fi) { - SwitchFields *fields = (*fi); + for (SwitchFields *fields : _case_fields) { delete fields; } - Fields::iterator ni; - for (ni = _nested_fields.begin(); ni != _nested_fields.end(); ++ni) { - DCField *field = (*ni); + for (DCField *field : _nested_fields) { delete field; } } diff --git a/dtool/src/cppparser/cppManifest.cxx b/dtool/src/cppparser/cppManifest.cxx index 2fc85783a7..fb3a19554d 100644 --- a/dtool/src/cppparser/cppManifest.cxx +++ b/dtool/src/cppparser/cppManifest.cxx @@ -127,9 +127,7 @@ CPPManifest(const string ¯o, const string &definition) : */ CPPManifest:: ~CPPManifest() { - if (_expr != nullptr) { - delete _expr; - } + delete _expr; } /** diff --git a/panda/src/downloader/bioStreamPtr.cxx b/panda/src/downloader/bioStreamPtr.cxx index 6444703b16..d7454da760 100644 --- a/panda/src/downloader/bioStreamPtr.cxx +++ b/panda/src/downloader/bioStreamPtr.cxx @@ -20,10 +20,8 @@ */ BioStreamPtr:: ~BioStreamPtr() { - if (_stream != nullptr) { - delete _stream; - _stream = nullptr; - } + delete _stream; + _stream = nullptr; } #endif // HAVE_OPENSSL diff --git a/panda/src/egg/eggTransform.I b/panda/src/egg/eggTransform.I index e6bccb6819..2896fc0d93 100644 --- a/panda/src/egg/eggTransform.I +++ b/panda/src/egg/eggTransform.I @@ -93,18 +93,10 @@ operator = (const EggTransform::Component ©) { */ INLINE EggTransform::Component:: ~Component() { - if (_vec2 != nullptr) { - delete _vec2; - } - if (_vec3 != nullptr) { - delete _vec3; - } - if (_mat3 != nullptr) { - delete _mat3; - } - if (_mat4 != nullptr) { - delete _mat4; - } + delete _vec2; + delete _vec3; + delete _mat3; + delete _mat4; } /** diff --git a/panda/src/express/multifile.cxx b/panda/src/express/multifile.cxx index f7055d2467..8179a76fa5 100644 --- a/panda/src/express/multifile.cxx +++ b/panda/src/express/multifile.cxx @@ -337,7 +337,7 @@ close() { if (!_read->unref()) { delete _read; } - } else if (_write != nullptr) { + } else { delete _write; } } diff --git a/panda/src/gobj/geomVertexColumn.cxx b/panda/src/gobj/geomVertexColumn.cxx index 9e6c7bd188..f6554fc8c1 100644 --- a/panda/src/gobj/geomVertexColumn.cxx +++ b/panda/src/gobj/geomVertexColumn.cxx @@ -228,10 +228,7 @@ setup() { } _total_bytes = _element_stride * _num_elements; - if (_packer != nullptr) { - delete _packer; - } - + delete _packer; _packer = make_packer(); _packer->_column = this; } diff --git a/panda/src/grutil/meshDrawer.I b/panda/src/grutil/meshDrawer.I index 030f646cb9..28a351bb2a 100644 --- a/panda/src/grutil/meshDrawer.I +++ b/panda/src/grutil/meshDrawer.I @@ -35,10 +35,10 @@ MeshDrawer() { INLINE MeshDrawer:: ~MeshDrawer() { _root.remove_node(); - if (_vertex != nullptr) delete _vertex; - if (_normal != nullptr) delete _normal; - if (_uv != nullptr) delete _uv; - if (_color != nullptr) delete _color; + delete _vertex; + delete _normal; + delete _uv; + delete _color; } /** diff --git a/panda/src/grutil/meshDrawer.cxx b/panda/src/grutil/meshDrawer.cxx index b87380d3b8..24ff840187 100644 --- a/panda/src/grutil/meshDrawer.cxx +++ b/panda/src/grutil/meshDrawer.cxx @@ -104,10 +104,10 @@ void MeshDrawer::begin(NodePath camera, NodePath render) { _b4 = - _right + _up; // recreate our rewriters - if (_vertex != nullptr) delete _vertex; - if (_normal != nullptr) delete _normal; - if (_uv != nullptr) delete _uv; - if (_color != nullptr) delete _color; + delete _vertex; + delete _normal; + delete _uv; + delete _color; if (_vdata == nullptr) { generator(_budget); diff --git a/panda/src/grutil/meshDrawer2D.I b/panda/src/grutil/meshDrawer2D.I index 4ff460c567..4a17a739f1 100644 --- a/panda/src/grutil/meshDrawer2D.I +++ b/panda/src/grutil/meshDrawer2D.I @@ -37,9 +37,9 @@ MeshDrawer2D() { INLINE MeshDrawer2D:: ~MeshDrawer2D() { _root.remove_node(); - if (_vertex != nullptr) delete _vertex; - if (_uv != nullptr) delete _uv; - if (_color != nullptr) delete _color; + delete _vertex; + delete _uv; + delete _color; } /** diff --git a/panda/src/pgraph/transformState.cxx b/panda/src/pgraph/transformState.cxx index 805e8da119..916280ff1c 100644 --- a/panda/src/pgraph/transformState.cxx +++ b/panda/src/pgraph/transformState.cxx @@ -81,10 +81,8 @@ TransformState:: set_destructing(); // Free the inverse matrix computation, if it has been stored. - if (_inv_mat != nullptr) { - delete _inv_mat; - _inv_mat = nullptr; - } + delete _inv_mat; + _inv_mat = nullptr; LightReMutexHolder holder(*_states_lock); diff --git a/pandatool/src/daeegg/daeToEggConverter.cxx b/pandatool/src/daeegg/daeToEggConverter.cxx index 7e5aa6673e..95b146decb 100644 --- a/pandatool/src/daeegg/daeToEggConverter.cxx +++ b/pandatool/src/daeegg/daeToEggConverter.cxx @@ -78,9 +78,7 @@ DAEToEggConverter(const DAEToEggConverter ©) : */ DAEToEggConverter:: ~DAEToEggConverter() { - if (_error_handler != nullptr) { - delete _error_handler; - } + delete _error_handler; } /** diff --git a/pandatool/src/eggcharbase/eggCharacterFilter.cxx b/pandatool/src/eggcharbase/eggCharacterFilter.cxx index 9b23e7804d..02289dbe0d 100644 --- a/pandatool/src/eggcharbase/eggCharacterFilter.cxx +++ b/pandatool/src/eggcharbase/eggCharacterFilter.cxx @@ -31,9 +31,7 @@ EggCharacterFilter() : EggMultiFilter(false) { */ EggCharacterFilter:: ~EggCharacterFilter() { - if (_collection != nullptr) { - delete _collection; - } + delete _collection; } /** diff --git a/pandatool/src/eggcharbase/eggComponentData.cxx b/pandatool/src/eggcharbase/eggComponentData.cxx index 5af9dd3d57..ab57e5bd53 100644 --- a/pandatool/src/eggcharbase/eggComponentData.cxx +++ b/pandatool/src/eggcharbase/eggComponentData.cxx @@ -36,12 +36,8 @@ EggComponentData(EggCharacterCollection *collection, */ EggComponentData:: ~EggComponentData() { - BackPointers::iterator bpi; - for (bpi = _back_pointers.begin(); bpi != _back_pointers.end(); ++bpi) { - EggBackPointer *back = (*bpi); - if (back != nullptr) { - delete back; - } + for (EggBackPointer *back : _back_pointers) { + delete back; } } diff --git a/pandatool/src/flt/fltRecordReader.cxx b/pandatool/src/flt/fltRecordReader.cxx index eb3ba94840..8e1993c90a 100644 --- a/pandatool/src/flt/fltRecordReader.cxx +++ b/pandatool/src/flt/fltRecordReader.cxx @@ -42,10 +42,8 @@ FltRecordReader(std::istream &in) : */ FltRecordReader:: ~FltRecordReader() { - if (_iterator != nullptr) { - delete _iterator; - _iterator = nullptr; - } + delete _iterator; + _iterator = nullptr; } /** diff --git a/pandatool/src/lwoegg/cLwoSurface.cxx b/pandatool/src/lwoegg/cLwoSurface.cxx index 63559dd62f..1bb0c14678 100644 --- a/pandatool/src/lwoegg/cLwoSurface.cxx +++ b/pandatool/src/lwoegg/cLwoSurface.cxx @@ -146,9 +146,7 @@ CLwoSurface(LwoToEggConverter *converter, const LwoSurface *surface) : */ CLwoSurface:: ~CLwoSurface() { - if (_block != nullptr) { - delete _block; - } + delete _block; } /** diff --git a/pandatool/src/lwoegg/cLwoSurfaceBlock.cxx b/pandatool/src/lwoegg/cLwoSurfaceBlock.cxx index 98d4c502f0..ebf5a5ac95 100644 --- a/pandatool/src/lwoegg/cLwoSurfaceBlock.cxx +++ b/pandatool/src/lwoegg/cLwoSurfaceBlock.cxx @@ -144,7 +144,5 @@ CLwoSurfaceBlock(LwoToEggConverter *converter, const LwoSurfaceBlock *block) : */ CLwoSurfaceBlock:: ~CLwoSurfaceBlock() { - if (_tmap != nullptr) { - delete _tmap; - } + delete _tmap; } diff --git a/pandatool/src/maya/mayaShaderColorDef.cxx b/pandatool/src/maya/mayaShaderColorDef.cxx index cbaa82d5b7..38aa294949 100644 --- a/pandatool/src/maya/mayaShaderColorDef.cxx +++ b/pandatool/src/maya/mayaShaderColorDef.cxx @@ -131,9 +131,7 @@ MayaShaderColorDef(MayaShaderColorDef ©) { */ MayaShaderColorDef:: ~MayaShaderColorDef() { - if (_color_object != nullptr) { - delete _color_object; - } + delete _color_object; } /** diff --git a/pandatool/src/mayaegg/mayaNodeDesc.cxx b/pandatool/src/mayaegg/mayaNodeDesc.cxx index 8a86f1cb96..2c251ac9ca 100644 --- a/pandatool/src/mayaegg/mayaNodeDesc.cxx +++ b/pandatool/src/mayaegg/mayaNodeDesc.cxx @@ -72,9 +72,7 @@ MayaNodeDesc(MayaNodeTree *tree, MayaNodeDesc *parent, const string &name) : */ MayaNodeDesc:: ~MayaNodeDesc() { - if (_dag_path != nullptr) { - delete _dag_path; - } + delete _dag_path; } /** diff --git a/pandatool/src/pstatserver/pStatThreadData.cxx b/pandatool/src/pstatserver/pStatThreadData.cxx index bef18c8a24..141f927e8f 100644 --- a/pandatool/src/pstatserver/pStatThreadData.cxx +++ b/pandatool/src/pstatserver/pStatThreadData.cxx @@ -269,9 +269,7 @@ record_new_frame(int frame_number, PStatFrameData *frame_data) { (_frames.front() == nullptr || _frames.front()->is_empty() || _frames.front()->get_start() < oldest_allowable_time)) { - if (_frames.front() != nullptr) { - delete _frames.front(); - } + delete _frames.front(); _frames.pop_front(); _first_frame_number++; }