Merge pull request #719 from JamesReynolds/master

Closes #717

2 files changed, 9 insertions, 54 deletions

diff --git a/include/spdlog/common.h b/include/spdlog/common.h
index e7f47fd2..e6d9a557 100644
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@@ -143,11 +143,6 @@ enum class pattern_time_type
 //
 // Log exception
 //
-namespace details {
-namespace os {
-std::string errno_str(int err_num);
-}
-} // namespace details
 class spdlog_ex : public std::exception
 {
 public:
@@ -158,7 +153,15 @@ public:
 
     spdlog_ex(const std::string &msg, int last_errno)
     {
-        _msg = msg + ": " + details::os::errno_str(last_errno);
+        char buf[256], *buf_ptr = buf;
+        SPDLOG_CONSTEXPR auto buf_size = sizeof(buf);
+        if (fmt::safe_strerror(last_errno, buf_ptr, buf_size) != 0)
+        {
+            buf_ptr = buf;
+            char unknown[] = "Unknown error";
+            std::copy(unknown, unknown + sizeof(unknown), buf_ptr);
+        }
+        _msg = msg + ": " + std::string(buf_ptr);
     }
 
     const char *what() const SPDLOG_NOEXCEPT override
diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h
index a9246de2..28eb53c3 100644
--- a/include/spdlog/details/os.h
+++ b/include/spdlog/details/os.h
@@ -383,54 +383,6 @@ inline std::string filename_to_str(const filename_t &filename)
 }
 #endif
 
-inline std::string errno_to_string(char[256], char *res)
-{
-    return std::string(res);
-}
-
-inline std::string errno_to_string(char buf[256], int res)
-{
-    if (res == 0)
-    {
-        return std::string(buf);
-    }
-    return "Unknown error";
-}
-
-// Return errno string (thread safe)
-inline std::string errno_str(int err_num)
-{
-    char buf[256];
-    SPDLOG_CONSTEXPR auto buf_size = sizeof(buf);
-
-#ifdef _WIN32
-    if (strerror_s(buf, buf_size, err_num) == 0)
-    {
-        return std::string(buf);
-    }
-    else
-    {
-        return "Unknown error";
-    }
-
-#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || defined(__SUNPRO_CC) ||                                            \
-    ((_POSIX_C_SOURCE >= 200112L) && !defined(_GNU_SOURCE)) // posix version
-
-    if (strerror_r(err_num, buf, buf_size) == 0)
-    {
-        return std::string(buf);
-    }
-    else
-    {
-        return "Unknown error";
-    }
-
-#else // gnu version (might not use the given buf, so its retval pointer must be used)
-    auto err = strerror_r(err_num, buf, buf_size); // let compiler choose type
-    return errno_to_string(buf, err);              // use overloading to select correct stringify function
-#endif
-}
-
 inline int pid()
 {