sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix logically dead code identified by Coverity

Browse Source
This commit is contained in:
Nyall Dawson 2017-02-06 10:16:44 +10:00
parent a80cca0fb3
commit 737c92ddbb
2 changed files with 46 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/app/dwg/qgsdwgimporter.cpp
View File

@ -635,56 +635,54 @@ bool QgsDwgImporter::import( const QString &drawing, QString &error, bool doExpa
return false; return false;
} }
switch ( result )
{
case DRW::BAD_NONE:
error = QObject::tr( "No error." );
break;
case DRW::BAD_UNKNOWN:
error = QObject::tr( "Unknown error." );
break;
case DRW::BAD_OPEN:
error = QObject::tr( "error opening file." );
break;
case DRW::BAD_VERSION:
error = QObject::tr( "unsupported version." );
break;
case DRW::BAD_READ_METADATA:
error = QObject::tr( "error reading metadata." );
break;
case DRW::BAD_READ_FILE_HEADER:
error = QObject::tr( "error in file header read process." );
break;
case DRW::BAD_READ_HEADER:
error = QObject::tr( "error in header vars read process." );
break;
case DRW::BAD_READ_HANDLES:
error = QObject::tr( "error in object map read process." );
break;
case DRW::BAD_READ_CLASSES:
error = QObject::tr( "error in classes read process." );
break;
case DRW::BAD_READ_TABLES:
error = QObject::tr( "error in tables read process." );
result = DRW::BAD_NONE;
break;
case DRW::BAD_READ_BLOCKS:
error = QObject::tr( "error in block read process." );
break;
case DRW::BAD_READ_ENTITIES:
error = QObject::tr( "error in entities read process." );
break;
case DRW::BAD_READ_OBJECTS:
error = QObject::tr( "error in objects read process." );
break;
}
if ( result != DRW::BAD_NONE ) if ( result != DRW::BAD_NONE )
{ {
switch ( result )
{
case DRW::BAD_NONE:
error = QObject::tr( "No error." );
break;
case DRW::BAD_UNKNOWN:
error = QObject::tr( "Unknown error." );
break;
case DRW::BAD_OPEN:
error = QObject::tr( "error opening file." );
break;
case DRW::BAD_VERSION:
error = QObject::tr( "unsupported version." );
break;
case DRW::BAD_READ_METADATA:
error = QObject::tr( "error reading metadata." );
break;
case DRW::BAD_READ_FILE_HEADER:
error = QObject::tr( "error in file header read process." );
break;
case DRW::BAD_READ_HEADER:
error = QObject::tr( "error in header vars read process." );
break;
case DRW::BAD_READ_HANDLES:
error = QObject::tr( "error in object map read process." );
break;
case DRW::BAD_READ_CLASSES:
error = QObject::tr( "error in classes read process." );
break;
case DRW::BAD_READ_TABLES:
error = QObject::tr( "error in tables read process." );
result = DRW::BAD_NONE;
break;
case DRW::BAD_READ_BLOCKS:
error = QObject::tr( "error in block read process." );
break;
case DRW::BAD_READ_ENTITIES:
error = QObject::tr( "error in entities read process." );
break;
case DRW::BAD_READ_OBJECTS:
error = QObject::tr( "error in objects read process." );
break;
}
QgsDebugMsg( QString( "error:%1" ).arg( error ) ); QgsDebugMsg( QString( "error:%1" ).arg( error ) );
return false;
if ( result != DRW::BAD_NONE )
return false;
} }
return !doExpandInserts || expandInserts( error ); return !doExpandInserts || expandInserts( error );
@ -2553,7 +2551,7 @@ bool QgsDwgImporter::expandInserts( QString &error )
OGRFeatureH insert = nullptr; OGRFeatureH insert = nullptr;
int i = 0, errors = 0; int i = 0, errors = 0;
for ( int i = 0, errors = 0; true; ++i ) for ( int i = 0; true; ++i )
{ {
if ( i % 1000 == 0 ) if ( i % 1000 == 0 )
{ {
@ -2731,18 +2729,12 @@ bool QgsDwgImporter::expandInserts( QString &error )
++j; ++j;
} }
if ( f )
OGR_F_Destroy( f );
OGR_DS_ReleaseResultSet( mDs, src ); OGR_DS_ReleaseResultSet( mDs, src );
QgsDebugMsgLevel( QString( "%1: %2 features copied" ).arg( name ).arg( j ), 5 ); QgsDebugMsgLevel( QString( "%1: %2 features copied" ).arg( name ).arg( j ), 5 );
} }
} }
if ( insert )
OGR_F_Destroy( insert );
if ( errors > 0 ) if ( errors > 0 )
{ {
error = QObject::tr( "%1 write errors during block expansion" ).arg( errors ); error = QObject::tr( "%1 write errors during block expansion" ).arg( errors );

3
src/server/services/wfs/qgswfstransaction.cpp
View File

@ -485,9 +485,6 @@ namespace QgsWfs
respElem.appendChild( trElem ); respElem.appendChild( trElem );
return resp; return resp;
return doc;
} }
namespace namespace