diff options
| -rw-r--r-- | src/util/syserror.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/util/syserror.cpp b/src/util/syserror.cpp index 20f89057fc..d721602bbb 100644 --- a/src/util/syserror.cpp +++ b/src/util/syserror.cpp @@ -14,22 +14,21 @@ std::string SysErrorString(int err) { char buf[256]; - buf[0] = 0; /* Too bad there are three incompatible implementations of the * thread-safe strerror. */ - const char *s; + const char *s = nullptr; #ifdef WIN32 - s = buf; - if (strerror_s(buf, sizeof(buf), err) != 0) - buf[0] = 0; + if (strerror_s(buf, sizeof(buf), err) == 0) s = buf; #else #ifdef STRERROR_R_CHAR_P /* GNU variant can return a pointer outside the passed buffer */ s = strerror_r(err, buf, sizeof(buf)); #else /* POSIX variant always returns message in buffer */ - s = buf; - if (strerror_r(err, buf, sizeof(buf))) - buf[0] = 0; + if (strerror_r(err, buf, sizeof(buf)) == 0) s = buf; #endif #endif - return strprintf("%s (%d)", s, err); + if (s != nullptr) { + return strprintf("%s (%d)", s, err); + } else { + return strprintf("Unknown error (%d)", err); + } } |