Merge pull request #10997 from rouault/cppcheck_fixes

cppcheck fixes with latest cppcheck master
OSGeo · Oct 15, 2024 · 6fc529d · 6fc529d
2 parents 89e64e9 + 0b98a86
commit 6fc529d
Show file tree

Hide file tree

Showing 29 changed files with 105 additions and 114 deletions.
diff --git a/frmts/gif/gifabstractdataset.cpp b/frmts/gif/gifabstractdataset.cpp
@@ -166,13 +166,14 @@ void GIFAbstractDataset::CollectXMPMetadata()
     if (!osXMP.empty())
     {
         /* Avoid setting the PAM dirty bit just for that */
-        int nOldPamFlags = nPamFlags;
+        const int nOldPamFlags = nPamFlags;
 
         char *apszMDList[2];
         apszMDList[0] = (char *)osXMP.c_str();
         apszMDList[1] = nullptr;
         SetMetadata(apszMDList, "xml:XMP");
 
+        // cppcheck-suppress redundantAssignment
         nPamFlags = nOldPamFlags;
     }
 

diff --git a/frmts/gsg/gsagdataset.cpp b/frmts/gsg/gsagdataset.cpp
@@ -369,6 +369,7 @@ CPLErr GSAGRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff, void *pImage)
             }
             else if (*szStart != '\0')
             {
+                // cppcheck-suppress redundantAssignment
                 szEnd = szStart;
                 while (!isspace((unsigned char)*szEnd) && *szEnd != '\0')
                     szEnd++;

diff --git a/frmts/gtiff/gt_citation.cpp b/frmts/gtiff/gt_citation.cpp
@@ -621,9 +621,7 @@ OGRBoolean CheckCitationKeyForStatePlaneUTM(GTIF *hGTIF, GTIFDefn *psDefn,
     if (GDALGTIFKeyGetASCII(hGTIF, GTCitationGeoKey, szCTString,
                             sizeof(szCTString)))
     {
-        CPLString osLCCT = szCTString;
-
-        osLCCT.tolower();
+        const CPLString osLCCT = CPLString(szCTString).tolower();
 
         if (strstr(osLCCT, "us") && strstr(osLCCT, "survey") &&
             (strstr(osLCCT, "feet") || strstr(osLCCT, "foot")))
@@ -659,8 +657,9 @@ OGRBoolean CheckCitationKeyForStatePlaneUTM(GTIF *hGTIF, GTIFDefn *psDefn,
 
                     if (poUnit != nullptr && poUnit->GetChildCount() >= 2)
                     {
-                        CPLString unitName = poUnit->GetChild(0)->GetValue();
-                        unitName.tolower();
+                        const CPLString unitName =
+                            CPLString(poUnit->GetChild(0)->GetValue())
+                                .tolower();
 
                         if (strstr(units, "us_survey_feet"))
                         {
@@ -692,9 +691,8 @@ OGRBoolean CheckCitationKeyForStatePlaneUTM(GTIF *hGTIF, GTIFDefn *psDefn,
         GTIFGetUOMLengthInfo(psDefn->UOMLength, &pszUnitsName, nullptr);
         if (pszUnitsName)
         {
-            CPLString osLCCT = pszUnitsName;
+            const CPLString osLCCT = CPLString(pszUnitsName).tolower();
             GTIFFreeMemory(pszUnitsName);
-            osLCCT.tolower();
 
             if (strstr(osLCCT, "us") && strstr(osLCCT, "survey") &&
                 (strstr(osLCCT, "feet") || strstr(osLCCT, "foot")))

diff --git a/frmts/jp2lura/jp2lurarasterband.cpp b/frmts/jp2lura/jp2lurarasterband.cpp
@@ -42,19 +42,11 @@ JP2LuraRasterBand::JP2LuraRasterBand(JP2LuraDataset *poDSIn, int nBandIn,
         {
             nBlockXSize = 2048;
         }
-        else
-        {
-            nBlockXSize = nRasterXSize;
-        }
 
         if (nRasterYSize >= 128)
         {
             nBlockYSize = 128;
         }
-        else
-        {
-            nBlockYSize = nRasterYSize;
-        }
     }
 
     if ((nBits % 8) != 0)

diff --git a/frmts/jpeg/jpgdataset.cpp b/frmts/jpeg/jpgdataset.cpp
@@ -383,6 +383,7 @@ void JPGDatasetCommon::ReadXMPMetadata()
                     char *apszMDList[2] = {pszXMP, nullptr};
                     SetMetadata(apszMDList, "xml:XMP");
 
+                    // cppcheck-suppress redundantAssignment
                     nPamFlags = nOldPamFlags;
                 }
                 VSIFree(pszXMP);
@@ -3036,7 +3037,7 @@ JPGDatasetCommon *JPGDataset::OpenStage2(JPGDatasetOpenArgs *psArgs,
     // Open the file using the large file api if necessary.
     VSILFILE *fpImage = fpLin;
 
-    if (fpImage == nullptr)
+    if (!fpImage)
     {
         fpImage = VSIFOpenL(real_filename, "rb");
 
@@ -3049,10 +3050,6 @@ JPGDatasetCommon *JPGDataset::OpenStage2(JPGDatasetOpenArgs *psArgs,
             return nullptr;
         }
     }
-    else
-    {
-        fpImage = fpLin;
-    }
 
     // Create a corresponding GDALDataset.
     poDS->nQLevel = nQLevel;

diff --git a/frmts/ngsgeoid/ngsgeoiddataset.cpp b/frmts/ngsgeoid/ngsgeoiddataset.cpp
@@ -375,8 +375,8 @@ const OGRSpatialReference *NGSGEOIDDataset::GetSpatialRef() const
         return &m_oSRS;
     }
 
-    CPLString osFilename(CPLGetBasename(GetDescription()));
-    osFilename.tolower();
+    const CPLString osFilename =
+        CPLString(CPLGetBasename(GetDescription())).tolower();
 
     // See https://www.ngs.noaa.gov/GEOID/GEOID12B/faq_2012B.shtml
 

diff --git a/frmts/png/pngdataset.cpp b/frmts/png/pngdataset.cpp
@@ -1588,11 +1588,12 @@ void PNGDataset::CollectXMPMetadata()
             if (memcmp(pszContent, "XML:com.adobe.xmp\0\0\0\0\0", 22) == 0)
             {
                 // Avoid setting the PAM dirty bit just for that.
-                int nOldPamFlags = nPamFlags;
+                const int nOldPamFlags = nPamFlags;
 
                 char *apszMDList[2] = {pszContent + 22, nullptr};
                 SetMetadata(apszMDList, "xml:XMP");
 
+                // cppcheck-suppress redundantAssignment
                 nPamFlags = nOldPamFlags;
 
                 VSIFree(pszContent);

diff --git a/frmts/webp/webpdataset.cpp b/frmts/webp/webpdataset.cpp
@@ -247,6 +247,7 @@ char **WEBPDataset::GetMetadata(const char *pszDomain)
                 char *apszMDList[2] = {pszXMP, nullptr};
                 SetMetadata(apszMDList, "xml:XMP");
 
+                // cppcheck-suppress redundantAssignment
                 nPamFlags = nOldPamFlags;
 
                 VSIFree(pszXMP);

diff --git a/frmts/wms/minidriver_arcgis_server.cpp b/frmts/wms/minidriver_arcgis_server.cpp
@@ -68,8 +68,8 @@ CPLErr WMSMiniDriver_AGS::Initialize(CPLXMLNode *config,
 
     m_image_format = CPLGetXMLValue(config, "ImageFormat", "png");
     m_time_range = CPLGetXMLValue(config, "TimeRange", "");
-    m_transparent = CPLGetXMLValue(config, "Transparent", "");
-    m_transparent.tolower();
+    m_transparent =
+        CPLString(CPLGetXMLValue(config, "Transparent", "")).tolower();
     m_layers = CPLGetXMLValue(config, "Layers", "");
 
     const char *irs = CPLGetXMLValue(config, "SRS", "102100");

diff --git a/gcore/gdal_misc.cpp b/gcore/gdal_misc.cpp
@@ -1869,9 +1869,9 @@ CPLString GDALFindAssociatedFile(const char *pszBaseFilename,
             CPLString osAltExt = pszExt;
 
             if (islower(static_cast<unsigned char>(pszExt[0])))
-                osAltExt.toupper();
+                osAltExt = osAltExt.toupper();
             else
-                osAltExt.tolower();
+                osAltExt = osAltExt.tolower();
 
             osTarget = CPLResetExtension(pszBaseFilename, osAltExt);
 

diff --git a/gcore/gdal_pam.h b/gcore/gdal_pam.h
@@ -38,6 +38,7 @@ class GDALPamRasterBand;
 #define GCIF_SCALEOFFSET 0x008000
 #define GCIF_UNITTYPE 0x010000
 #define GCIF_COLORTABLE 0x020000
+/* Same value as GCIF_COLORTABLE */
 #define GCIF_COLORINTERP 0x020000
 #define GCIF_BAND_METADATA 0x040000
 #define GCIF_RAT 0x080000
@@ -50,8 +51,8 @@ class GDALPamRasterBand;
 #define GCIF_PAM_DEFAULT                                                       \
     (GCIF_GEOTRANSFORM | GCIF_PROJECTION | GCIF_METADATA | GCIF_GCPS |         \
      GCIF_NODATA | GCIF_CATEGORYNAMES | GCIF_MINMAX | GCIF_SCALEOFFSET |       \
-     GCIF_UNITTYPE | GCIF_COLORTABLE | GCIF_COLORINTERP | GCIF_BAND_METADATA | \
-     GCIF_RAT | GCIF_MASK | GCIF_ONLY_IF_MISSING | GCIF_PROCESS_BANDS |        \
+     GCIF_UNITTYPE | GCIF_COLORTABLE | GCIF_BAND_METADATA | GCIF_RAT |         \
+     GCIF_MASK | GCIF_ONLY_IF_MISSING | GCIF_PROCESS_BANDS |                   \
      GCIF_BAND_DESCRIPTION)
 
 /* GDAL PAM Flags */

diff --git a/gcore/gdaldriver.cpp b/gcore/gdaldriver.cpp
@@ -1461,7 +1461,7 @@ bool GDALDriver::CanVectorTranslateFrom(
     if (!ppapszFailureReasons)
     {
         for (const char *pszReason :
-             cpl::Iterate(CSLConstList(papszFailureReasons)))
+             cpl::Iterate(static_cast<CSLConstList>(papszFailureReasons)))
         {
             CPLDebug("GDAL", "%s", pszReason);
         }

diff --git a/gcore/gdaljp2abstractdataset.cpp b/gcore/gdaljp2abstractdataset.cpp
@@ -208,8 +208,8 @@ void GDALJP2AbstractDataset::LoadJP2Metadata(GDALOpenInfo *poOpenInfo,
             GDALMultiDomainMetadata oLocalMDMD;
             oLocalMDMD.XMLInit(psXMLNode, FALSE);
             GDALDataset::SetMetadata(oLocalMDMD.GetMetadata());
-            for (const char *pszDomain :
-                 cpl::Iterate(CSLConstList(oLocalMDMD.GetDomainList())))
+            for (const char *pszDomain : cpl::Iterate(
+                     static_cast<CSLConstList>(oLocalMDMD.GetDomainList())))
             {
                 if (!EQUAL(pszDomain, "") &&
                     !EQUAL(pszDomain, "IMAGE_STRUCTURE"))

diff --git a/gcore/gdalmultidim.cpp b/gcore/gdalmultidim.cpp
@@ -6962,7 +6962,8 @@ bool GDALMDArrayMask::IRead(const GUInt64 *arrayStartIdx, const size_t *count,
         m_poParent->GetRawNoDataValue() == nullptr &&
         GDALDataTypeIsInteger(m_poParent->GetDataType().GetNumericDataType()))
     {
-        if (bufferDataType == m_dt)  // Byte case
+        const bool bBufferDataTypeIsByte = bufferDataType == m_dt;
+        if (bBufferDataTypeIsByte)  // Byte case
         {
             bool bContiguous = true;
             for (size_t i = 0; i < nDims; i++)
@@ -6999,7 +7000,6 @@ bool GDALMDArrayMask::IRead(const GUInt64 *arrayStartIdx, const size_t *count,
 
         size_t dimIdx = 0;
         const size_t nDimsMinus1 = nDims > 0 ? nDims - 1 : 0;
-        const bool bBufferDataTypeIsByte = bufferDataType == m_dt;
         GByte abyOne[16];  // 16 is sizeof GDT_CFloat64
         CPLAssert(nBufferDTSize <= 16);
         const GByte flag = 1;
@@ -7015,6 +7015,7 @@ bool GDALMDArrayMask::IRead(const GUInt64 *arrayStartIdx, const size_t *count,
 
             while (true)
             {
+                // cppcheck-suppress knownConditionTrueFalse
                 if (bBufferDataTypeIsByte)
                 {
                     *dst_ptr = flag;
@@ -9485,8 +9486,9 @@ GDALDatasetFromArray *GDALDatasetFromArray::Create(
         poDS->SetDerivedDatasetName(osDerivedDatasetName.c_str());
         poDS->TryLoadXML();
 
-        for (const auto &[pszKey, pszValue] : cpl::IterateNameValue(
-                 CSLConstList(poDS->GDALPamDataset::GetMetadata())))
+        for (const auto &[pszKey, pszValue] :
+             cpl::IterateNameValue(static_cast<CSLConstList>(
+                 poDS->GDALPamDataset::GetMetadata())))
         {
             poDS->m_oMDD.SetMetadataItem(pszKey, pszValue);
         }

diff --git a/gcore/gdalpamdataset.cpp b/gcore/gdalpamdataset.cpp
@@ -1790,7 +1790,7 @@ void GDALPamDataset::ClearStatistics()
         GDALRasterBand *poBand = GetRasterBand(i);
         CPLStringList aosNewMD;
         for (const char *pszStr :
-             cpl::Iterate(CSLConstList(poBand->GetMetadata())))
+             cpl::Iterate(static_cast<CSLConstList>(poBand->GetMetadata())))
         {
             if (STARTS_WITH_CI(pszStr, "STATISTICS_"))
             {

diff --git a/gcore/gdalpamproxydb.cpp b/gcore/gdalpamproxydb.cpp
@@ -279,6 +279,7 @@ static void InitProxyDB()
     {
         CPLMutexHolderD(&hProxyDBLock);
         // cppcheck-suppress identicalInnerCondition
+        // cppcheck-suppress knownConditionTrueFalse
         if (!bProxyDBInitialized)
         {
             const char *pszProxyDir =

diff --git a/gnm/gnmgraph.cpp b/gnm/gnmgraph.cpp
@@ -571,7 +571,6 @@ void GNMGraph::TraceTargets(std::queue<GNMGFID> &vertexQueue,
                             std::set<GNMGFID> &markedVertIds,
                             GNMPATH &connectedIds)
 {
-    GNMCONSTVECTOR::const_iterator it;
     std::queue<GNMGFID> neighbours_queue;
 
     // See all given vertices except thouse that have been already seen.
@@ -591,11 +590,8 @@ void GNMGraph::TraceTargets(std::queue<GNMGFID> &vertexQueue,
             LPGNMCONSTVECTOR panOutcomeEdgeIDs = GetOutEdges(nCurVertID);
             if (nullptr != panOutcomeEdgeIDs)
             {
-                for (it = panOutcomeEdgeIDs->begin();
-                     it != panOutcomeEdgeIDs->end(); ++it)
+                for (const GNMGFID nCurEdgeID : *panOutcomeEdgeIDs)
                 {
-                    GNMGFID nCurEdgeID = *it;
-
                     // ISSUE: think about to return a sequence of vertices and
                     // edges (which is more universal), as now we are going to
                     // return only sequence of edges.

diff --git a/ogr/ogrfielddefn.cpp b/ogr/ogrfielddefn.cpp
@@ -2315,6 +2315,7 @@ OGRCodedFieldDomain::~OGRCodedFieldDomain()
 /*                       OGRRangeFieldDomain()                          */
 /************************************************************************/
 
+// cppcheck-suppress uninitMemberVar
 OGRRangeFieldDomain::OGRRangeFieldDomain(
     const std::string &osName, const std::string &osDescription,
     OGRFieldType eFieldType, OGRFieldSubType eFieldSubType,

diff --git a/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp b/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp
@@ -62,19 +62,14 @@ OGRUnionLayerGeomFieldDefn::~OGRUnionLayerGeomFieldDefn()
 /*                          OGRUnionLayer()                             */
 /************************************************************************/
 
+// cppcheck-suppress uninitMemberVar
 OGRUnionLayer::OGRUnionLayer(const char *pszName, int nSrcLayersIn,
                              OGRLayer **papoSrcLayersIn,
                              int bTakeLayerOwnership)
     : osName(pszName), nSrcLayers(nSrcLayersIn), papoSrcLayers(papoSrcLayersIn),
-      bHasLayerOwnership(bTakeLayerOwnership), poFeatureDefn(nullptr),
-      nFields(0), papoFields(nullptr), nGeomFields(0), papoGeomFields(nullptr),
-      eFieldStrategy(FIELD_UNION_ALL_LAYERS), bPreserveSrcFID(FALSE),
-      nFeatureCount(-1), iCurLayer(-1), pszAttributeFilter(nullptr),
-      nNextFID(0), panMap(nullptr), bAttrFilterPassThroughValue(-1),
+      bHasLayerOwnership(bTakeLayerOwnership),
       pabModifiedLayers(static_cast<int *>(CPLCalloc(sizeof(int), nSrcLayers))),
-      pabCheckIfAutoWrap(
-          static_cast<int *>(CPLCalloc(sizeof(int), nSrcLayers))),
-      poGlobalSRS(nullptr)
+      pabCheckIfAutoWrap(static_cast<int *>(CPLCalloc(sizeof(int), nSrcLayers)))
 {
     CPLAssert(nSrcLayersIn > 0);
 

diff --git a/ogr/ogrsf_frmts/generic/ogrunionlayer.h b/ogr/ogrsf_frmts/generic/ogrunionlayer.h
@@ -53,32 +53,32 @@ class CPL_DLL OGRUnionLayer final : public OGRLayer
     CPL_DISALLOW_COPY_ASSIGN(OGRUnionLayer)
 
   protected:
-    CPLString osName;
-    int nSrcLayers;
-    OGRLayer **papoSrcLayers;
-    int bHasLayerOwnership;
-
-    OGRFeatureDefn *poFeatureDefn;
-    int nFields;
-    OGRFieldDefn **papoFields;
-    int nGeomFields;
-    OGRUnionLayerGeomFieldDefn **papoGeomFields;
-    FieldUnionStrategy eFieldStrategy;
+    CPLString osName{};
+    int nSrcLayers = 0;
+    OGRLayer **papoSrcLayers = nullptr;
+    int bHasLayerOwnership = false;
+
+    OGRFeatureDefn *poFeatureDefn = nullptr;
+    int nFields = 0;
+    OGRFieldDefn **papoFields = nullptr;
+    int nGeomFields = 0;
+    OGRUnionLayerGeomFieldDefn **papoGeomFields = nullptr;
+    FieldUnionStrategy eFieldStrategy = FIELD_UNION_ALL_LAYERS;
     CPLString osSourceLayerFieldName{};
 
-    int bPreserveSrcFID;
+    int bPreserveSrcFID = false;
 
-    GIntBig nFeatureCount;
+    GIntBig nFeatureCount = -1;
 
-    int iCurLayer;
-    char *pszAttributeFilter;
-    int nNextFID;
-    int *panMap;
+    int iCurLayer = -1;
+    char *pszAttributeFilter = nullptr;
+    int nNextFID = 0;
+    int *panMap = nullptr;
     CPLStringList m_aosIgnoredFields{};
-    int bAttrFilterPassThroughValue;
-    int *pabModifiedLayers;
-    int *pabCheckIfAutoWrap;
-    const OGRSpatialReference *poGlobalSRS;
+    int bAttrFilterPassThroughValue = -1;
+    int *pabModifiedLayers = nullptr;
+    int *pabCheckIfAutoWrap = nullptr;
+    const OGRSpatialReference *poGlobalSRS = nullptr;
 
     void AutoWarpLayerIfNecessary(int iSubLayer);
     OGRFeature *TranslateFromSrcLayer(OGRFeature *poSrcFeature);