more

Author: am11

src/coreclr/pal/inc/mbusafecrt.h

@@ -30,9 +30,6 @@ typedef int errno_t;
     extern "C" {
 #endif
 
-typedef void ( *tSafeCRT_AssertFuncPtr )( const char* inExpression, const char* inComment, const char* inFile, const unsigned long inLineNum );
-void MBUSafeCRTSetAssertFunc( tSafeCRT_AssertFuncPtr inAssertFuncPtr );
-
 extern errno_t strcat_s( char* ioDest, size_t inDestBufferSize, const char* inSrc );
 extern errno_t wcscat_s( WCHAR* ioDest, size_t inDestBufferSize, const WCHAR* inSrc );
 
@@ -44,15 +41,11 @@ extern errno_t wcscpy_s( WCHAR* outDest, size_t inDestBufferSize, const WCHAR* i
 
 extern errno_t strncpy_s( char* outDest, size_t inDestBufferSize, const char* inSrc, size_t inCount );
 extern errno_t wcsncpy_s( WCHAR* outDest, size_t inDestBufferSize, const WCHAR* inSrc, size_t inCount );
-extern errno_t wcsncpy_s( WCHAR* outDest, size_t inDestBufferSize, const WCHAR* inSrc, size_t inCount );
 
 extern size_t PAL_wcsnlen( const WCHAR* inString, size_t inMaxSize );
 
-extern errno_t _makepath_s( char* outDest, size_t inDestBufferSize, const char* inDrive, const char* inDirectory, const char* inFilename, const char* inExtension );
 extern errno_t _wmakepath_s( WCHAR* outDest, size_t inDestBufferSize, const WCHAR* inDrive, const WCHAR* inDirectory, const WCHAR* inFilename, const WCHAR* inExtension );
 
-extern errno_t _splitpath_s( const char* inPath, char* outDrive, size_t inDriveSize, char* outDirectory, size_t inDirectorySize, char* outFilename, size_t inFilenameSize, char* outExtension, size_t inExtensionSize );
-
 extern int sprintf_s( char *string, size_t sizeInBytes, const char *format, ... );
 
 extern int _snprintf_s( char *string, size_t sizeInBytes, size_t count, const char *format, ... );

src/coreclr/pal/src/CMakeLists.txt

@@ -181,7 +181,6 @@ set(SOURCES
   safecrt/mbusafecrt.cpp
   safecrt/safecrt_input_s.cpp
   safecrt/safecrt_winput_s.cpp
-  safecrt/splitpath_s.cpp
   safecrt/sprintf_s.cpp
   safecrt/sscanf_s.cpp
   safecrt/strcat_s.cpp

src/coreclr/pal/src/safecrt/internal_securecrt.h

@@ -46,25 +46,9 @@
     #define _CrtGetCheckCount()                 ((int)0)
 #endif
 
-/* Assert message and Invalid parameter */
-#ifdef _DEBUG
-    #define _ASSERT_EXPR( val, exp )                                            \
-        {                                                                       \
-            if ( ( val ) == 0 )                                                 \
-            {                                                                   \
-                if ( sMBUSafeCRTAssertFunc != NULL )                            \
-                {                                                               \
-                    ( *sMBUSafeCRTAssertFunc )( #exp, "SafeCRT assert failed", __FILE__, __LINE__ );    \
-                }                                                               \
-            }                                                                   \
-        }
-    #define _INVALID_PARAMETER( exp )   _ASSERT_EXPR( 0, exp )
-    #define _ASSERTE( exp ) _ASSERT_EXPR( exp, exp )
-#else
-    #define _ASSERT_EXPR( val, expr )
-    #define _INVALID_PARAMETER( exp )
-    #define _ASSERTE( exp )
-#endif
+#define _ASSERT_EXPR( val, expr )
+#define _INVALID_PARAMETER( exp )
+#define _ASSERTE( exp )
 
 /* _TRUNCATE */
 #if !defined (_TRUNCATE)

src/coreclr/pal/src/safecrt/mbusafecrt.cpp

@@ -16,19 +16,6 @@
 
 #include "mbusafecrt_internal.h"
 
-/* global data */
-tSafeCRT_AssertFuncPtr sMBUSafeCRTAssertFunc = NULL;
-
-/***
-*   MBUSafeCRTSetAssertFunc - Set the function called when an assert fails.
-****/
-
-void MBUSafeCRTSetAssertFunc( tSafeCRT_AssertFuncPtr inAssertFuncPtr )
-{
-    /* set it */
-    sMBUSafeCRTAssertFunc = inAssertFuncPtr;
-}
-
 /***
 *   _getc_nolock - getc for the miniFILE stream.
 ****/

src/coreclr/pal/src/safecrt/mbusafecrt_internal.h

@@ -52,8 +52,6 @@ typedef __builtin_va_list va_list;
 
 #define CASSERT(p) extern int sanity_check_dummy[1+((!(p))*(-2))];
 
-extern tSafeCRT_AssertFuncPtr sMBUSafeCRTAssertFunc;
-
 typedef struct miniFILE_struct
 {
     char* _ptr;