Localize loop variables in ogr

git-svn-id: https://svn.osgeo.org/gdal/trunk@35129 f0d54148-0727-0410-94bb-9a71ac55c965

gdal/ogr/ogr_api.cpp

@@ -607,7 +607,7 @@ void CPL_DLL OGR_G_SetPoints( OGRGeometryH hGeom, int nPointsIn,
         {
           poSC->setNumPoints( nPointsIn );
 
-          for (int i = 0; i < nPointsIn; ++i)
+          for( int i = 0; i < nPointsIn; ++i )
           {
             double x = *(double*)((char*)pabyX + i * nXStride);
             double y = *(double*)((char*)pabyY + i * nYStride);
@@ -705,7 +705,7 @@ void CPL_DLL OGR_G_SetPointsZM( OGRGeometryH hGeom, int nPointsIn,
 
           if (!pabyZ && !pabyM)
           {
-              for (int i = 0; i < nPointsIn; ++i)
+              for( int i = 0; i < nPointsIn; ++i )
               {
                   double x = *(double*)((char*)pabyX + i * nXStride);
                   double y = *(double*)((char*)pabyY + i * nYStride);
@@ -714,7 +714,7 @@ void CPL_DLL OGR_G_SetPointsZM( OGRGeometryH hGeom, int nPointsIn,
           }
           else if (pabyZ && !pabyM)
           {
-              for (int i = 0; i < nPointsIn; ++i)
+              for( int i = 0; i < nPointsIn; ++i )
               {
                   double x = *(double*)((char*)pabyX + i * nXStride);
                   double y = *(double*)((char*)pabyY + i * nYStride);
@@ -724,7 +724,7 @@ void CPL_DLL OGR_G_SetPointsZM( OGRGeometryH hGeom, int nPointsIn,
           }
           else if (!pabyZ && pabyM)
           {
-              for (int i = 0; i < nPointsIn; ++i)
+              for( int i = 0; i < nPointsIn; ++i )
               {
                   double x = *(double*)((char*)pabyX + i * nXStride);
                   double y = *(double*)((char*)pabyY + i * nYStride);
@@ -734,7 +734,7 @@ void CPL_DLL OGR_G_SetPointsZM( OGRGeometryH hGeom, int nPointsIn,
           }
           else
           {
-              for (int i = 0; i < nPointsIn; ++i)
+              for( int i = 0; i < nPointsIn; ++i )
               {
                   double x = *(double*)((char*)pabyX + i * nXStride);
                   double y = *(double*)((char*)pabyY + i * nYStride);

gdal/ogr/ogr_fromepsg.cpp

@@ -452,7 +452,7 @@ int EPSGGetWGS84Transform( int nGeogCS, std::vector<CPLString>& asTransform )
         return FALSE;
 
     asTransform.resize(0);
-    for(int  iField = 0; iField < 7; iField++ )
+    for( int iField = 0; iField < 7; iField++ )
     {
         const char* pszValue = papszLine[iDXField+iField];
         if( pszValue[0] )

gdal/ogr/ogr_geocoding.cpp

@@ -976,7 +976,7 @@ static OGRLayerH OGRGeocodeBuildLayerYahoo(CPLXMLNode* psResultSet,
             }
 
             CPLString osDisplayName;
-            for( int i=1; ; ++i)
+            for( int i = 1; ; ++i )
             {
                 const int nIdx =
                     poFDefn->GetFieldIndex(CPLSPrintf("line%d", i));

gdal/ogr/ograpispy.cpp

@@ -97,21 +97,24 @@ static std::map<OGRFieldDefnH, CPLString> oGlobalMapFieldDefn;
 void FeatureDefnDescription::Free()
 {
     {
-        std::map<OGRGeomFieldDefnH, int>::iterator oIter = oMapGeomFieldDefn.begin();
-        for(; oIter != oMapGeomFieldDefn.end(); ++oIter)
+        std::map<OGRGeomFieldDefnH, int>::iterator oIter =
+            oMapGeomFieldDefn.begin();
+        for( ; oIter != oMapGeomFieldDefn.end(); ++oIter )
             oGlobalMapGeomFieldDefn.erase(oIter->first);
     }
     {
-        std::map<OGRFieldDefnH, int>::iterator oIter = oMapFieldDefn.begin();
-        for(; oIter != oMapFieldDefn.end(); ++oIter)
+        std::map<OGRFieldDefnH, int>::iterator oIter =
+            oMapFieldDefn.begin();
+        for( ; oIter != oMapFieldDefn.end(); ++oIter )
             oGlobalMapFieldDefn.erase(oIter->first);
     }
 }
 
 DatasetDescription::~DatasetDescription()
 {
-    std::map<OGRLayerH, LayerDescription>::iterator oIter = oMapLayer.begin();
-    for(; oIter != oMapLayer.end(); ++oIter)
+    std::map<OGRLayerH, LayerDescription>::iterator oIter =
+        oMapLayer.begin();
+    for( ; oIter != oMapLayer.end(); ++oIter )
         oGlobalMapLayer.erase(oIter->first);
 }
 
@@ -186,7 +189,7 @@ static CPLString OGRAPISpyGetOptions(char** papszOptions)
     else
     {
         options = "[";
-        for(char** papszIter = papszOptions; *papszIter != NULL; papszIter++)
+        for( char** papszIter = papszOptions; *papszIter != NULL; papszIter++ )
         {
             if( papszIter != papszOptions )
                 options += ", ";
@@ -472,7 +475,7 @@ int OGRAPISpyOpenTakeSnapshot(const char* pszName, int bUpdate)
                 fprintf(fpSpyFile, "except:\n");
                 fprintf(fpSpyFile, "    pass\n");
                 fprintf(fpSpyFile, "os.mkdir('%s')\n", osWorkingDir.c_str());
-                for(char** papszIter = papszFileList; *papszIter; papszIter++)
+                for( char** papszIter = papszFileList; *papszIter; papszIter++ )
                 {
                     CPLString osSnapshotSrcFile = CPLFormFilename(
                             osSrcDir, CPLGetFilename(*papszIter), NULL);
@@ -533,17 +536,17 @@ void OGRAPISpyPostClose()
     if( !GDALIsInGlobalDestructor() )
     {
         std::map<OGRFeatureDefnH, FeatureDefnDescription>::iterator oIter =
-                                                                oMapFDefn.begin();
+            oMapFDefn.begin();
         std::vector<OGRFeatureDefnH> oArray;
-        for(; oIter != oMapFDefn.end(); ++oIter)
+        for( ; oIter != oMapFDefn.end(); ++oIter )
         {
             FeatureDefnDescription& featureDefnDescription = oIter->second;
             if( ((OGRFeatureDefn*)featureDefnDescription.hFDefn)->GetReferenceCount() == 1 )
             {
                 oArray.push_back(featureDefnDescription.hFDefn);
             }
         }
-        for(size_t i = 0; i < oArray.size(); i++)
+        for( size_t i = 0; i < oArray.size(); i++ )
         {
             FeatureDefnDescription& featureDefnDescription = oMapFDefn[oArray[i]];
             ((OGRFeatureDefn*)featureDefnDescription.hFDefn)->Release();

gdal/ogr/ograssemblepolygon.cpp

@@ -152,10 +152,9 @@ OGRGeometryH OGRBuildPolygonFromEdges( OGRGeometryH hLines,
     OGRGeometry* poGeom = (OGRGeometry*) hLines;
     if( wkbFlatten(poGeom->getGeometryType()) == wkbGeometryCollection )
     {
-        int iGeom;
         OGRGeometryCollection *poGC = (OGRGeometryCollection *) poGeom;
 
-        for( iGeom = 0; iGeom < poGC->getNumGeometries(); iGeom++ )
+        for( int iGeom = 0; iGeom < poGC->getNumGeometries(); iGeom++ )
         {
             if( wkbFlatten(poGC->getGeometryRef(iGeom)->getGeometryType())
                 != wkbLineString )
@@ -202,7 +201,7 @@ OGRGeometryH OGRBuildPolygonFromEdges( OGRGeometryH hLines,
 /* -------------------------------------------------------------------- */
 /*      Find the first unconsumed edge.                                 */
 /* -------------------------------------------------------------------- */
-        int iEdge = 0;
+        int iEdge = 0;  // Used after for.
         for( ; panEdgeConsumed[iEdge]; iEdge++ ) {}
 
         OGRLineString *poLine =
@@ -234,7 +233,6 @@ OGRGeometryH OGRBuildPolygonFromEdges( OGRGeometryH hLines,
                && nRemainingEdges > 0
                && bWorkDone )
         {
-            int iBestEdge = -1;
             bool bReverse = false;
 
             bWorkDone = false;
@@ -243,9 +241,11 @@ OGRGeometryH OGRBuildPolygonFromEdges( OGRGeometryH hLines,
             // We consider linking the end to the beginning.  If this is
             // closer than any other option we will just close the loop.
 
-            //CheckPoints(poRing,0,poRing,poRing->getNumPoints()-1,&dfBestDist);
+            // CheckPoints(poRing, 0, poRing, poRing->getNumPoints()-1,
+            //             &dfBestDist);
 
             // Find unused edge with end point closest to our loose end.
+            int iBestEdge = -1;
             for( iEdge = 0; iEdge < nEdges; iEdge++ )
             {
                 if( panEdgeConsumed[iEdge] )

gdal/ogr/ogrcompoundcurve.cpp

@@ -768,7 +768,7 @@ OGRLineString* OGRCompoundCurve::CastToLineString(OGRCompoundCurve* poCC)
 
 OGRLinearRing* OGRCompoundCurve::CastToLinearRing(OGRCompoundCurve* poCC)
 {
-    for(int i=0;i<poCC->oCC.nCurveCount;i++)
+    for( int i = 0; i < poCC->oCC.nCurveCount; i++ )
     {
         poCC->oCC.papoCurves[i] = OGRCurve::CastToLineString(poCC->oCC.papoCurves[i]);
         if( poCC->oCC.papoCurves[i] == NULL )
@@ -829,7 +829,7 @@ double OGRCompoundCurve::get_Area() const
         OGRLineString oLS;
         oLS.setNumPoints( getNumPoints() );
         OGRPoint p;
-        for(int i = 0; poIter->getNextPoint(&p); i++ )
+        for( int i = 0; poIter->getNextPoint(&p); i++ )
         {
             oLS.setPoint( i, p.getX(), p.getY() );
         }

gdal/ogr/ogrcurvecollection.cpp

@@ -286,7 +286,6 @@ OGRErr OGRCurveCollection::exportToWkt( const OGRGeometry* poGeom,
 
 {
     char        **papszGeoms;
-    int         iGeom;
     size_t      nCumulativeLength = 0;
     OGRErr      eErr;
 
@@ -310,7 +309,7 @@ OGRErr OGRCurveCollection::exportToWkt( const OGRGeometry* poGeom,
 /* -------------------------------------------------------------------- */
     papszGeoms = (char **) CPLCalloc(sizeof(char *),nCurveCount);
 
-    for( iGeom = 0; iGeom < nCurveCount; iGeom++ )
+    for( int iGeom = 0; iGeom < nCurveCount; iGeom++ )
     {
         eErr = papoCurves[iGeom]->exportToWkt( &(papszGeoms[iGeom]), wkbVariantIso );
         if( eErr != OGRERR_NONE )
@@ -344,7 +343,7 @@ OGRErr OGRCurveCollection::exportToWkt( const OGRGeometry* poGeom,
     strcat( *ppszDstText, " (" );
     nCumulativeLength = strlen(*ppszDstText);
 
-    for( iGeom = 0; iGeom < nCurveCount; iGeom++ )
+    for( int iGeom = 0; iGeom < nCurveCount; iGeom++ )
     {
         if( iGeom > 0 )
             (*ppszDstText)[nCumulativeLength++] = ',';
@@ -377,7 +376,7 @@ OGRErr OGRCurveCollection::exportToWkt( const OGRGeometry* poGeom,
     return OGRERR_NONE;
 
 error:
-    for( iGeom = 0; iGeom < nCurveCount; iGeom++ )
+    for( int iGeom = 0; iGeom < nCurveCount; iGeom++ )
         CPLFree( papszGeoms[iGeom] );
     CPLFree( papszGeoms );
     return eErr;

gdal/ogr/ogrcurvepolygon.cpp

@@ -641,11 +641,9 @@ double OGRCurvePolygon::get_Area() const
 
     if( getExteriorRingCurve() != NULL )
     {
-        int iRing;
-
         dfArea = getExteriorRingCurve()->get_Area();
 
-        for( iRing = 0; iRing < getNumInteriorRings(); iRing++ )
+        for( int iRing = 0; iRing < getNumInteriorRings(); iRing++ )
         {
             dfArea -= getInteriorRingCurve(iRing)->get_Area();
         }
@@ -770,7 +768,7 @@ OGRBoolean OGRCurvePolygon::Intersects( const OGRGeometry *poOtherGeom ) const
 
 OGRPolygon* OGRCurvePolygon::CastToPolygon(OGRCurvePolygon* poCP)
 {
-    for(int i=0;i<poCP->oCC.nCurveCount;i++)
+    for( int i = 0; i < poCP->oCC.nCurveCount; i++ )
     {
         poCP->oCC.papoCurves[i] = OGRCurve::CastToLinearRing(poCP->oCC.papoCurves[i]);
         if( poCP->oCC.papoCurves[i] == NULL )

gdal/ogr/ogrfeature.cpp

@@ -3481,7 +3481,7 @@ void OGRFeature::SetField( int iField, int nCount, int *panValues )
 
         if( poFDefn->GetSubType() == OFSTBoolean || poFDefn->GetSubType() == OFSTInt16 )
         {
-            for( int i=0;i<nCount;i++)
+            for( int i = 0; i < nCount; i++ )
             {
                 int nVal = OGRFeatureGetIntegerValue(poFDefn, panValues[i]);
                 if( panValues[i] != nVal )
@@ -3510,7 +3510,7 @@ void OGRFeature::SetField( int iField, int nCount, int *panValues )
     {
         std::vector<GIntBig> anValues;
 
-        for( int i=0; i < nCount; i++ )
+        for( int i = 0; i < nCount; i++ )
             anValues.push_back( panValues[i] );
 
         SetField( iField, nCount, &anValues[0] );
@@ -3519,7 +3519,7 @@ void OGRFeature::SetField( int iField, int nCount, int *panValues )
     {
         std::vector<double> adfValues;
 
-        for( int i=0; i < nCount; i++ )
+        for( int i = 0; i < nCount; i++ )
             adfValues.push_back( (double) panValues[i] );
 
         SetField( iField, nCount, &adfValues[0] );
@@ -3537,7 +3537,7 @@ void OGRFeature::SetField( int iField, int nCount, int *panValues )
             VSI_MALLOC_VERBOSE((nCount+1) * sizeof(char*)) );
         if( papszValues == NULL )
             return;
-        for( int i=0; i < nCount; i++ )
+        for( int i = 0; i < nCount; i++ )
             papszValues[i] = VSI_STRDUP_VERBOSE(CPLSPrintf("%d", panValues[i]));
         papszValues[nCount] = NULL;
         SetField( iField, papszValues);
@@ -3615,7 +3615,7 @@ void OGRFeature::SetField( int iField, int nCount, const GIntBig *panValues )
     {
         std::vector<int> anValues;
 
-        for( int i=0; i < nCount; i++ )
+        for( int i = 0; i < nCount; i++ )
         {
             GIntBig nValue = panValues[i];
             int nVal32 = (nValue < INT_MIN ) ? INT_MIN :
@@ -3645,7 +3645,7 @@ void OGRFeature::SetField( int iField, int nCount, const GIntBig *panValues )
     {
         std::vector<double> adfValues;
 
-        for( int i=0; i < nCount; i++ )
+        for( int i = 0; i < nCount; i++ )
             adfValues.push_back( (double) panValues[i] );
 
         SetField( iField, nCount, &adfValues[0] );
@@ -3663,7 +3663,7 @@ void OGRFeature::SetField( int iField, int nCount, const GIntBig *panValues )
             VSI_MALLOC_VERBOSE((nCount+1) * sizeof(char*)) );
         if( papszValues == NULL )
             return;
-        for( int i=0; i < nCount; i++ )
+        for( int i = 0; i < nCount; i++ )
             papszValues[i] = VSI_STRDUP_VERBOSE(CPLSPrintf(CPL_FRMT_GIB, panValues[i]));
         papszValues[nCount] = NULL;
         SetField( iField, papszValues);
@@ -3751,7 +3751,7 @@ void OGRFeature::SetField( int iField, int nCount, double * padfValues )
     {
         std::vector<int> anValues;
 
-        for( int i=0; i < nCount; i++ )
+        for( int i = 0; i < nCount; i++ )
             anValues.push_back( (int) padfValues[i] );
 
         SetField( iField, nCount, &anValues[0] );
@@ -3760,7 +3760,7 @@ void OGRFeature::SetField( int iField, int nCount, double * padfValues )
     {
         std::vector<GIntBig> anValues;
 
-        for( int i=0; i < nCount; i++ )
+        for( int i = 0; i < nCount; i++ )
             anValues.push_back( (GIntBig) padfValues[i] );
 
         SetField( iField, nCount, &anValues[0] );
@@ -3778,7 +3778,7 @@ void OGRFeature::SetField( int iField, int nCount, double * padfValues )
             VSI_MALLOC_VERBOSE((nCount+1) * sizeof(char*)) );
         if( papszValues == NULL )
             return;
-        for( int i=0; i < nCount; i++ )
+        for( int i = 0; i < nCount; i++ )
             papszValues[i] = VSI_STRDUP_VERBOSE(CPLSPrintf("%.16g", padfValues[i]));
         papszValues[nCount] = NULL;
         SetField( iField, papszValues);
@@ -3864,7 +3864,7 @@ void OGRFeature::SetField( int iField, char ** papszValues )
             VSI_MALLOC_VERBOSE(nValues * sizeof(int)) );
         if( panValues == NULL )
             return;
-        for(int i=0;i<nValues;i++)
+        for( int i = 0; i < nValues; i++ )
         {
             errno = 0; /* As allowed by C standard, some systems like MSVC doesn't reset errno */
             int nVal = atoi(papszValues[i]);
@@ -3890,7 +3890,7 @@ void OGRFeature::SetField( int iField, char ** papszValues )
             VSI_MALLOC_VERBOSE(nValues * sizeof(GIntBig)) );
         if( panValues == NULL )
             return;
-        for(int i=0;i<nValues;i++)
+        for( int i = 0; i < nValues; i++ )
         {
             panValues[i] = CPLAtoGIntBigEx(papszValues[i], TRUE, NULL);
         }
@@ -3904,7 +3904,7 @@ void OGRFeature::SetField( int iField, char ** papszValues )
             VSI_MALLOC_VERBOSE(nValues * sizeof(double)) );
         if( padfValues == NULL )
             return;
-        for(int i=0;i<nValues;i++)
+        for( int i = 0; i < nValues; i++ )
         {
             padfValues[i] = CPLAtof(papszValues[i]);
         }
@@ -4352,8 +4352,9 @@ bool OGRFeature::SetFieldInternal( int iField, OGRField * puValue )
         else
         {
             char** papszNewList = NULL;
-            char** papszIter = puValue->StringList.paList;
-            for(; papszIter != NULL && *papszIter != NULL; ++papszIter )
+            for( char** papszIter = puValue->StringList.paList;
+                 papszIter != NULL && *papszIter != NULL;
+                 ++papszIter )
             {
                 char** papszNewList2 = CSLAddStringMayFail(papszNewList, *papszIter);
                 if( papszNewList2 == NULL )

gdal/ogr/ogrfeaturedefn.cpp

@@ -513,7 +513,7 @@ OGRErr OGRFeatureDefn::ReorderFieldDefns( int* panMap )
     OGRFieldDefn** papoFieldDefnNew = (OGRFieldDefn**)
         CPLMalloc(sizeof(OGRFieldDefn*) * nFieldCount);
 
-    for(int i=0;i<nFieldCount;i++)
+    for( int i = 0; i < nFieldCount; i++ )
     {
         papoFieldDefnNew[i] = papoFieldDefn[panMap[i]];
     }