Remove Win32 Support

[iperf] / compat / error.c

diff --git a/compat/error.c b/compat/error.c
index 829ecc98bc247d4ef07b963f25dc0583050b77f9..1d3647e3e4e3b9e497b1efe191b52a7998e67e24 100644 (file)
--- a/compat/error.c
+++ b/compat/error.c
@@ -57,105 +57,6 @@
 extern "C" {
 #endif
 
-#ifdef WIN32
-
-/* -------------------------------------------------------------------
- * Implement a simple Win32 strerror function for our purposes.
- * These error values weren't handled by FormatMessage;
- * any particular reason why not??
- * ------------------------------------------------------------------- */
-
-struct mesg {
-    DWORD       err;
-    const char* str;
-};
-
-const struct mesg error_mesgs[] =
-{
-    { WSAEACCES,             "Permission denied"},
-    { WSAEADDRINUSE,         "Address already in use"},
-    { WSAEADDRNOTAVAIL,      "Cannot assign requested address"},
-    { WSAEAFNOSUPPORT,       "Address family not supported by protocol family"},
-    { WSAEALREADY,           "Operation already in progress"},
-    { WSAECONNABORTED,       "Software caused connection abort"},
-    { WSAECONNREFUSED,       "Connection refused"},
-    { WSAECONNRESET,         "Connection reset by peer"},
-    { WSAEDESTADDRREQ,       "Destination address required"},
-    { WSAEFAULT,             "Bad address"},
-    { WSAEHOSTDOWN,          "Host is down"},
-    { WSAEHOSTUNREACH,       "No route to host"},
-    { WSAEINPROGRESS,        "Operation now in progress"},
-    { WSAEINTR,              "Interrupted function call."},
-    { WSAEINVAL,             "Invalid argument."},
-    { WSAEISCONN,            "Socket is already connected."},
-    { WSAEMFILE,             "Too many open files."},
-    { WSAEMSGSIZE,           "Message too long"},
-    { WSAENETDOWN,           "Network is down"},
-    { WSAENETRESET,          "Network dropped connection on reset"},
-    { WSAENETUNREACH,        "Network is unreachable"},
-    { WSAENOBUFS,            "No buffer space available."},
-    { WSAENOPROTOOPT,        "Bad protocol option."},
-    { WSAENOTCONN,           "Socket is not connected"},
-    { WSAENOTSOCK,           "Socket operation on non-socket."},
-    { WSAEOPNOTSUPP,         "Operation not supported"},
-    { WSAEPFNOSUPPORT,       "Protocol family not supported"},
-    { WSAEPROCLIM,           "Too many processes."},
-    { WSAEPROTONOSUPPORT,    "Protocol not supported"},
-    { WSAEPROTOTYPE,         "Protocol wrong type for socket"},
-    { WSAESHUTDOWN,          "Cannot send after socket shutdown"},
-    { WSAESOCKTNOSUPPORT,    "Socket type not supported."},
-    { WSAETIMEDOUT,          "Connection timed out."},
-    { WSATYPE_NOT_FOUND,     "Class type not found."},
-    { WSAEWOULDBLOCK,        "Resource temporarily unavailable"},
-    { WSAHOST_NOT_FOUND,     "Host not found."},
-    { WSA_INVALID_HANDLE,    "Specified event object handle is invalid."},
-    { WSA_INVALID_PARAMETER, "One or more parameters are invalid."},
-    { WSA_IO_INCOMPLETE,     "Overlapped I/O event object not in signaled state."},
-    { WSA_IO_PENDING,        "Overlapped operations will complete later."},
-    { WSA_NOT_ENOUGH_MEMORY, "Insufficient memory available."},
-    { WSANOTINITIALISED,     "Successful WSAStartup not yet performed."},
-    { WSANO_DATA,            "Valid name, no data record of requested type."},
-    { WSANO_RECOVERY,        "This is a non-recoverable error."},
-    { WSASYSCALLFAILURE,     "System call failure."},
-    { WSASYSNOTREADY,        "Network subsystem is unavailable."},
-    { WSATRY_AGAIN,          "Non-authoritative host not found."},
-    { WSAVERNOTSUPPORTED,    "WINSOCK.DLL version out of range."},
-    { WSAEDISCON,            "Graceful shutdown in progress."},
-    { WSA_OPERATION_ABORTED, "Overlapped operation aborted."},
-    { 0,                     "No error."}
-
-    /* These appeared in the documentation, but didn't compile.
-     * { WSAINVALIDPROCTABLE,   "Invalid procedure table from service provider." },
-     * { WSAINVALIDPROVIDER,    "Invalid service provider version number." },
-     * { WSAPROVIDERFAILEDINIT, "Unable to initialize a service provider." },
-     */
-
-}; /* end error_mesgs[] */
-
-const char* winsock_strerror( DWORD inErrno );
-
-/* -------------------------------------------------------------------
- * winsock_strerror
- *
- * returns a string representing the error code. The error messages
- * were taken from Microsoft's online developer library.
- * ------------------------------------------------------------------- */
-
-const char* winsock_strerror( DWORD inErrno ) {
-    const char* str = "Unknown error";
-    int i;
-    for ( i = 0; i < sizeof(error_mesgs); i++ ) {
-        if ( error_mesgs[i].err == inErrno ) {
-            str = error_mesgs[i].str;
-            break;
-        }
-    }
-
-    return str;
-} /* end winsock_strerror */
-
-#endif /* WIN32 */
-
 /* -------------------------------------------------------------------
  * warn
  *
@@ -185,13 +86,8 @@ void warn_errno( const char *inMessage, const char *inFile, int inLine ) {
     const char* my_str;
 
     /* get platform's errno and error message */
-#ifdef WIN32
-    my_err = WSAGetLastError();
-    my_str = winsock_strerror( my_err );
-#else
     my_err = errno;
     my_str = strerror( my_err );
-#endif
 
     fflush( 0 );