From d1b4ba333a54ada6bb3177b0326c0d922f4d3ee8 Mon Sep 17 00:00:00 2001
From: Aditya Mandaleeka <adityam@microsoft.com>
Date: Tue, 3 Nov 2015 19:21:51 -0800
Subject: [PATCH] Remove thread parameter from some string functions in PAL.

---
 src/pal/src/include/pal/corunix.hpp | 14 ----------
 src/pal/src/misc/strutil.cpp        | 54 ++-----------------------------------
 src/pal/src/objmgr/palobjbase.cpp   |  2 +-
 3 files changed, 3 insertions(+), 67 deletions(-)

diff --git a/src/pal/src/include/pal/corunix.hpp b/src/pal/src/include/pal/corunix.hpp
index e778199..76abfc1 100644
--- a/src/pal/src/include/pal/corunix.hpp
+++ b/src/pal/src/include/pal/corunix.hpp
@@ -103,7 +103,6 @@ namespace CorUnix
 
         PAL_ERROR
         CopyString(
-            CPalThread *pthr,
             CPalString *psSource
             );
 
@@ -1358,19 +1357,6 @@ namespace CorUnix
     };
 
     extern IFileLockManager *g_pFileLockManager;
-
-    //
-    // Utility function for converting sz object names to wsz
-    //
-
-    PAL_ERROR
-    InternalWszNameFromSzName(
-        CPalThread *pthr,
-        LPCSTR pszName,
-        LPWSTR pwszName,
-        DWORD cch
-        );
-
 }
 
 #endif // _CORUNIX_H
diff --git a/src/pal/src/misc/strutil.cpp b/src/pal/src/misc/strutil.cpp
index ddeef06..e0f2cb2 100644
--- a/src/pal/src/misc/strutil.cpp
+++ b/src/pal/src/misc/strutil.cpp
@@ -35,13 +35,11 @@ Function:
   as necessary
 
 Parameters:
-  pthr -- thread data for calling thread
   psSource -- the string to copy from
 --*/
 
 PAL_ERROR
 CPalString::CopyString(
-    CPalThread *pthr,
     CPalString *psSource
     )
 {
@@ -50,7 +48,7 @@ CPalString::CopyString(
     _ASSERTE(NULL != psSource);
     _ASSERTE(NULL == m_pwsz);
     _ASSERTE(0 == m_dwStringLength);
-    _ASSERTE(0 == m_dwMaxLength);    
+    _ASSERTE(0 == m_dwMaxLength);
 
     if (0 != psSource->GetStringLength())
     {
@@ -63,7 +61,7 @@ CPalString::CopyString(
         if (NULL != pwsz)
         {
             _ASSERTE(NULL != psSource->GetString());
-            
+
             CopyMemory(
                 pwsz,
                 psSource->GetString(),
@@ -102,51 +100,3 @@ CPalString::FreeBuffer(
     
     InternalFree(const_cast<WCHAR*>(m_pwsz));
 }
-
-/*++
-Function:
-  InternalWszNameFromSzName
-
-  Helper function to convert an ANSI string object name parameter to a
-  unicode string
-
-Parameters:
-  pthr -- thread data for calling thread
-  pszName -- the ANSI string name
-  pwszName -- on success, receives the converted unicode string
-  cch -- the size of pwszName, in characters
---*/
-
-PAL_ERROR
-CorUnix::InternalWszNameFromSzName(
-    CPalThread *pthr,
-    LPCSTR pszName,
-    LPWSTR pwszName,
-    DWORD cch
-    )
-{
-    PAL_ERROR palError = NO_ERROR;
-
-    _ASSERTE(NULL != pthr);
-    _ASSERTE(NULL != pszName);
-    _ASSERTE(NULL != pwszName);
-    _ASSERTE(0 < cch);
-    
-    if (MultiByteToWideChar(CP_ACP, 0, pszName, -1, pwszName, cch) == 0)
-    {
-        palError = pthr->GetLastError();
-        if (ERROR_INSUFFICIENT_BUFFER == palError)
-        {
-            ERROR("pszName is larger than cch (%d)!\n", palError);
-            palError = ERROR_FILENAME_EXCED_RANGE;
-        }
-        else
-        {
-            ERROR("MultiByteToWideChar failure! (error=%d)\n", palError);
-            palError = ERROR_INVALID_PARAMETER;
-        }            
-    }
-
-    return palError;
-}
-
diff --git a/src/pal/src/objmgr/palobjbase.cpp b/src/pal/src/objmgr/palobjbase.cpp
index a75a974..63e0f86 100644
--- a/src/pal/src/objmgr/palobjbase.cpp
+++ b/src/pal/src/objmgr/palobjbase.cpp
@@ -97,7 +97,7 @@ CPalObjectBase::Initialize(
 
     if (0 != poa->sObjectName.GetStringLength())
     {
-        palError = m_oa.sObjectName.CopyString(pthr, &poa->sObjectName);
+        palError = m_oa.sObjectName.CopyString(&poa->sObjectName);
     }
 
 IntializeExit:
-- 
2.7.4