From 0ca45d1a59a51e6798b99eaa0e7fdbbcc33c3992 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 2 Feb 2020 23:51:39 -0800 Subject: [PATCH] Remove redundant checks for NULL before calling delete --- include/wx/dataview.h | 2 +- include/wx/dnd.h | 2 +- include/wx/encconv.h | 2 +- src/common/clntdata.cpp | 4 +--- src/common/cmndata.cpp | 3 +-- src/common/ctrlsub.cpp | 3 +-- src/common/datavcmn.cpp | 3 +-- src/common/event.cpp | 3 +-- src/common/fmapbase.cpp | 3 +-- src/common/fswatchercmn.cpp | 5 +---- src/common/gbsizer.cpp | 24 +++++++++--------------- src/common/mediactrlcmn.cpp | 3 +-- src/common/mimecmn.cpp | 6 ++---- src/common/prntbase.cpp | 13 ++++--------- src/common/wincmn.cpp | 13 +++---------- src/generic/dirctrlg.cpp | 2 +- src/generic/dragimgg.cpp | 5 +---- src/generic/printps.cpp | 2 +- src/gtk/window.cpp | 2 +- src/html/helpwnd.cpp | 6 +++--- src/html/m_image.cpp | 3 +-- src/unix/dialup.cpp | 2 +- src/unix/fswatcher_inotify.cpp | 3 +-- 23 files changed, 39 insertions(+), 75 deletions(-) diff --git a/include/wx/dataview.h b/include/wx/dataview.h index 61ce45e2de..99b620d84d 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -1213,7 +1213,7 @@ public: const wxIcon &GetIcon() const { return m_icon; } void SetData( wxClientData *data ) - { if (m_data) delete m_data; m_data = data; } + { delete m_data; m_data = data; } wxClientData *GetData() const { return m_data; } diff --git a/include/wx/dnd.h b/include/wx/dnd.h index 2f3f333329..cb158927d2 100644 --- a/include/wx/dnd.h +++ b/include/wx/dnd.h @@ -144,7 +144,7 @@ public: wxDataObject *GetDataObject() const { return m_dataObject; } void SetDataObject(wxDataObject *dataObject) - { if (m_dataObject) delete m_dataObject; + { delete m_dataObject; m_dataObject = dataObject; } // these functions are called when data is moved over position (x, y) and diff --git a/include/wx/encconv.h b/include/wx/encconv.h index 7c49465f51..cf1360ec07 100644 --- a/include/wx/encconv.h +++ b/include/wx/encconv.h @@ -53,7 +53,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject public: wxEncodingConverter(); - virtual ~wxEncodingConverter() { if (m_Table) delete[] m_Table; } + virtual ~wxEncodingConverter() { delete[] m_Table; } // Initialize conversion. Both output or input encoding may // be wxFONTENCODING_UNICODE. diff --git a/src/common/clntdata.cpp b/src/common/clntdata.cpp index 1cb5595785..8ecddc2241 100644 --- a/src/common/clntdata.cpp +++ b/src/common/clntdata.cpp @@ -40,9 +40,7 @@ void wxClientDataContainer::DoSetClientObject( wxClientData *data ) wxASSERT_MSG( m_clientDataType != wxClientData_Void, wxT("can't have both object and void client data") ); - if ( m_clientObject ) - delete m_clientObject; - + delete m_clientObject; m_clientObject = data; m_clientDataType = wxClientData_Object; } diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp index 92b8ba4633..3361c17d04 100644 --- a/src/common/cmndata.cpp +++ b/src/common/cmndata.cpp @@ -107,8 +107,7 @@ wxPrintData::~wxPrintData() if (m_nativeData->m_ref == 0) delete m_nativeData; - if (m_privData) - delete [] m_privData; + delete[] m_privData; } void wxPrintData::ConvertToNative() diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp index 03435b7056..d680c3c1ca 100644 --- a/src/common/ctrlsub.cpp +++ b/src/common/ctrlsub.cpp @@ -170,8 +170,7 @@ void wxItemContainer::SetClientObject(unsigned int n, wxClientData *data) { wxClientData * clientDataOld = static_cast(DoGetItemClientData(n)); - if ( clientDataOld ) - delete clientDataOld; + delete clientDataOld; } else // didn't have any client data so far { diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 1099b653a6..76073485e1 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -2485,8 +2485,7 @@ wxDataViewTreeStoreNode::wxDataViewTreeStoreNode( wxDataViewTreeStoreNode::~wxDataViewTreeStoreNode() { - if (m_data) - delete m_data; + delete m_data; } wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode( diff --git a/src/common/event.cpp b/src/common/event.cpp index 83820b54b4..e453b9694e 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -1919,8 +1919,7 @@ void wxEvtHandler::DoSetClientObject( wxClientData *data ) wxASSERT_MSG( m_clientDataType != wxClientData_Void, wxT("can't have both object and void client data") ); - if ( m_clientObject ) - delete m_clientObject; + delete m_clientObject; m_clientObject = data; m_clientDataType = wxClientData_Object; diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp index 0c434aef67..1fafeb4234 100644 --- a/src/common/fmapbase.cpp +++ b/src/common/fmapbase.cpp @@ -407,8 +407,7 @@ wxFontMapperBase::wxFontMapperBase() wxFontMapperBase::~wxFontMapperBase() { #if wxUSE_CONFIG && wxUSE_FILECONFIG - if ( m_configDummy ) - delete m_configDummy; + delete m_configDummy; #endif // wxUSE_CONFIG } diff --git a/src/common/fswatchercmn.cpp b/src/common/fswatchercmn.cpp index 133aaa5a2d..f54acd467c 100644 --- a/src/common/fswatchercmn.cpp +++ b/src/common/fswatchercmn.cpp @@ -87,10 +87,7 @@ wxFileSystemWatcherBase::wxFileSystemWatcherBase() : wxFileSystemWatcherBase::~wxFileSystemWatcherBase() { RemoveAll(); - if (m_service) - { - delete m_service; - } + delete m_service; } bool wxFileSystemWatcherBase::Add(const wxFileName& path, int events) diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp index 1f4e7d25cf..1d43e408e0 100644 --- a/src/common/gbsizer.cpp +++ b/src/common/gbsizer.cpp @@ -182,11 +182,9 @@ wxSizerItem* wxGridBagSizer::Add( wxWindow *window, wxGBSizerItem* item = new wxGBSizerItem(window, pos, span, flag, border, userData); if ( Add(item) ) return item; - else - { - delete item; - return NULL; - } + + delete item; + return NULL; } wxSizerItem* wxGridBagSizer::Add( wxSizer *sizer, @@ -196,11 +194,9 @@ wxSizerItem* wxGridBagSizer::Add( wxSizer *sizer, wxGBSizerItem* item = new wxGBSizerItem(sizer, pos, span, flag, border, userData); if ( Add(item) ) return item; - else - { - delete item; - return NULL; - } + + delete item; + return NULL; } wxSizerItem* wxGridBagSizer::Add( int width, int height, @@ -210,11 +206,9 @@ wxSizerItem* wxGridBagSizer::Add( int width, int height, wxGBSizerItem* item = new wxGBSizerItem(width, height, pos, span, flag, border, userData); if ( Add(item) ) return item; - else - { - delete item; - return NULL; - } + + delete item; + return NULL; } wxSizerItem* wxGridBagSizer::Add( wxGBSizerItem *item ) diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp index 1b272d3948..13b2f503d8 100644 --- a/src/common/mediactrlcmn.cpp +++ b/src/common/mediactrlcmn.cpp @@ -269,8 +269,7 @@ const wxClassInfo* wxMediaCtrl::NextBackend(wxClassInfo::const_iterator* it) //--------------------------------------------------------------------------- wxMediaCtrl::~wxMediaCtrl() { - if (m_imp) - delete m_imp; + delete m_imp; } //--------------------------------------------------------------------------- diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp index 175fcb205e..a57e657a33 100644 --- a/src/common/mimecmn.cpp +++ b/src/common/mimecmn.cpp @@ -290,8 +290,7 @@ wxFileType::wxFileType() wxFileType::~wxFileType() { - if ( m_impl ) - delete m_impl; + delete m_impl; } bool wxFileType::GetExtensions(wxArrayString& extensions) @@ -589,8 +588,7 @@ wxMimeTypesManager::wxMimeTypesManager() wxMimeTypesManager::~wxMimeTypesManager() { - if ( m_impl ) - delete m_impl; + delete m_impl; } bool wxMimeTypesManager::Unassociate(wxFileType *ft) diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index 8794308d95..2ec82bc0c0 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -85,9 +85,7 @@ wxPrintFactory *wxPrintFactory::m_factory = NULL; void wxPrintFactory::SetPrintFactory( wxPrintFactory *factory ) { - if (wxPrintFactory::m_factory) - delete wxPrintFactory::m_factory; - + delete wxPrintFactory::m_factory; wxPrintFactory::m_factory = factory; } @@ -1873,12 +1871,9 @@ void wxPrintPreviewBase::Init(wxPrintout *printout, wxPrintPreviewBase::~wxPrintPreviewBase() { - if (m_previewPrintout) - delete m_previewPrintout; - if (m_previewBitmap) - delete m_previewBitmap; - if (m_printPrintout) - delete m_printPrintout; + delete m_previewPrintout; + delete m_previewBitmap; + delete m_printPrintout; } bool wxPrintPreviewBase::SetCurrentPage(int pageNum) diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 9f65f2799b..5d4730ec47 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -1782,11 +1782,7 @@ wxWindow *wxWindowBase::GetAncestorWithCustomPalette() const #if wxUSE_CARET void wxWindowBase::SetCaret(wxCaret *caret) { - if ( m_caret ) - { - delete m_caret; - } - + delete m_caret; m_caret = caret; if ( m_caret ) @@ -1804,8 +1800,7 @@ void wxWindowBase::SetCaret(wxCaret *caret) void wxWindowBase::SetValidator(const wxValidator& validator) { - if ( m_windowValidator ) - delete m_windowValidator; + delete m_windowValidator; m_windowValidator = static_cast(validator.Clone()); @@ -2321,9 +2316,7 @@ void wxWindowBase::DoSetToolTip(wxToolTip *tooltip) { if ( m_tooltip != tooltip ) { - if ( m_tooltip ) - delete m_tooltip; - + delete m_tooltip; m_tooltip = tooltip; } } diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index f5cc1e418d..ef73d79dd2 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -1454,7 +1454,7 @@ wxFileIconsTable::~wxFileIconsTable() WX_CLEAR_HASH_TABLE(*m_HashTable); delete m_HashTable; } - if (m_smallImageList) delete m_smallImageList; + delete m_smallImageList; } // delayed initialization - wait until first use (wxArtProv not created yet) diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp index 9de2d1c401..df9c1b66a5 100644 --- a/src/generic/dragimgg.cpp +++ b/src/generic/dragimgg.cpp @@ -58,10 +58,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxGenericDragImage, wxObject); wxGenericDragImage::~wxGenericDragImage() { - if (m_windowDC) - { - delete m_windowDC; - } + delete m_windowDC; } void wxGenericDragImage::Init() diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp index efcdb879b6..d7284268d9 100644 --- a/src/generic/printps.cpp +++ b/src/generic/printps.cpp @@ -100,7 +100,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro // May have pressed cancel. if (!dc || !dc->IsOk()) { - if (dc) delete dc; + delete dc; sm_lastError = wxPRINTER_ERROR; return false; } diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index f771bbad11..6cde78417e 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -5777,7 +5777,7 @@ void wxWindowGTK::SetDropTarget( wxDropTarget *dropTarget ) if (m_dropTarget) m_dropTarget->GtkUnregisterWidget( dnd_widget ); - if (m_dropTarget) delete m_dropTarget; + delete m_dropTarget; m_dropTarget = dropTarget; if (m_dropTarget) m_dropTarget->GtkRegisterWidget( dnd_widget ); diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp index 1a896be108..d03c710764 100644 --- a/src/html/helpwnd.cpp +++ b/src/html/helpwnd.cpp @@ -605,15 +605,15 @@ wxHtmlHelpWindow::~wxHtmlHelpWindow() // PopEventHandler(); // wxhtmlhelpcontroller (not any more!) if (m_DataCreated) delete m_Data; - if (m_NormalFonts) delete m_NormalFonts; - if (m_FixedFonts) delete m_FixedFonts; + delete m_NormalFonts; + delete m_FixedFonts; if (m_PagesHash) { WX_CLEAR_HASH_TABLE(*m_PagesHash); delete m_PagesHash; } #if wxUSE_PRINTING_ARCHITECTURE - if (m_Printer) delete m_Printer; + delete m_Printer; #endif } diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp index 2d67921074..edef506fd1 100644 --- a/src/html/m_image.cpp +++ b/src/html/m_image.cpp @@ -757,8 +757,7 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") cel->SetId(tag.GetParam(wxT("id"))); // may be empty cel->SetAlt(tag.GetParam(wxT("alt"))); m_WParser->GetContainer()->InsertCell(cel); - if (str) - delete str; + delete str; } } if (tag.GetName() == wxT("MAP")) diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp index 277c4ff9f9..3bce0e2211 100644 --- a/src/unix/dialup.cpp +++ b/src/unix/dialup.cpp @@ -304,7 +304,7 @@ wxDialUpManagerImpl::wxDialUpManagerImpl() wxDialUpManagerImpl::~wxDialUpManagerImpl() { - if(m_timer) delete m_timer; + delete m_timer; if(m_DialProcess) { m_DialProcess->Disconnect(); diff --git a/src/unix/fswatcher_inotify.cpp b/src/unix/fswatcher_inotify.cpp index 1571eb51f5..cbfeae3d56 100644 --- a/src/unix/fswatcher_inotify.cpp +++ b/src/unix/fswatcher_inotify.cpp @@ -703,8 +703,7 @@ wxInotifyFileSystemWatcher::wxInotifyFileSystemWatcher(const wxFileName& path, { if (!Init()) { - if (m_service) - delete m_service; + delete m_service; return; }