cppcheck: false positive deallocuse

Help cppcheck by returning early and remove a now useless bool var

Change-Id: If4dcb6f64bcfd6c3cb22136163caf3679d6fd5a8
This commit is contained in:
Julien Nabet
2015-12-20 22:17:36 +01:00
parent f909e39f98
commit 36984c75cc

View File

@@ -1206,16 +1206,13 @@ void SbiParser::DefProc( bool bStatic, bool bPrivate )
SbiSymDef* pOld = aPublics.Find( pDef->GetName() );
if( pOld )
{
bool bError_ = false;
pProc = pOld->GetProcDef();
if( !pProc )
{
// Declared as a variable
Error( ERRCODE_BASIC_BAD_DECLARATION, pDef->GetName() );
delete pDef;
pProc = nullptr;
bError_ = true;
return;
}
// #100027: Multiple declaration -> Error
// #112787: Not for setup, REMOVE for 8
@@ -1226,16 +1223,12 @@ void SbiParser::DefProc( bool bStatic, bool bPrivate )
{
Error( ERRCODE_BASIC_PROC_DEFINED, pDef->GetName() );
delete pDef;
pProc = nullptr;
bError_ = true;
return;
}
}
if( !bError_ )
{
pDef->Match( pProc );
pProc = pDef;
}
pDef->Match( pProc );
pProc = pDef;
}
else
{