Merge pull request OSGeo#11568 from rouault/cppcheck_master_duplicateBreak

Fix duplicateBreak warnings with cppcheck master

Author: rouault

ogr/ogr_api.cpp

@@ -359,6 +359,7 @@ int OGR_G_GetPoints(OGRGeometryH hGeom, void *pabyX, int nXStride, void *pabyY,
 {
     VALIDATE_POINTER1(hGeom, "OGR_G_GetPoints", 0);
 
+    int ret = 0;
     switch (wkbFlatten(ToPointer(hGeom)->getGeometryType()))
     {
         case wkbPoint:
@@ -370,25 +371,27 @@ int OGR_G_GetPoints(OGRGeometryH hGeom, void *pabyX, int nXStride, void *pabyY,
                 *(static_cast<double *>(pabyY)) = poPoint->getY();
             if (pabyZ)
                 *(static_cast<double *>(pabyZ)) = poPoint->getZ();
-            return 1;
+            ret = 1;
+            break;
         }
-        break;
 
         case wkbLineString:
         case wkbCircularString:
         {
             OGRSimpleCurve *poSC = ToPointer(hGeom)->toSimpleCurve();
             poSC->getPoints(pabyX, nXStride, pabyY, nYStride, pabyZ, nZStride);
-            return poSC->getNumPoints();
+            ret = poSC->getNumPoints();
+            break;
         }
-        break;
 
         default:
+        {
             CPLError(CE_Failure, CPLE_NotSupported,
                      "Incompatible geometry for operation");
-            return 0;
             break;
+        }
     }
+    return ret;
 }
 
 /************************************************************************/
@@ -429,6 +432,7 @@ int OGR_G_GetPointsZM(OGRGeometryH hGeom, void *pabyX, int nXStride,
 {
     VALIDATE_POINTER1(hGeom, "OGR_G_GetPointsZM", 0);
 
+    int ret = 0;
     switch (wkbFlatten(ToPointer(hGeom)->getGeometryType()))
     {
         case wkbPoint:
@@ -442,26 +446,29 @@ int OGR_G_GetPointsZM(OGRGeometryH hGeom, void *pabyX, int nXStride,
                 *static_cast<double *>(pabyZ) = poPoint->getZ();
             if (pabyM)
                 *static_cast<double *>(pabyM) = poPoint->getM();
-            return 1;
+            ret = 1;
+            break;
         }
-        break;
 
         case wkbLineString:
         case wkbCircularString:
         {
             OGRSimpleCurve *poSC = ToPointer(hGeom)->toSimpleCurve();
             poSC->getPoints(pabyX, nXStride, pabyY, nYStride, pabyZ, nZStride,
                             pabyM, nMStride);
-            return poSC->getNumPoints();
+            ret = poSC->getNumPoints();
+            break;
         }
-        break;
 
         default:
+        {
             CPLError(CE_Failure, CPLE_NotSupported,
                      "Incompatible geometry for operation");
-            return 0;
             break;
+        }
     }
+
+    return ret;
 }
 
 /************************************************************************/

ogr/ogrsf_frmts/generic/ogr_gensql.cpp

@@ -1387,19 +1387,19 @@ static CPLString GetFilterForJoin(swq_expr_node *poExpr, OGRFeature *poSrcFeat,
                 const OGRField *psSrcField =
                     poSrcFeat->GetRawFieldRef(poExpr->field_index);
 
+                CPLString osRet;
                 switch (ePrimaryFieldType)
                 {
                     case OFTInteger:
-                        return CPLString().Printf("%d", psSrcField->Integer);
+                        osRet.Printf("%d", psSrcField->Integer);
                         break;
 
                     case OFTInteger64:
-                        return CPLString().Printf(CPL_FRMT_GIB,
-                                                  psSrcField->Integer64);
+                        osRet.Printf(CPL_FRMT_GIB, psSrcField->Integer64);
                         break;
 
                     case OFTReal:
-                        return CPLString().Printf("%.17g", psSrcField->Real);
+                        osRet.Printf("%.17g", psSrcField->Real);
                         break;
 
                     case OFTString:
@@ -1408,18 +1408,19 @@ static CPLString GetFilterForJoin(swq_expr_node *poExpr, OGRFeature *poSrcFeat,
                             psSrcField->String,
                             static_cast<int>(strlen(psSrcField->String)),
                             CPLES_SQL);
-                        CPLString osRes = "'";
-                        osRes += pszEscaped;
-                        osRes += "'";
+                        osRet = "'";
+                        osRet += pszEscaped;
+                        osRet += "'";
                         CPLFree(pszEscaped);
-                        return osRes;
+                        break;
                     }
-                    break;
 
                     default:
                         CPLAssert(false);
-                        return "";
+                        break;
                 }
+
+                return osRet;
             }
         }
 

