clang-analyzer-deadcode.DeadStores

Change-Id: I03769bd4105e4e1d140b2885978ea9da9ef866de
This commit is contained in:
Stephan Bergmann 2015-10-06 15:00:29 +02:00
parent 5e02785ff1
commit e8233e1510

View File

@ -682,8 +682,8 @@ void implRemoveDirRecursive( const OUString& aDirPath )
FileStatus aFileStatus( osl_FileStatus_Mask_Type ); FileStatus aFileStatus( osl_FileStatus_Mask_Type );
nRet = aItem.getFileStatus( aFileStatus ); nRet = aItem.getFileStatus( aFileStatus );
FileStatus::Type aType = aFileStatus.getFileType(); bool bFolder = nRet == FileBase::E_None
bool bFolder = isFolder( aType ); && isFolder( aFileStatus.getFileType() );
if( !bExists || !bFolder ) if( !bExists || !bFolder )
{ {
@ -710,6 +710,11 @@ void implRemoveDirRecursive( const OUString& aDirPath )
// Handle flags // Handle flags
FileStatus aFileStatus2( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL ); FileStatus aFileStatus2( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL );
nRet = aItem2.getFileStatus( aFileStatus2 ); nRet = aItem2.getFileStatus( aFileStatus2 );
if( nRet != FileBase::E_None )
{
SAL_WARN("basic", "getFileStatus failed");
continue;
}
OUString aPath = aFileStatus2.getFileURL(); OUString aPath = aFileStatus2.getFileURL();
// Directory? // Directory?
@ -3056,6 +3061,11 @@ RTLFUNC(Dir)
// Handle flags // Handle flags
FileStatus aFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName ); FileStatus aFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName );
nRet = aItem.getFileStatus( aFileStatus ); nRet = aItem.getFileStatus( aFileStatus );
if( nRet != FileBase::E_None )
{
SAL_WARN("basic", "getFileStatus failed");
continue;
}
// Only directories? // Only directories?
if( bFolderFlag ) if( bFolderFlag )