Review fixes.

2 files changed, 9 insertions, 6 deletions

diff --git a/platform/chunks_download_strategy.cpp b/platform/chunks_download_strategy.cpp
index e00fa47c82..3a44d20d2e 100644
--- a/platform/chunks_download_strategy.cpp
+++ b/platform/chunks_download_strategy.cpp
@@ -6,7 +6,9 @@
 #include "coding/file_reader.hpp"
 #include "coding/varint.hpp"
 
+#include "base/assert.hpp"
 #include "base/logging.hpp"
+#include "base/macros.hpp"
 
 #include "std/algorithm.hpp"
 
diff --git a/platform/local_country_file_utils.cpp b/platform/local_country_file_utils.cpp
index a31ed6afb4..67c8a9aade 100644
--- a/platform/local_country_file_utils.cpp
+++ b/platform/local_country_file_utils.cpp
@@ -136,11 +136,11 @@ void FindAllDiffsInDirectory(string const & dir, vector<LocalCountryFile> & diff
 string GetFilePath(int64_t version, string const & dataDir, CountryFile const & countryFile,
                    MapOptions options)
 {
-  string const readyFile = GetFileName(countryFile.GetName(), options, version);
+  string const filename = GetFileName(countryFile.GetName(), options, version);
   string const dir = GetDataDirFullPath(dataDir);
   if (version == 0)
-    return base::JoinFoldersToPath(dir, readyFile);
-  return base::JoinFoldersToPath({dir, strings::to_string(version)}, readyFile);
+    return base::JoinFoldersToPath(dir, filename);
+  return base::JoinFoldersToPath({dir, strings::to_string(version)}, filename);
 }
 }  // namespace
 
@@ -274,9 +274,10 @@ void FindAllLocalMapsAndCleanup(int64_t latestVersion, string const & dataDir,
 
   // World and WorldCoasts can be stored in app bundle or in resources
   // directory, thus it's better to get them via Platform.
-  for (string const & file :
-       {WORLD_FILE_NAME,
-        (migrate::NeedMigrate() ? WORLD_COASTS_OBSOLETE_FILE_NAME : WORLD_COASTS_FILE_NAME)})
+  string const world(WORLD_FILE_NAME);
+  string const worldCoasts(migrate::NeedMigrate() ? WORLD_COASTS_OBSOLETE_FILE_NAME
+                                                  : WORLD_COASTS_FILE_NAME);
+  for (string const & file : {world, worldCoasts})
   {
     auto i = localFiles.begin();
     for (; i != localFiles.end(); ++i)