From 13ebfc077988fed6e0153a2038ca177408ef9d2b Mon Sep 17 00:00:00 2001
From: gabime <gmelman1@gmail.com>
Date: Fri, 13 Dec 2019 16:00:55 +0200
Subject: [PATCH] rename function

---
 include/spdlog/cfg/env-inl.h    | 4 ++--
 include/spdlog/cfg/env.h        | 2 +-
 include/spdlog/details/os-inl.h | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/spdlog/cfg/env-inl.h b/include/spdlog/cfg/env-inl.h
index d4ce0d14..81b9adb1 100644
--- a/include/spdlog/cfg/env-inl.h
+++ b/include/spdlog/cfg/env-inl.h
@@ -79,7 +79,7 @@ SPDLOG_INLINE std::unordered_map<std::string, std::string> extract_key_vals_(con
     return rv;
 }
 
-inline details::registry::logger_levels levels_from_string_(const std::string& input)
+inline details::registry::logger_levels extract_levels_(const std::string& input)
 {
     auto key_vals = extract_key_vals_(input);
     details::registry::logger_levels rv;
@@ -110,7 +110,7 @@ inline details::registry::logger_levels levels_from_string_(const std::string& i
 
 SPDLOG_INLINE void load_levels()
 {
-    auto levels = levels_from_string_(details::os::getenv("SPDLOG_LEVEL"));
+    auto levels = extract_levels_(details::os::getenv("SPDLOG_LEVEL"));
     spdlog::details::registry::instance().set_levels(levels);
 }
 
diff --git a/include/spdlog/cfg/env.h b/include/spdlog/cfg/env.h
index 83336c2c..9a74f999 100644
--- a/include/spdlog/cfg/env.h
+++ b/include/spdlog/cfg/env.h
@@ -26,7 +26,7 @@
 namespace spdlog {
 namespace env {
 void load_levels();
-}
+} // namespace env
 } // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
diff --git a/include/spdlog/details/os-inl.h b/include/spdlog/details/os-inl.h
index 34b14218..e91ea71e 100644
--- a/include/spdlog/details/os-inl.h
+++ b/include/spdlog/details/os-inl.h
@@ -538,14 +538,16 @@ SPDLOG_INLINE filename_t dir_name(filename_t path)
 
 std::string SPDLOG_INLINE getenv(const char *field)
 {
+
+#if defined(_MSC_VER)
 #if defined(__cplusplus_winrt)
-    SPDLOG_THROW(spdlog_ex("getenv is not supported under uwp"));
-#endif
-#if defined(_MSC_VER) && !defined(__cplusplus_winrt)
+    return std::string{}; //not supported under uwp
+#else
     size_t len = 0;
     char buf[128];
     bool ok = ::getenv_s(&len, buf, sizeof(buf), field) == 0;
     return ok ? buf : std::string{};
+#endif
 #else // revert to getenv
     char *buf = ::getenv(field);
     return buf ? buf : std::string{};