From 4db72f2d554f3f7002bf22ce93ab3ee14f7f044b Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 7 Jul 2022 12:38:34 +0200 Subject: [PATCH] Fix minor compil and Coverity warnings. --- eeschema/dialogs/dialog_bom.cpp | 2 +- kicad/pcm/dialogs/dialog_pcm.cpp | 3 +++ kicad/pcm/dialogs/panel_packages_view.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp index a758c384ea..7ad0df51e1 100644 --- a/eeschema/dialogs/dialog_bom.cpp +++ b/eeschema/dialogs/dialog_bom.cpp @@ -235,7 +235,7 @@ BOM_GENERATOR_HANDLER* DIALOG_BOM::addGenerator( const wxString& aPath, const wx BOM_GENERATOR_HANDLER* ret = nullptr; auto plugin = std::make_unique( aPath ); - if( !plugin ) + if( !plugin->IsOk() ) return nullptr; if( !aName.IsEmpty() ) diff --git a/kicad/pcm/dialogs/dialog_pcm.cpp b/kicad/pcm/dialogs/dialog_pcm.cpp index 7f88646312..eb0662d8b1 100644 --- a/kicad/pcm/dialogs/dialog_pcm.cpp +++ b/kicad/pcm/dialogs/dialog_pcm.cpp @@ -93,11 +93,13 @@ DIALOG_PCM::DIALOG_PCM( wxWindow* parent ) : DIALOG_PCM_BASE( parent ) switch( aAction ) { + default: case PPA_INSTALL: m_gridPendingActions->SetCellValue( row, PENDING_COL_ACTION, _( "Install" ) ); m_gridPendingActions->SetCellValue( row, PENDING_COL_VERSION, aVersion ); new_state = PPS_PENDING_INSTALL; break; + case PPA_UPDATE: m_gridPendingActions->SetCellValue( row, PENDING_COL_ACTION, _( "Update" ) ); m_gridPendingActions->SetCellValue( @@ -105,6 +107,7 @@ DIALOG_PCM::DIALOG_PCM( wxWindow* parent ) : DIALOG_PCM_BASE( parent ) wxString::Format( wxT( "%s \u279C %s" ), aData.current_version, aVersion ) ); new_state = PPS_PENDING_UPDATE; break; + case PPA_UNINSTALL: m_gridPendingActions->SetCellValue( row, PENDING_COL_ACTION, _( "Uninstall" ) ); m_gridPendingActions->SetCellValue( diff --git a/kicad/pcm/dialogs/panel_packages_view.cpp b/kicad/pcm/dialogs/panel_packages_view.cpp index 090254a788..79185696d3 100644 --- a/kicad/pcm/dialogs/panel_packages_view.cpp +++ b/kicad/pcm/dialogs/panel_packages_view.cpp @@ -567,7 +567,7 @@ void PANEL_PACKAGES_VIEW::OnVersionActionClicked( wxCommandEvent& event ) return ver.version == version; } ); - wxASSERT_MSG( ver_it != package.versions.end(), "Could not find package version" ); + wxCHECK_RET( ver_it != package.versions.end(), "Could not find package version" ); if( !ver_it->compatible && wxMessageBox( _( "This package version is incompatible with your kicad version or "