Hopefully fix cppcheck master new warnings

Author: rouault

frmts/adrg/srpdataset.cpp

@@ -971,11 +971,11 @@ DDFRecord *SRPDataset::FindRecordInGENForIMG(DDFModule &module,
             const char *pszBAD = record->GetStringSubfield("SPR", 0, "BAD", 0);
             if (pszBAD == nullptr || strlen(pszBAD) != 12)
                 continue;
-            const CPLString osBAD = pszBAD;
+            CPLString osBAD(pszBAD);
             {
-                char *c = (char *)strchr(osBAD.c_str(), ' ');
-                if (c)
-                    *c = 0;
+                const auto nSpacePos = osBAD.find(' ');
+                if (nSpacePos != std::string::npos)
+                    osBAD.resize(nSpacePos);
             }
 
             if (EQUAL(osShortIMGFilename.c_str(), osBAD.c_str()))
@@ -1028,7 +1028,7 @@ SRPDataset *SRPDataset::OpenDataset(const char *pszGENFileName,
     if (pszNAM == nullptr)
         return nullptr;
 
-    const CPLString osNAM = pszNAM;
+    const CPLString osNAM(pszNAM);
     CPLDebug("SRP", "osNAM=%s", osNAM.c_str());
     if (strlen(pszNAM) != 8)
     {

frmts/miramon/miramon_dataset.cpp

@@ -366,7 +366,7 @@ GDALDataset *MMRDataset::CreateCopy(const char *pszFilename,
 
 {
     // pszFilename doesn't have extension or must end in "I.rel"
-    const CPLString osFileName = pszFilename;
+    const CPLString osFileName(pszFilename);
     CPLString osRelName = CreateAssociatedMetadataFileName(osFileName);
     if (osRelName.empty())
         return nullptr;

frmts/pds/pdsdataset.cpp

@@ -1613,7 +1613,7 @@ CPLString PDSDataset::CleanString(const CPLString &osInput)
             pszWrk[i] = '_';
     }
 
-    CPLString osOutput = pszWrk;
+    CPLString osOutput(pszWrk);
     CPLFree(pszWrk);
     return osOutput;
 }

frmts/wcs/wcsutils.cpp

@@ -32,7 +32,7 @@ void Swap(double &a, double &b)
 std::string URLEncode(const std::string &str)
 {
     char *pszEncoded = CPLEscapeString(str.c_str(), -1, CPLES_URL);
-    std::string str2 = pszEncoded;
+    std::string str2(pszEncoded);
     CPLFree(pszEncoded);
     return str2;
 }

ogr/ogrsf_frmts/amigocloud/ogramigoclouddatasource.cpp

@@ -788,7 +788,7 @@ json_object *OGRAmigoCloudDataSource::RunSQL(const char *pszUnescapedSQL)
     CPLString osSQL;
     std::string pszAPIURL = GetAPIURL();
     osSQL = pszAPIURL + "/users/0/projects/" + CPLString(pszProjectId) + "/sql";
-    std::string sql = pszUnescapedSQL;
+    const std::string sql(pszUnescapedSQL);
     if (sql.find("DELETE") != std::string::npos ||
         sql.find("delete") != std::string::npos ||
         sql.find("INSERT") != std::string::npos ||

ogr/ogrsf_frmts/dwg/ogrdwg_blockmap.cpp

@@ -129,7 +129,7 @@ OGRDWGDataSource::SimplifyBlockGeometry(OGRGeometryCollection *poCollection)
 DWGBlockDefinition *OGRDWGDataSource::LookupBlock(const char *pszName)
 
 {
-    CPLString osName = pszName;
+    const CPLString osName(pszName);
 
     if (oBlockMap.count(osName) == 0)
         return nullptr;

ogr/ogrsf_frmts/dxf/ogrdxf_blockmap.cpp

@@ -172,7 +172,7 @@ bool OGRDXFDataSource::ReadBlocksSection()
 DXFBlockDefinition *OGRDXFDataSource::LookupBlock(const char *pszName)
 
 {
-    CPLString l_osName = pszName;
+    const CPLString l_osName(pszName);
 
     if (oBlockMap.count(l_osName) == 0)
         return nullptr;
@@ -190,7 +190,7 @@ DXFBlockDefinition *OGRDXFDataSource::LookupBlock(const char *pszName)
 CPLString OGRDXFDataSource::GetBlockNameByRecordHandle(const char *pszID)
 
 {
-    CPLString l_osID = pszID;
+    const CPLString l_osID(pszID);
 
     if (oBlockRecordHandles.count(l_osID) == 0)
         return "";

ogr/ogrsf_frmts/dxf/ogrdxfdatasource.cpp

@@ -728,7 +728,7 @@ const char *OGRDXFDataSource::LookupTextStyleProperty(const char *pszTextStyle,
 CPLString OGRDXFDataSource::GetTextStyleNameByHandle(const char *pszID)
 
 {
-    CPLString l_osID = pszID;
+    const CPLString l_osID(pszID);
 
     if (oTextStyleHandles.count(l_osID) == 0)
         return "";

ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp

@@ -954,7 +954,7 @@ int OGREDIGEODataSource::SetStyle(const CPLString &osFEA,
     if (strcmp(poFeature->GetDefnRef()->GetName(), "ID_S_OBJ_Z_1_2_2") == 0 &&
         iATR != -1 && (pszATR = poFeature->GetFieldAsString(iATR)) != nullptr)
     {
-        const CPLString osATR = pszATR;
+        const CPLString osATR(pszATR);
         std::map<CPLString, CPLString>::iterator itFEA_FEA =
             mapFEA_FEA.find(osFEA);
         if (itFEA_FEA != mapFEA_FEA.end())

ogr/ogrsf_frmts/filegdb/FGdbUtils.cpp

@@ -30,7 +30,7 @@ std::wstring StringToWString(const std::string &utf8string)
 {
     wchar_t *pszUTF16 =
         CPLRecodeToWChar(utf8string.c_str(), CPL_ENC_UTF8, CPL_ENC_UCS2);
-    std::wstring utf16string = pszUTF16;
+    std::wstring utf16string(pszUTF16);
     CPLFree(pszUTF16);
     return utf16string;
 }
@@ -43,7 +43,7 @@ std::string WStringToString(const std::wstring &utf16string)
 {
     char *pszUTF8 =
         CPLRecodeFromWChar(utf16string.c_str(), CPL_ENC_UCS2, CPL_ENC_UTF8);
-    std::string utf8string = pszUTF8;
+    std::string utf8string(pszUTF8);
     CPLFree(pszUTF8);
     return utf8string;
 }