From 8a20512b77c6a022f45bc585373e981d71a727ea Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Tue, 26 Sep 2017 12:21:45 +0300 Subject: [platform] Fixed warnings in MkDir. --- storage/storage.cpp | 8 ++++++-- storage/storage_tests/storage_tests.cpp | 7 +++---- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'storage') diff --git a/storage/storage.cpp b/storage/storage.cpp index 4956578fe8..8c2aa0b662 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -15,6 +15,7 @@ #include "coding/reader.hpp" #include "coding/url_encode.hpp" +#include "base/exception.hpp" #include "base/gmtime.hpp" #include "base/logging.hpp" #include "base/scope_guard.hpp" @@ -655,8 +656,11 @@ void Storage::LoadCountriesFile(string const & pathToCountriesFile, string const { m_dataDir = dataDir; - if (!m_dataDir.empty()) - Platform::MkDir(my::JoinFoldersToPath(GetPlatform().WritableDir(), m_dataDir)); + if (!m_dataDir.empty() && + !Platform::MkDirChecked(my::JoinFoldersToPath(GetPlatform().WritableDir(), m_dataDir))) + { + MYTHROW(FileSystemException, ("Unable to find or create directory", m_dataDir)); + } if (m_countries.IsEmpty()) { diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp index 645e81aa12..8e24bc17f6 100644 --- a/storage/storage_tests/storage_tests.cpp +++ b/storage/storage_tests/storage_tests.cpp @@ -38,6 +38,7 @@ #include "defines.hpp" +#include "base/assert.hpp" #include "base/scope_guard.hpp" #include "base/string_utils.hpp" @@ -1380,10 +1381,8 @@ UNIT_TEST(StorageTest_GetUpdateInfoSingleMwm) classificator::Load(); WritableDirChanger writableDirChanger(kMapTestDir); - Platform & platform = GetPlatform(); - - string const kVersion1Dir = my::JoinFoldersToPath(platform.WritableDir(), "1"); - platform.MkDir(kVersion1Dir); + string const kVersion1Dir = my::JoinFoldersToPath(GetPlatform().WritableDir(), "1"); + CHECK_EQUAL(Platform::MkDir(kVersion1Dir), Platform::ERR_OK, ()); LocalCountryFile country1(kVersion1Dir, CountryFile("OutdatedCountry1"), 1); LocalCountryFile country2(kVersion1Dir, CountryFile("OutdatedCountry2"), 1); -- cgit v1.2.3