tidy: Remove extraneous 'if' checks before calling delete. (libmythtv)

According to the c++ reference, deleting a null pointer has no effect, so non-null checks are unnecessary. https://clang.llvm.org/extra/clang-tidy/checks/readability-delete-null-pointer.html
MythTV · Nov 23, 2019 · 7e523ef · 7e523ef
1 parent bec6a23
commit 7e523ef
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 48 deletions.
diff --git a/mythplugins/mythmusic/mythmusic/decoder.h b/mythplugins/mythmusic/mythmusic/decoder.h
@@ -35,8 +35,7 @@ class DecoderEvent : public MythEvent
 
     ~DecoderEvent()
     {
-        if (m_error_msg)
-            delete m_error_msg;
+        delete m_error_msg;
     }
 
     const QString *errorMessage() const { return m_error_msg; }

diff --git a/mythplugins/mythmusic/mythmusic/remoteavformatcontext.h b/mythplugins/mythmusic/mythmusic/remoteavformatcontext.h
@@ -42,8 +42,7 @@ class RemoteAVFormatContext
             avformat_free_context(m_inputFC);
         m_inputFC = avformat_alloc_context();
 
-        if (m_rf)
-            delete m_rf;
+        delete m_rf;
 
         m_inputIsRemote = filename.startsWith("myth://");
         if (m_inputIsRemote)
@@ -122,11 +121,8 @@ class RemoteAVFormatContext
             m_inputFC = nullptr;
         }
 
-        if (m_rf)
-        {
-            delete m_rf;
-            m_rf = nullptr;
-        }
+        delete m_rf;
+        m_rf = nullptr;
 
         m_isOpen = false;
     }

diff --git a/mythtv/libs/libmythtv/cc608reader.h b/mythtv/libs/libmythtv/cc608reader.h
@@ -43,8 +43,7 @@ class CC608Buffer
         for (; i != buffers.end(); ++i)
         {
             CC608Text *cc = (*i);
-            if (cc)
-                delete cc;
+            delete cc;
         }
         buffers.clear();
         lock.unlock();

diff --git a/mythtv/libs/libmythtv/mheg/dsmccreceiver.h b/mythtv/libs/libmythtv/mheg/dsmccreceiver.h
@@ -13,8 +13,7 @@ class DsmccDii
     DsmccDii() = default;
     ~DsmccDii()
     {
-        if (m_modules)
-            delete[] m_modules;
+        delete[] m_modules;
     }
 
     unsigned long    m_download_id          {0};

diff --git a/mythtv/libs/libmythtv/mpeg/mpegstreamdata.h b/mythtv/libs/libmythtv/mpeg/mpegstreamdata.h
@@ -387,15 +387,13 @@ class MTV_PUBLIC MPEGStreamData : public EITSource
 
 inline void MPEGStreamData::SetPATSingleProgram(ProgramAssociationTable* pat)
 {
-    if (_pat_single_program)
-        delete _pat_single_program;
+    delete _pat_single_program;
     _pat_single_program = pat;
 }
 
 inline void MPEGStreamData::SetPMTSingleProgram(ProgramMapTable* pmt)
 {
-    if (_pmt_single_program)
-        delete _pmt_single_program;
+    delete _pmt_single_program;
     _pmt_single_program = pmt;
 }
 

diff --git a/mythtv/libs/libmythtv/opengl/mythvideooutopengl.cpp b/mythtv/libs/libmythtv/opengl/mythvideooutopengl.cpp
@@ -179,8 +179,7 @@ MythVideoOutputOpenGL::~MythVideoOutputOpenGL()
     m_openGLVideoPiPsReady.clear();
     if (m_openGLPainter)
         m_openGLPainter->SetSwapControl(true);