ogr/ogrsf_frmts/mitab/mitab_imapinfofile.cpp

@@ -297,6 +297,7 @@ TABFeature *IMapInfoFile::CreateTABFeature(OGRFeature *poFeature)
          *------------------------------------------------------------*/
         case wkbPolygon:
         case wkbMultiPolygon:
+        {
             poTABFeature = new TABRegion(poFeature->GetDefnRef());
             if (poFeature->GetStyleString())
             {
@@ -308,11 +309,13 @@ TABFeature *IMapInfoFile::CreateTABFeature(OGRFeature *poFeature)
                     poFeature->GetStyleString());
             }
             break;
+        }
         /*-------------------------------------------------------------
          * LINE/PLINE/MULTIPLINE
          *------------------------------------------------------------*/
         case wkbLineString:
         case wkbMultiLineString:
+        {
             poTABFeature = new TABPolyline(poFeature->GetDefnRef());
             if (poFeature->GetStyleString())
             {
@@ -322,6 +325,7 @@ TABFeature *IMapInfoFile::CreateTABFeature(OGRFeature *poFeature)
                     poFeature->GetStyleString());
             }
             break;
+        }
         /*-------------------------------------------------------------
          * Collection types that are not directly supported... convert
          * to multiple features in output file through recursive calls.
@@ -332,38 +336,41 @@ TABFeature *IMapInfoFile::CreateTABFeature(OGRFeature *poFeature)
             OGRErr eStatus = OGRERR_NONE;
             assert(poGeom);  // for clang static analyzer
             OGRGeometryCollection *poColl = poGeom->toGeometryCollection();
-            OGRFeature *poTmpFeature = poFeature->Clone();
+            auto poTmpFeature = std::unique_ptr<OGRFeature>(poFeature->Clone());
 
             for (int i = 0; eStatus == OGRERR_NONE && poColl != nullptr &&
                             i < poColl->getNumGeometries();
                  i++)
             {
                 poTmpFeature->SetFID(OGRNullFID);
                 poTmpFeature->SetGeometry(poColl->getGeometryRef(i));
-                eStatus = ICreateFeature(poTmpFeature);
+                eStatus = ICreateFeature(poTmpFeature.get());
             }
-            delete poTmpFeature;
-            return nullptr;
+            break;
         }
-        break;
+
         /*-------------------------------------------------------------
          * Unsupported type.... convert to MapInfo geometry NONE
          *------------------------------------------------------------*/
-        case wkbUnknown:
         default:
+        {
             poTABFeature = new TABFeature(poFeature->GetDefnRef());
             break;
+        }
     }
 
-    if (poGeom != nullptr)
-        poTABFeature->SetGeometryDirectly(poGeom->clone());
-
-    for (int i = 0; i < poFeature->GetDefnRef()->GetFieldCount(); i++)
+    if (poTABFeature)
     {
-        poTABFeature->SetField(i, poFeature->GetRawFieldRef(i));
-    }
+        if (poGeom != nullptr)
+            poTABFeature->SetGeometryDirectly(poGeom->clone());
 
-    poTABFeature->SetFID(poFeature->GetFID());
+        for (int i = 0; i < poFeature->GetDefnRef()->GetFieldCount(); i++)
+        {
+            poTABFeature->SetField(i, poFeature->GetRawFieldRef(i));
+        }
+
+        poTABFeature->SetFID(poFeature->GetFID());
+    }
 
     return poTABFeature;
 }