Fix/workaround cppcheck master warnings

Author: rouault

gcore/gdalmultidim_rat.cpp

@@ -120,6 +120,7 @@ class GDALRasterAttributeTableFromMDArrays final
                 arrayStartIdx, count, arrayStep, bufferStride,
                 GDALExtendedDataType::CreateString(), pDstBuffer))
             return nullptr;
+        // cppcheck-suppress knownConditionTrueFalse
         if (!pszStr)
             return nullptr;
         m_osTmp = pszStr;

ogr/ogrsf_frmts/georss/ogrgeorsslayer.cpp

@@ -958,7 +958,7 @@ OGRFeature *OGRGeoRSSLayer::GetNextFeature()
 
     CPLFree(ppoFeatureTab);
     ppoFeatureTab = nullptr;
-    nFeatureTabLength = 0;
+    this->nFeatureTabLength = 0;
     nFeatureTabIndex = 0;
 
     int nDone = 0;
@@ -978,9 +978,10 @@ OGRFeature *OGRGeoRSSLayer::GetNextFeature()
                      static_cast<int>(XML_GetCurrentColumnNumber(oParser)));
             bStopParsing = true;
         }
-    } while (!nDone && !bStopParsing && nFeatureTabLength == 0);
+    } while (!nDone && !bStopParsing && this->nFeatureTabLength == 0);
 
-    return nFeatureTabLength ? ppoFeatureTab[nFeatureTabIndex++] : nullptr;
+    return this->nFeatureTabLength ? ppoFeatureTab[nFeatureTabIndex++]
+                                   : nullptr;
 #else
     return nullptr;
 #endif
@@ -1758,11 +1759,11 @@ void OGRGeoRSSLayer::LoadSchema()
     pszSubElementName = nullptr;
     pszSubElementValue = nullptr;
     nSubElementValueLen = 0;
-    bSameSRS = true;
-    CPLFree(pszGMLSRSName);
-    pszGMLSRSName = nullptr;
-    eGeomType = wkbUnknown;
-    bFoundGeom = false;
+    this->bSameSRS = true;
+    CPLFree(this->pszGMLSRSName);
+    this->pszGMLSRSName = nullptr;
+    this->eGeomType = wkbUnknown;
+    this->bFoundGeom = false;
     bInTagWithSubTag = false;
     pszTagWithSubTag = nullptr;
     bStopParsing = false;
@@ -1802,9 +1803,9 @@ void OGRGeoRSSLayer::LoadSchema()
     }
 
     CPLAssert(poSRS == nullptr);
-    if (bSameSRS && bFoundGeom)
+    if (this->bSameSRS && this->bFoundGeom)
     {
-        if (pszGMLSRSName == nullptr)
+        if (this->pszGMLSRSName == nullptr)
         {
             poSRS = new OGRSpatialReference();
             poSRS->SetWellKnownGeogCS("WGS84");
@@ -1817,7 +1818,7 @@ void OGRGeoRSSLayer::LoadSchema()
         }
     }
 
-    if (eGeomType != wkbUnknown)
+    if (this->eGeomType != wkbUnknown)
         poFeatureDefn->SetGeomType(eGeomType);
     if (poFeatureDefn->GetGeomFieldCount() != 0)
         poFeatureDefn->GetGeomFieldDefn(0)->SetSpatialRef(poSRS);

ogr/ogrsf_frmts/gml/gmlreader.cpp

@@ -479,7 +479,7 @@ GMLFeature *GMLReader::NextFeatureExpat()
         VSIFErrorL(fpGML))
         return nullptr;
 
-    nFeatureTabLength = 0;
+    this->nFeatureTabLength = 0;
     nFeatureTabIndex = 0;
 
     int nDone = 0;
@@ -515,9 +515,9 @@ GMLFeature *GMLReader::NextFeatureExpat()
         if (!m_bStopParsing)
             m_bStopParsing = static_cast<GMLExpatHandler *>(m_poGMLHandler)
                                  ->HasStoppedParsing();
-    } while (!nDone && !m_bStopParsing && nFeatureTabLength == 0);
+    } while (!nDone && !m_bStopParsing && this->nFeatureTabLength == 0);
 
-    if (nFeatureTabLength)
+    if (this->nFeatureTabLength)
         return ppoFeatureTab[nFeatureTabIndex++];
 
     if (!m_osErrorMessage.empty())

ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp

@@ -996,7 +996,7 @@ OGRFeature *OGRGPXLayer::GetNextFeature()
     if (m_bStopParsing)
         return nullptr;
 
-    if (!m_oFeatureQueue.empty())
+    if (!this->m_oFeatureQueue.empty())
     {
         OGRFeature *poFeature = std::move(m_oFeatureQueue.front()).release();
         m_oFeatureQueue.pop_front();
@@ -1028,7 +1028,7 @@ OGRFeature *OGRGPXLayer::GetNextFeature()
             break;
         }
         m_nWithoutEventCounter++;
-    } while (!nDone && m_oFeatureQueue.empty() && !m_bStopParsing &&
+    } while (!nDone && this->m_oFeatureQueue.empty() && !m_bStopParsing &&
              m_nWithoutEventCounter < 10);
 
     if (m_nWithoutEventCounter == 10)
@@ -1038,7 +1038,7 @@ OGRFeature *OGRGPXLayer::GetNextFeature()
         m_bStopParsing = true;
     }
 
-    if (!m_oFeatureQueue.empty())
+    if (!this->m_oFeatureQueue.empty())
     {
         OGRFeature *poFeature = std::move(m_oFeatureQueue.front()).release();
         m_oFeatureQueue.pop_front();

ogr/ogrsf_frmts/jml/ogrjmllayer.cpp

@@ -419,7 +419,7 @@ OGRFeature *OGRJMLLayer::GetNextFeature()
 
     std::vector<char> aBuf(PARSER_BUF_SIZE);
 
-    nFeatureTabLength = 0;
+    this->nFeatureTabLength = 0;
     nFeatureTabIndex = 0;
 
     nWithoutEventCounter = 0;
@@ -443,7 +443,7 @@ OGRFeature *OGRJMLLayer::GetNextFeature()
             bStopParsing = true;
         }
         nWithoutEventCounter++;
-    } while (!nDone && !bStopParsing && nFeatureTabLength == 0 &&
+    } while (!nDone && !bStopParsing && this->nFeatureTabLength == 0 &&
              nWithoutEventCounter < 10);
 
     if (nWithoutEventCounter == 10)
@@ -453,7 +453,8 @@ OGRFeature *OGRJMLLayer::GetNextFeature()
         bStopParsing = true;
     }
 
-    return (nFeatureTabLength) ? ppoFeatureTab[nFeatureTabIndex++] : nullptr;
+    return (this->nFeatureTabLength) ? ppoFeatureTab[nFeatureTabIndex++]
+                                     : nullptr;
 }
 
 static void XMLCALL startElementLoadSchemaCbk(void *pUserData,

port/cpl_path.cpp

@@ -759,10 +759,7 @@ std::string CPLFormFilenameSafe(const char *pszPath, const char *pszBasename,
                     pszBasename = pszBasenameOri;
                     nLenPath = nLenPathOri;
                     if (pszAddedPathSep[0] == 0)
-                        pszAddedPathSep =
-                            pszPath[0] == '/'
-                                ? "/"
-                                : VSIGetDirectorySeparator(pszPath);
+                        pszAddedPathSep = "/";
                 }
                 break;
             }