-    if (m_openGLVideo)
-        delete m_openGLVideo;
+    delete m_openGLVideo;
     if (m_render)
     {
         m_render->makeCurrent();

diff --git a/mythtv/libs/libmythtv/opengl/mythvideotexture.cpp b/mythtv/libs/libmythtv/opengl/mythvideotexture.cpp
@@ -20,14 +20,10 @@ void MythVideoTexture::DeleteTexture(MythRenderOpenGL *Context, MythVideoTexture
         return;
 
      OpenGLLocker locker(Context);
-     if (Texture->m_copyContext)
-         delete Texture->m_copyContext;
-     if (Texture->m_texture)
-         delete Texture->m_texture;
-     if (Texture->m_data)
-         delete [] Texture->m_data;
-     if (Texture->m_vbo)
-         delete Texture->m_vbo;
+     delete Texture->m_copyContext;
+     delete Texture->m_texture;
+     delete [] Texture->m_data;
+     delete Texture->m_vbo;
 
      delete Texture;
 }

diff --git a/mythtv/libs/libmythtv/visualisations/videovisualdefs.h b/mythtv/libs/libmythtv/visualisations/videovisualdefs.h
@@ -14,8 +14,7 @@ class LogScale
 
    ~LogScale()
     {
-        if (indices)
-            delete [] indices;
+        delete [] indices;
     }
 
     int scale() const { return s; }
@@ -29,8 +28,7 @@ class LogScale
         s = maxscale;
         r = maxrange;
 
-        if (indices)
-            delete [] indices;
+        delete [] indices;
 
         double alpha;
         long double domain = (long double) maxscale;

diff --git a/mythtv/libs/libmythui/opengl/mythrenderopengl.cpp b/mythtv/libs/libmythui/opengl/mythrenderopengl.cpp
@@ -700,12 +700,9 @@ void MythRenderOpenGL::DeleteTexture(MythGLTexture *Texture)
 
     makeCurrent();
     // N.B. Don't delete m_textureId - it is owned externally
-    if (Texture->m_texture)
-        delete Texture->m_texture;
-    if (Texture->m_data)
-        delete [] Texture->m_data;
-    if (Texture->m_vbo)
-        delete Texture->m_vbo;
+    delete Texture->m_texture;
+    delete [] Texture->m_data;
+    delete Texture->m_vbo;
     delete Texture;
     Flush();
     doneCurrent();
@@ -1227,8 +1224,7 @@ void MythRenderOpenGL::ReleaseResources(void)
     }
     if (VERBOSE_LEVEL_CHECK(VB_GPU, LOG_INFO))
         logDebugMarker("RENDER_RELEASE_END");
-    if (m_openglDebugger)
-        delete m_openglDebugger;
+    delete m_openglDebugger;
     m_openglDebugger = nullptr;
     Flush();
 
@@ -1524,8 +1520,7 @@ QOpenGLShaderProgram *MythRenderOpenGL::CreateShaderProgram(const QString &Verte
 void MythRenderOpenGL::DeleteShaderProgram(QOpenGLShaderProgram *Program)
 {
     makeCurrent();
-    if (Program)
-        delete Program;
+    delete Program;
     m_cachedMatrixUniforms.clear();
     m_activeProgram = nullptr;
     m_cachedUniformLocations.remove(Program);

diff --git a/mythtv/libs/libmythupnp/upnpdevice.h b/mythtv/libs/libmythupnp/upnpdevice.h
@@ -217,8 +217,7 @@ class UPNP_PUBLIC DeviceLocation : public ReferenceCounter
             // Should be atomic decrement
             g_nAllocated--;
 
-            if (m_pDeviceDesc != nullptr)
-                delete m_pDeviceDesc;
+            delete m_pDeviceDesc;
         }
 
         UPnpDeviceDesc *m_pDeviceDesc;  // We take ownership of this pointer.

diff --git a/mythtv/libs/libmythupnp/upnputil.h b/mythtv/libs/libmythupnp/upnputil.h
@@ -117,11 +117,8 @@ inline NameValue& NameValue::operator=(const NameValue &nv)
 
 inline NameValue::~NameValue()
 {
-    if (m_pAttributes)
-    {
-        delete m_pAttributes;
-        m_pAttributes = nullptr;
-    }
+    delete m_pAttributes;
+    m_pAttributes = nullptr;
 }
 
 inline void NameValue::AddAttribute(const QString &name, const QString &value,