mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-01-13 09:20:25 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #719 from JamesReynolds/master

Browse Source 
Closes #717
This commit is contained in:
Gabi Melman 2018-06-01 16:42:45 +03:00 committed by GitHub
commit d78ddcee24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/spdlog/common.h
View File

@ -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

48
include/spdlog/details/os.h
View File

@ -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()
{