- Added IceUtil::SyscallException and cleaned up few IceUtil exceptions

- Added errorToString() and lastErrorToString() functions to IceUtil/StringUtil.h
- Replaced multiple implementations of errorToString methods with the IceUtil one.
- Fixed bug 2641.

1 files changed, 224 insertions, 0 deletions

diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp
index 8a96f795358..3f0806dfb0f 100644
--- a/cpp/src/IceUtil/StringUtil.cpp
+++ b/cpp/src/IceUtil/StringUtil.cpp
@@ -446,3 +446,227 @@ IceUtilInternal::match(const string& s, const string& pat, bool emptyMatch)
 
     return true;
 }
+
+#ifdef _WIN32
+
+string
+IceUtilInternal::errorToString(int error, LPCVOID source)
+{
+    if(error < WSABASEERR)
+    {
+        LPVOID lpMsgBuf = 0;
+        DWORD ok = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                                 FORMAT_MESSAGE_FROM_SYSTEM |
+                                 FORMAT_MESSAGE_IGNORE_INSERTS | 
+                                 (source != NULL ? FORMAT_MESSAGE_FROM_HMODULE : 0),
+                                 source,
+                                 error,
+                                 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+                                 (LPTSTR)&lpMsgBuf,
+                                 0,
+                                 NULL);
+        if(ok)
+        {
+            LPCTSTR msg = (LPCTSTR)lpMsgBuf;
+            assert(msg && strlen((const char*)msg) > 0);
+            string result = (const char*)msg;
+            if(result[result.length() - 1] == '\n')
+            {
+                result = result.substr(0, result.length() - 2);
+            }
+            LocalFree(lpMsgBuf);
+            return result;
+        }
+        else
+        {
+            ostringstream os;
+            os << "unknown error: " << error;
+            return os.str();
+        }
+    }
+
+    switch(error)
+    {
+    case WSAEINTR:
+        return "WSAEINTR";
+        
+    case WSAEBADF:
+        return "WSAEBADF";
+        
+    case WSAEACCES:
+        return "WSAEACCES";
+        
+    case WSAEFAULT:
+        return "WSAEFAULT";
+        
+    case WSAEINVAL:
+        return "WSAEINVAL";
+        
+    case WSAEMFILE:
+        return "WSAEMFILE";
+        
+    case WSAEWOULDBLOCK:
+        return "WSAEWOULDBLOCK";
+        
+    case WSAEINPROGRESS:
+        return "WSAEINPROGRESS";
+        
+    case WSAEALREADY:
+        return "WSAEALREADY";
+        
+    case WSAENOTSOCK:
+        return "WSAENOTSOCK";
+        
+    case WSAEDESTADDRREQ:
+        return "WSAEDESTADDRREQ";
+        
+    case WSAEMSGSIZE:
+        return "WSAEMSGSIZE";
+        
+    case WSAEPROTOTYPE:
+        return "WSAEPROTOTYPE";
+        
+    case WSAENOPROTOOPT:
+        return "WSAENOPROTOOPT";
+        
+    case WSAEPROTONOSUPPORT:
+        return "WSAEPROTONOSUPPORT";
+        
+    case WSAESOCKTNOSUPPORT:
+        return "WSAESOCKTNOSUPPORT";
+        
+    case WSAEOPNOTSUPP:
+        return "WSAEOPNOTSUPP";
+        
+    case WSAEPFNOSUPPORT:
+        return "WSAEPFNOSUPPORT";
+        
+    case WSAEAFNOSUPPORT:
+        return "WSAEAFNOSUPPORT";
+        
+    case WSAEADDRINUSE:
+        return "WSAEADDRINUSE";
+        
+    case WSAEADDRNOTAVAIL:
+        return "WSAEADDRNOTAVAIL";
+        
+    case WSAENETDOWN:
+        return "WSAENETDOWN";
+        
+    case WSAENETUNREACH:
+        return "WSAENETUNREACH";
+        
+    case WSAENETRESET:
+        return "WSAENETRESET";
+        
+    case WSAECONNABORTED:
+        return "WSAECONNABORTED";
+        
+    case WSAECONNRESET:
+        return "WSAECONNRESET";
+        
+    case WSAENOBUFS:
+        return "WSAENOBUFS";
+        
+    case WSAEISCONN:
+        return "WSAEISCONN";
+        
+    case WSAENOTCONN:
+        return "WSAENOTCONN";
+        
+    case WSAESHUTDOWN:
+        return "WSAESHUTDOWN";
+        
+    case WSAETOOMANYREFS:
+        return "WSAETOOMANYREFS";
+        
+    case WSAETIMEDOUT:
+        return "WSAETIMEDOUT";
+        
+    case WSAECONNREFUSED:
+        return "WSAECONNREFUSED";
+        
+    case WSAELOOP:
+        return "WSAELOOP";
+        
+    case WSAENAMETOOLONG:
+        return "WSAENAMETOOLONG";
+        
+    case WSAEHOSTDOWN:
+        return "WSAEHOSTDOWN";
+        
+    case WSAEHOSTUNREACH:
+        return "WSAEHOSTUNREACH";
+        
+    case WSAENOTEMPTY:
+        return "WSAENOTEMPTY";
+        
+    case WSAEPROCLIM:
+        return "WSAEPROCLIM";
+        
+    case WSAEUSERS:
+        return "WSAEUSERS";
+        
+    case WSAEDQUOT:
+        return "WSAEDQUOT";
+        
+    case WSAESTALE:
+        return "WSAESTALE";
+        
+    case WSAEREMOTE:
+        return "WSAEREMOTE";
+        
+    case WSAEDISCON:
+        return "WSAEDISCON";
+        
+    case WSASYSNOTREADY:
+        return "WSASYSNOTREADY";
+        
+    case WSAVERNOTSUPPORTED:
+        return "WSAVERNOTSUPPORTED";
+        
+    case WSANOTINITIALISED:
+        return "WSANOTINITIALISED";
+        
+    case WSAHOST_NOT_FOUND:
+        return "WSAHOST_NOT_FOUND";
+        
+    case WSATRY_AGAIN:
+        return "WSATRY_AGAIN";
+        
+    case WSANO_RECOVERY:
+        return "WSANO_RECOVERY";
+        
+    case WSANO_DATA:
+        return "WSANO_DATA";
+
+    default:
+    {
+        ostringstream os;
+        os << "unknown socket error: " << error;
+        return os.str();
+    }
+    }
+}
+
+string
+IceUtilInternal::lastErrorToString()
+{
+    return errorToString(GetLastError());
+}
+
+#else
+
+string
+IceUtilInternal::errorToString(int error)
+{
+    return strerror(error);
+}
+
+string
+IceUtilInternal::lastErrorToString()
+{
+    return errorToString(errno);
+}
+
+#endif