diff --git a/platform/platform.cpp b/platform/platform.cpp index efb9a72..c94fc20 100644 --- a/platform/platform.cpp +++ b/platform/platform.cpp @@ -14,12 +14,6 @@ #include #include -#if defined(GEOCORE_OS_MAC) -#include -#else -#include -#endif - #include #include @@ -399,43 +393,6 @@ bool Platform::GetFileSizeByFullPath(string const & filePath, uint64_t & size) else return false; } -Platform::TStorageStatus Platform::GetWritableStorageStatus(uint64_t neededSize) const -{ - struct statfs st; - int const ret = statfs(m_writableDir.c_str(), &st); - - LOG(LDEBUG, ("statfs return =", ret, - "; block size =", st.f_bsize, - "; blocks available =", st.f_bavail)); - - if (ret != 0) - { - LOG(LERROR, ("Path:", m_writableDir, "statfs error:", ErrnoToError())); - return STORAGE_DISCONNECTED; - } - - /// @todo May be add additional storage space. - if (st.f_bsize * st.f_bavail < neededSize) - return NOT_ENOUGH_SPACE; - - return STORAGE_OK; -} - -uint64_t Platform::GetWritableStorageSpace() const -{ - struct statfs st; - int const ret = statfs(m_writableDir.c_str(), &st); - - LOG(LDEBUG, ("statfs return =", ret, - "; block size =", st.f_bsize, - "; blocks available =", st.f_bavail)); - - if (ret != 0) - LOG(LERROR, ("Path:", m_writableDir, "statfs error:", ErrnoToError())); - - return (ret != 0) ? 0 : st.f_bsize * st.f_bavail; -} - namespace { // Web service ip to check internet connection. Now it's a mail.ru ip. diff --git a/platform/platform.hpp b/platform/platform.hpp index 5a5d80d..62802e5 100644 --- a/platform/platform.hpp +++ b/platform/platform.hpp @@ -220,19 +220,12 @@ public: STORAGE_DISCONNECTED, NOT_ENOUGH_SPACE }; - TStorageStatus GetWritableStorageStatus(uint64_t neededSize) const; - uint64_t GetWritableStorageSpace() const; // Please note, that number of active cores can vary at runtime. // DO NOT assume for the same return value between calls. unsigned CpuCores() const; - - std::string UniqueClientId() const; - - - /// \brief Placing an executable object |task| on a queue of |thread|. Then the object will be /// executed on |thread|. /// \note |task| cannot be moved in case of |Thread::Gui|. This way unique_ptr cannot be used diff --git a/platform/platform_tests/platform_test.cpp b/platform/platform_tests/platform_test.cpp index d6468cc..73aa8db 100644 --- a/platform/platform_tests/platform_test.cpp +++ b/platform/platform_tests/platform_test.cpp @@ -208,12 +208,6 @@ UNIT_TEST(CpuCores) TEST_LESS_OR_EQUAL(coresNum, 128, ()); } -UNIT_TEST(GetWritableStorageStatus) -{ - TEST_EQUAL(Platform::STORAGE_OK, GetPlatform().GetWritableStorageStatus(100000), ()); - TEST_EQUAL(Platform::NOT_ENOUGH_SPACE, GetPlatform().GetWritableStorageStatus(uint64_t(-1)), ()); -} - UNIT_TEST(RmDirRecursively) { std::string const testDir1 = base::JoinPath(GetPlatform().WritableDir(), "test_dir1"); diff --git a/platform/preferred_languages.cpp b/platform/preferred_languages.cpp index 20a353e..4599283 100644 --- a/platform/preferred_languages.cpp +++ b/platform/preferred_languages.cpp @@ -3,15 +3,7 @@ #include "base/logging.hpp" #include "base/macros.hpp" -#include "platform/target_os.hpp" - -#if defined(GEOCORE_OS_MAC) - #include - #include -#elif defined(GEOCORE_OS_LINUX) - #include -#endif - +#include #include #include @@ -22,7 +14,6 @@ namespace languages void GetSystemPreferred(vector & languages) { -#if defined(GEOCORE_OS_MAC) || defined(GEOCORE_OS_LINUX) // check environment variables char const * p = getenv("LANGUAGE"); if (p && strlen(p)) // LANGUAGE can contain several values divided by ':' @@ -38,22 +29,6 @@ void GetSystemPreferred(vector & languages) languages.push_back(p); else if ((p = getenv("LANG"))) languages.push_back(p); -#if defined(GEOCORE_OS_MAC) - else - { - // Mac and iOS implementation - CFArrayRef langs = CFLocaleCopyPreferredLanguages(); - char buf[30]; - for (CFIndex i = 0; i < CFArrayGetCount(langs); ++i) - { - CFStringRef strRef = (CFStringRef)CFArrayGetValueAtIndex(langs, i); - CFStringGetCString(strRef, buf, 30, kCFStringEncodingUTF8); - languages.push_back(buf); - } - CFRelease(langs); - } -#endif // defined(GEOCORE_OS_MAC) -#endif // defined(GEOCORE_OS_MAC) || defined(GEOCORE_OS_LINUX) } string GetPreferred()