generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-31 16:04:27 +02:00
Code Issues Projects Releases Wiki Activity

Error: simplify strerror_r() handling (#1647)

Browse Source 
This is a simpler version of the existing strerror_r()
handling.

Idea borrowed from boost.asio:
  443bc17d13
This commit is contained in:
andred 2017-07-05 23:14:00 +01:00 committed by Aleksandar Fabijanic
parent 262079b0f0
commit a9598960e4
2 changed files with 11 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Foundation/include/Poco/Error.h
View File

@ -44,6 +44,11 @@ public:
static std::string getMessage(int errorCode); static std::string getMessage(int errorCode);
/// Utility function translating numeric error code to string. /// Utility function translating numeric error code to string.
private:
// Helper function to adapt the result from glibc's variant of strerror_r.
static const char* strerror_result(int, const char* s) { return s; }
static const char* strerror_result(const char* s, const char*) { return s; }
#endif #endif
}; };

53
Foundation/src/Error.cpp
View File

@ -64,55 +64,14 @@ namespace Poco {
} }
class StrErrorHelper
/// This little hack magically handles all variants
/// of strerror_r() (POSIX and GLIBC) and strerror().
{
public:
explicit StrErrorHelper(int err)
{
_buffer[0] = 0;
#if (_XOPEN_SOURCE >= 600) || POCO_ANDROID || __APPLE__
setMessage(strerror_r(err, _buffer, sizeof(_buffer)));
#elif _GNU_SOURCE
setMessage(strerror_r(err, _buffer, sizeof(_buffer)));
#else
setMessage(strerror(err));
#endif
}
~StrErrorHelper()
{
}
const std::string& message() const
{
return _message;
}
protected:
void setMessage(int rc)
/// Handles POSIX variant
{
_message = _buffer;
}
void setMessage(const char* msg)
/// Handles GLIBC variant
{
_message = msg;
}
private:
char _buffer[256];
std::string _message;
};
std::string Error::getMessage(int errorCode) std::string Error::getMessage(int errorCode)
{ {
StrErrorHelper helper(errorCode); #if defined _GNU_SOURCE || (_XOPEN_SOURCE >= 600) || POCO_ANDROID || __APPLE__
return helper.message(); char errmsg[256] = "";
return std::string(strerror_result(strerror_r(errorCode, errmsg, sizeof(errmsg)), errmsg));
#else
return std::string(strerror(errorCode));
#endif
} }