Merge pull request #4926 from nyalldawson/coverity_158026

nyalldawson · web-flow · commit b5c2253f0da4 · 2017-08-07T05:29:20.000+10:00
Fix coverity identical code for different branches warning
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -1126,10 +1126,7 @@ namespace QgsWms
             QgsVectorLayer *vectorLayer = qobject_cast<QgsVectorLayer *>( layer );
             if ( vectorLayer )
             {
-              if ( !featureInfoFromVectorLayer( vectorLayer, infoPoint.get(), featureCount, result, layerElement, mapSettings, renderContext, version, featuresRect.get(), filterGeom.get() ) )
-              {
-                break;
-              }
+              ( void )featureInfoFromVectorLayer( vectorLayer, infoPoint.get(), featureCount, result, layerElement, mapSettings, renderContext, version, featuresRect.get(), filterGeom.get() );
               break;
             }
           }
@@ -1149,10 +1146,7 @@ namespace QgsWms
                 break;
               }
               QgsPointXY layerInfoPoint = mapSettings.mapToLayerCoordinates( layer, *( infoPoint.get() ) );
-              if ( !featureInfoFromRasterLayer( rasterLayer, mapSettings, &layerInfoPoint, result, layerElement, version ) )
-              {
-                break;
-              }
+              ( void )featureInfoFromRasterLayer( rasterLayer, mapSettings, &layerInfoPoint, result, layerElement, version );
               break;
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -1126,10 +1126,7 @@ namespace QgsWms`
`1126`	`1126`	`QgsVectorLayer vectorLayer = qobject_cast<QgsVectorLayer >( layer );`
`1127`	`1127`	`if ( vectorLayer )`
`1128`	`1128`	`{`
`1129`		`- if ( !featureInfoFromVectorLayer( vectorLayer, infoPoint.get(), featureCount, result, layerElement, mapSettings, renderContext, version, featuresRect.get(), filterGeom.get() ) )`
`1130`		`- {`
`1131`		`- break;`
`1132`		`- }`
	`1129`	`+ ( void )featureInfoFromVectorLayer( vectorLayer, infoPoint.get(), featureCount, result, layerElement, mapSettings, renderContext, version, featuresRect.get(), filterGeom.get() );`
`1133`	`1130`	`break;`
`1134`	`1131`	`}`
`1135`	`1132`	`}`
`@@ -1149,10 +1146,7 @@ namespace QgsWms`
`1149`	`1146`	`break;`
`1150`	`1147`	`}`
`1151`	`1148`	`QgsPointXY layerInfoPoint = mapSettings.mapToLayerCoordinates( layer, *( infoPoint.get() ) );`
`1152`		`- if ( !featureInfoFromRasterLayer( rasterLayer, mapSettings, &layerInfoPoint, result, layerElement, version ) )`
`1153`		`- {`
`1154`		`- break;`
`1155`		`- }`
	`1149`	`+ ( void )featureInfoFromRasterLayer( rasterLayer, mapSettings, &layerInfoPoint, result, layerElement, version );`
`1156`	`1150`	`break;`
`1157`	`1151`	`}`
`1158`	`1152`	`}`