Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use function overloading to handle variations in strerror_r() impleme… #124

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use function overloading to handle variations in strerror_r() impleme… #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 16 additions & 21 deletions evpp/sockets.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ namespace evpp {

static const std::string empty_string;

std::string strerror(int e) {
#ifdef H_OS_WINDOWS
std::string strerror(int e) {
LPVOID buf = nullptr;
::FormatMessageA(
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
Expand All @@ -20,29 +20,24 @@ std::string strerror(int e) {
LocalFree(buf);
return s;
}

#elif defined(H_OS_MACOSX)
char buf[2048] = {};
int rc = strerror_r(e, buf, sizeof(buf) - 1); // XSI-compliant
if (rc == 0) {
return std::string(buf);
}
return empty_string;
}
#else
std::string handle_strerror_r(const char* s, const char* buf) // GNU-specific
{
return (s) ? std::string(s) : empty_string;
}

std::string handle_strerror_r(int rc, const char* buf) // XSI-compliant
{
return (rc == 0) ? std::string(buf) : empty_string;
}

std::string strerror(int e) {
char buf[2048] = {};
#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE
int rc = strerror_r(e, buf, sizeof(buf) - 1); // XSI-compliant
if (rc == 0) {
return std::string(buf);
}
#else
const char* s = strerror_r(e, buf, sizeof(buf) - 1); // GNU-specific
if (s) {
return std::string(s);
}
#endif
#endif
return empty_string;
return handle_strerror_r(strerror_r(e, buf, sizeof(buf) - 1), buf);
}
#endif

namespace sock {
evpp_socket_t CreateNonblockingSocket() {
Expand Down