Delete a few unused PAL APIs (#63916)

* Delete _fullpath PAL API * Delete PAL_wcscspn * Delete PAL_wcstok
dotnet · Jan 18, 2022 · 2f366a8 · 2f366a8
1 parent 207590a
commit 2f366a8
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 468 deletions.
diff --git a/src/coreclr/dlls/mscordac/mscordac_unixexports.src b/src/coreclr/dlls/mscordac/mscordac_unixexports.src
@@ -65,7 +65,6 @@ nativeStringResourceTable_mscorrc
 #PAL_wcsrchr
 #PAL_wcscmp
 #PAL_wcschr
-#PAL_wcscspn
 #PAL_wcscat
 #PAL_wcsstr
 #PAL__open

diff --git a/src/coreclr/pal/inc/pal.h b/src/coreclr/pal/inc/pal.h
@@ -3934,8 +3934,6 @@ PAL_GetCurrentThreadAffinitySet(SIZE_T size, UINT_PTR* data);
 #define wcspbrk       PAL_wcspbrk
 #define wcscmp        PAL_wcscmp
 #define wcsncpy       PAL_wcsncpy
-#define wcstok        PAL_wcstok
-#define wcscspn       PAL_wcscspn
 #define realloc       PAL_realloc
 #define fopen         PAL_fopen
 #define strtok        PAL_strtok
@@ -4125,8 +4123,6 @@ PALIMPORT DLLEXPORT const WCHAR * __cdecl PAL_wcschr(const WCHAR *, WCHAR);
 PALIMPORT DLLEXPORT const WCHAR * __cdecl PAL_wcsrchr(const WCHAR *, WCHAR);
 PALIMPORT WCHAR _WConst_return * __cdecl PAL_wcspbrk(const WCHAR *, const WCHAR *);
 PALIMPORT DLLEXPORT WCHAR _WConst_return * __cdecl PAL_wcsstr(const WCHAR *, const WCHAR *);
-PALIMPORT WCHAR * __cdecl PAL_wcstok(WCHAR *, const WCHAR *);
-PALIMPORT DLLEXPORT size_t __cdecl PAL_wcscspn(const WCHAR *, const WCHAR *);
 PALIMPORT int __cdecl PAL_swprintf(WCHAR *, const WCHAR *, ...);
 PALIMPORT int __cdecl PAL_vswprintf(WCHAR *, const WCHAR *, va_list);
 PALIMPORT int __cdecl PAL_swscanf(const WCHAR *, const WCHAR *, ...);

diff --git a/src/coreclr/pal/inc/palprivate.h b/src/coreclr/pal/inc/palprivate.h
@@ -203,8 +203,6 @@ CompareFileTime(
         IN CONST FILETIME *lpFileTime1,
         IN CONST FILETIME *lpFileTime2);
 
-PALIMPORT char * __cdecl _fullpath(char *, const char *, size_t);
-
 /*  These are from the <FCNTL.H> file in windows.
     They are needed for _open_osfhandle.*/
 #define _O_RDONLY   0x0000

diff --git a/src/coreclr/pal/src/CMakeLists.txt b/src/coreclr/pal/src/CMakeLists.txt
@@ -123,15 +123,13 @@ set(SOURCES
   cruntime/malloc.cpp
   cruntime/math.cpp
   cruntime/misc.cpp
-  cruntime/path.cpp
   cruntime/printf.cpp
   cruntime/printfcpp.cpp
   cruntime/silent_printf.cpp
   cruntime/string.cpp
   cruntime/stringtls.cpp
   cruntime/thread.cpp
   cruntime/wchar.cpp
-  cruntime/wchartls.cpp
   debug/debug.cpp
   exception/seh.cpp
   exception/signal.cpp

diff --git a/src/coreclr/pal/src/cruntime/path.cpp b/src/coreclr/pal/src/cruntime/path.cpp
diff --git a/src/coreclr/pal/src/cruntime/wchar.cpp b/src/coreclr/pal/src/cruntime/wchar.cpp
@@ -3,8 +3,6 @@
 
 /*++
 
-
-
 Module Name:
 
     wchar.c
@@ -13,19 +11,15 @@ Module Name:
 
     Implementation of wide char string functions.
 
-
-
 --*/
 
-
 #include "pal/palinternal.h"
 #include "pal/cruntime.h"
 #include "pal/dbgmsg.h"
 
 #include "pal/thread.hpp"
 #include "pal/threadsusp.hpp"
 
-
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -950,46 +944,3 @@ PAL_wcstod( const wchar_16 * nptr, wchar_16 **endptr )
     PERF_EXIT(wcstod);
     return RetVal;
 }
-
-/*++
-Function:
-   PAL_wcscspn
-
-Finds the number of consecutive characters from the start of the string
-that are not in the set.
-
-Return value:
-
-The number of characters from the start of the string that are not in
-the set.
-
-Parameters:
-string          String
-strCharSet      Set of delimiter characters
-
---*/
-size_t
-__cdecl
-PAL_wcscspn(const wchar_16 *string, const wchar_16 *strCharSet)
-{
-    const wchar_16 *temp;
-    size_t count = 0;
-
-    PERF_ENTRY(wcscspn);
-
-    while(*string != 0)
-    {
-        for(temp = strCharSet; *temp != 0; temp++)
-        {
-            if (*string == *temp)
-            {
-                PERF_EXIT(wcscspn);
-                return count;
-            }
-        }
-        count++;
-        string++;
-    }
-    PERF_EXIT(wcscspn);
-    return count;
-}
diff --git a/src/coreclr/pal/src/cruntime/wchartls.cpp b/src/coreclr/pal/src/cruntime/wchartls.cpp
diff --git a/src/coreclr/pal/src/include/pal/palinternal.h b/src/coreclr/pal/src/include/pal/palinternal.h
@@ -526,8 +526,6 @@ function_name() to call the system's implementation
 #undef wcsstr
 #undef wcscmp
 #undef wcsncpy
-#undef wcstok
-#undef wcscspn
 #undef iswupper
 #undef iswspace
 #undef towlower

diff --git a/src/coreclr/pal/tests/palsuite/CMakeLists.txt b/src/coreclr/pal/tests/palsuite/CMakeLists.txt
@@ -415,7 +415,6 @@ add_executable_clr(paltests
   c_runtime/wcsstr/test1/test1.cpp
   c_runtime/wcstod/test1/test1.cpp
   c_runtime/wcstod/test2/test2.cpp
-  c_runtime/wcstok/test1/test1.cpp
   c_runtime/wcstoul/test1/test1.cpp
   c_runtime/wcstoul/test2/test2.cpp
   c_runtime/wcstoul/test3/test3.cpp