Avoid Coverity Scan warnings

Author: rouault

port/cpl_azure.cpp

@@ -106,18 +106,16 @@ static struct curl_slist *GetAzureBlobHeaders(
     {
         osDate = IVSIS3LikeHandleHelper::GetRFC822DateTime();
     }
-    const std::string osMsVersion(X_MS_VERSION);
 
-    const auto AddHeaders = [&osDate, &osMsVersion,
-                             bIncludeMSVersion](struct curl_slist *l_psHeaders)
+    const auto AddHeaders =
+        [&osDate, bIncludeMSVersion](struct curl_slist *l_psHeaders)
     {
         l_psHeaders = curl_slist_append(
             l_psHeaders, CPLSPrintf("x-ms-date: %s", osDate.c_str()));
         if (bIncludeMSVersion)
         {
-            l_psHeaders =
-                curl_slist_append(l_psHeaders, CPLSPrintf("x-ms-version: %s",
-                                                          osMsVersion.c_str()));
+            l_psHeaders = curl_slist_append(
+                l_psHeaders, CPLSPrintf("x-ms-version: %s", X_MS_VERSION));
         }
         return l_psHeaders;
     };
@@ -130,7 +128,7 @@ static struct curl_slist *GetAzureBlobHeaders(
 
     std::map<std::string, std::string> oSortedMapMSHeaders;
     if (bIncludeMSVersion)
-        oSortedMapMSHeaders["x-ms-version"] = osMsVersion;
+        oSortedMapMSHeaders["x-ms-version"] = X_MS_VERSION;
     oSortedMapMSHeaders["x-ms-date"] = osDate;
     std::string osCanonicalizedHeaders(
         IVSIS3LikeHandleHelper::BuildCanonicalizedHeaders(oSortedMapMSHeaders,

port/cpl_vsil_abstract_archive.cpp

@@ -799,7 +799,7 @@ char **VSIArchiveFilesystemHandler::ReadDirEx(const char *pszDirname,
     if (archiveFilename == nullptr)
         return nullptr;
 
-    const int lenInArchiveSubDir = static_cast<int>(osInArchiveSubDir.size());
+    const size_t lenInArchiveSubDir = osInArchiveSubDir.size();
 
     CPLStringList oDir;
 
@@ -814,9 +814,9 @@ char **VSIArchiveFilesystemHandler::ReadDirEx(const char *pszDirname,
     CPLDebug("VSIArchive", "Read dir %s", pszDirname);
 #endif
 
-    std::string searchDir = lenInArchiveSubDir > 0
-                                ? std::string(osInArchiveSubDir)
-                                : std::string("");
+    std::string searchDir;
+    if (lenInArchiveSubDir != 0)
+        searchDir = std::move(osInArchiveSubDir);
 
     // Use directory index to find the list of children for this directory
     auto dirIter = content->dirIndex.find(searchDir);