From d4ffe82237ba975b3358cf8b8314a9d06be37252 Mon Sep 17 00:00:00 2001
From: Michael Hansen <zrax0111@gmail.com>
Date: Tue, 12 Apr 2011 22:57:49 -0700
Subject: [PATCH] Completely remove broken version of WString conversion

---
 Sources/Plasma/CoreLib/hsUtils.cpp             | 14 --------------
 Sources/Plasma/CoreLib/hsUtils.h               |  2 --
 .../pfConsole/pfConsoleCommandsNet.cpp         | 18 ++++++------------
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/Sources/Plasma/CoreLib/hsUtils.cpp b/Sources/Plasma/CoreLib/hsUtils.cpp
index e9d0571d..5815f5da 100644
--- a/Sources/Plasma/CoreLib/hsUtils.cpp
+++ b/Sources/Plasma/CoreLib/hsUtils.cpp
@@ -357,13 +357,6 @@ wchar_t *hsStringToWString( const char *str )
     return wideString;
 }
 
-void    hsStringToWString( wchar_t *dst, const char *src )
-{
-    if (dst)
-        delete [] dst;
-    dst = hsStringToWString(src);
-}
-
 //// IWStringToString /////////////////////////////////////////////////////////
 // Converts a wchar_t * string to a char * string
 
@@ -390,13 +383,6 @@ char    *hsWStringToString( const wchar_t *str )
     return sStr;
 }
 
-void    hsWStringToString( char *dst, const wchar_t *src )
-{
-    if (dst)
-        delete [] dst;
-    dst = hsWStringToString(src);
-}
-
 void hsCPathToMacPath(char* dst, char* fname)
 {
     int i;
diff --git a/Sources/Plasma/CoreLib/hsUtils.h b/Sources/Plasma/CoreLib/hsUtils.h
index a4f71d2c..ab46d9c5 100644
--- a/Sources/Plasma/CoreLib/hsUtils.h
+++ b/Sources/Plasma/CoreLib/hsUtils.h
@@ -75,9 +75,7 @@ inline char *hsStrncpy(char *strDest, const char *strSource, size_t count)
 }
 
 wchar_t *hsStringToWString( const char *str );
-void    hsStringToWString( wchar_t *dst, const char *src );
 char    *hsWStringToString( const wchar_t *str );
-void    hsWStringToString( char *dst, const wchar_t *src);
 
 enum {              // Kind of MessageBox...passed to hsMessageBox
     hsMessageBoxAbortRetyIgnore,
diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
index 14227474..fd644197 100644
--- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
+++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
@@ -1073,8 +1073,7 @@ PF_CONSOLE_CMD(
     "string url",
     "Set the displayable server URL"
 ) {
-    wchar_t *wurl = NULL;
-    hsStringToWString(wurl, (const char *)params[0]);
+    wchar_t *wurl = hsStringToWString((const char *)params[0]);
     SetServerUrl(wurl);
     delete [] wurl;
 }
@@ -1086,8 +1085,7 @@ PF_CONSOLE_CMD(
     "string name",
     "Set the displayable server name"
 ) {
-    wchar_t *wname = NULL;
-    hsStringToWString(wname, (const char *)params[0]);
+    wchar_t *wname = hsStringToWString((const char *)params[0]);
     SetServerDisplayName(wname);
     delete [] wname;
 }
@@ -1104,8 +1102,7 @@ PF_CONSOLE_CMD(
     "string address",
     "Set the File Server address"
 ) {
-    wchar_t *wHost = NULL;
-    hsStringToWString(wHost, (const char *)params[0]);
+    wchar_t *wHost = hsStringToWString((const char *)params[0]);
     SetFileSrvHostname(wHost);
     delete [] wHost;
 }
@@ -1122,8 +1119,7 @@ PF_CONSOLE_CMD(
     "string address",
     "Set the Auth Server address"
 ) {
-    wchar_t *wHost = NULL;
-    hsStringToWString(wHost, (const char *)params[0]);
+    wchar_t *wHost = hsStringToWString((const char *)params[0]);
     SetAuthSrvHostname(wHost);
     delete [] wHost;
 }
@@ -1176,8 +1172,7 @@ PF_CONSOLE_CMD(
     "string address",
     "Set the Csr Server address"
 ) {
-    wchar_t *wHost = NULL;
-    hsStringToWString(wHost, (const char *)params[0]);
+    wchar_t *wHost = hsStringToWString((const char *)params[0]);
     SetCsrSrvHostname(wHost);
     delete [] wHost;
 }
@@ -1271,8 +1266,7 @@ PF_CONSOLE_CMD(
     "string address",
     "Set the GateKeeper Server address"
 ) {
-    wchar_t *wHost = NULL;
-    hsStringToWString(wHost, (const char *)params[0]);
+    wchar_t *wHost = hsStringToWString((const char *)params[0]);
     SetGateKeeperSrvHostname(wHost);
     delete [] wHost;
 }