Purge code for Windows XP and MSVC pre-2015.

[user/henk/code/inspircd.git] / win / inspircd_win32wrapper.cpp

diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index 7a07868f90907fe3f545901731163445e72d9dd1..fc739f9bd17916ecb8c083d097efa3dec461094d 100644 (file)
--- a/win/inspircd_win32wrapper.cpp
+++ b/win/inspircd_win32wrapper.cpp
@@ -30,46 +30,6 @@
 #include <errno.h>
 #include <assert.h>
 
-CoreExport const char *insp_inet_ntop(int af, const void *src, char *dst, socklen_t cnt)
-{
-
-       if (af == AF_INET)
-       {
-               struct sockaddr_in in;
-               memset(&in, 0, sizeof(in));
-               in.sin_family = AF_INET;
-               memcpy(&in.sin_addr, src, sizeof(struct in_addr));
-               getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST);
-               return dst;
-       }
-       else if (af == AF_INET6)
-       {
-               struct sockaddr_in6 in;
-               memset(&in, 0, sizeof(in));
-               in.sin6_family = AF_INET6;
-               memcpy(&in.sin6_addr, src, sizeof(struct in_addr6));
-               getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST);
-               return dst;
-       }
-       return NULL;
-}
-
-CoreExport int insp_inet_pton(int af, const char *src, void *dst)
-{
-       sockaddr_in sa;
-       int len = sizeof(SOCKADDR);
-       int rv = WSAStringToAddressA((LPSTR)src, af, NULL, (LPSOCKADDR)&sa, &len);
-       if(rv >= 0)
-       {
-               if(WSAGetLastError() == WSAEINVAL)
-                       rv = 0;
-               else
-                       rv = 1;
-       }
-       memcpy(dst, &sa.sin_addr, sizeof(struct in_addr));
-       return rv;
-}
-
 CoreExport DIR * opendir(const char * path)
 {
        std::string search_path = std::string(path) + "\\*.*";
@@ -144,7 +104,7 @@ int getopt_long(int ___argc, char *const *___argv, const char *__shortopts, cons
 //                                     optind++;               // Trash this next argument, we won't be needing it.
                                        par = ___argv[optind-1];
                                }
-                       }                       
+                       }
 
                        // increment the argument for next time
 //                     optind++;
@@ -170,9 +130,9 @@ int getopt_long(int ___argc, char *const *___argv, const char *__shortopts, cons
                        {
                                if (__longopts[i].val == -1 || par == 0)
                                        return 1;
-                               
+
                                return __longopts[i].val;
-                       }                       
+                       }
                        break;
                }
        }
@@ -186,6 +146,11 @@ CWin32Exception::CWin32Exception() : exception()
        dwErrorCode = GetLastError();
        if( FormatMessageA( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)szErrorString, _countof(szErrorString), NULL) == 0 )
                sprintf_s(szErrorString, _countof(szErrorString), "Error code: %u", dwErrorCode);
+       for (size_t i = 0; i < _countof(szErrorString); i++)
+       {
+               if ((szErrorString[i] == '\r') || (szErrorString[i] == '\n'))
+                       szErrorString[i] = 0;
+       }
 }
 
 CWin32Exception::CWin32Exception(const CWin32Exception& other)
@@ -202,10 +167,3 @@ DWORD CWin32Exception::GetErrorCode()
 {
        return dwErrorCode;
 }
-
-#include "../src/modules/m_spanningtree/link.h"
-#include "modules/ssl.h"
-template class reference<Link>;
-template class reference<Autoconnect>;
-template class reference<ssl_cert>;
-template class reference<OperInfo>;