Cleanup some unused code in coreclr pal

Author: am11

src/coreclr/pal/inc/mbusafecrt.h

@@ -3,15 +3,11 @@
 
 /***
 *   mbusafecrt.h - public declarations for SafeCRT lib
-*
-
 *
 *   Purpose:
 *       This file contains the public declarations SafeCRT
 *       functions ported to MacOS. These are the safe versions of
 *       functions standard functions banned by SWI
-*
-
 ****/
 
 /* shields! */
@@ -65,7 +61,6 @@ extern int vsprintf_s( char* string, size_t sizeInBytes, const char* format, va_
 extern int _vsnprintf_s( char* string, size_t sizeInBytes, size_t count, const char* format, va_list arglist );
 
 extern int sscanf_s( const char *string, const char *format, ... );
-extern int swscanf_s( const WCHAR *string, const WCHAR *format, ... );
 
 extern errno_t memcpy_s( void * dst, size_t sizeInBytes, const void * src, size_t count );
 extern errno_t memmove_s( void * dst, size_t sizeInBytes, const void * src, size_t count );

src/coreclr/pal/inc/pal.h

@@ -2,13 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 /*++
-
 Module Name:
-
     pal.h
 
 Abstract:
-
     CoreCLR Platform Adaptation Layer (PAL) header file.  This file
     defines all types and API calls required by the CoreCLR when
     compiled for Unix-like systems.
@@ -27,7 +24,6 @@ Module Name:
 
     If you want to add a PAL_ wrapper function to a native function in
     here, you also need to edit palinternal.h and win32pal.h.
-
 --*/
 
 #ifndef __PAL_H__
@@ -3446,16 +3442,6 @@ PALAPI
 GetSystemInfo(
           OUT LPSYSTEM_INFO lpSystemInfo);
 
-PALIMPORT
-BOOL
-PALAPI
-PAL_SetCurrentThreadAffinity(WORD procNo);
-
-PALIMPORT
-BOOL
-PALAPI
-PAL_GetCurrentThreadAffinitySet(SIZE_T size, UINT_PTR* data);
-
 //
 // The types of events that can be logged.
 //

src/coreclr/pal/inc/rt/safecrt.h

@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-//
 
 //
 /***
@@ -9,7 +8,6 @@
 *Purpose:
 *       This file contains a subset of the Secure CRT. It is meant to
 *       be used in the Windows source tree.
-*
 ****/
 
 /* #pragma once */
@@ -355,7 +353,6 @@ void __cdecl _invalid_parameter(const WCHAR *_Message, const WCHAR *_FunctionNam
 #define _tmakepath_s    _wmakepath_s
 #define _stprintf_s     swprintf_s
 #define _tscanf_s       wscanf_s
-#define _tsscanf_s      swscanf_s
 
 #else
 
@@ -1266,14 +1263,6 @@ int __cdecl wscanf_s(const WCHAR *_Format, ...);
 
 /* no inline version of wscanf_s */
 
-/* swscanf_s */
-_SAFECRT__EXTERN_C
-int __cdecl swscanf_s(const WCHAR *_String, const WCHAR *_Format, ...);
-
-/* no C++ overload for swscanf_s */
-
-/* no inline version of swscanf_s */
-
 /* _swnscanf_s */
 _SAFECRT__EXTERN_C
 int __cdecl _swnscanf_s(const WCHAR *_String, size_t _Count, const WCHAR *_Format, ...);

src/coreclr/pal/src/safecrt/cruntime.h

@@ -3,25 +3,18 @@
 
 /***
 *input.c - C formatted input, used by scanf, etc.
-*
-
 *
 *Purpose:
 *       defines _input() to do formatted input; called from scanf(),
-*       etc. functions.  This module defines _cscanf() instead when
-*       CPRFLAG is defined.  The file cscanf.c defines that symbol
-*       and then includes this file in order to implement _cscanf().
+*       etc. functions.
 *
 *Note:
 *       this file is included in safecrt.lib build directly, plese refer
 *       to safecrt_[w]input_s.c
-*
 *******************************************************************************/
 
-
 #define ALLOW_RANGE /* enable "%[a-z]"-style scansets */
 
-
 /* temporary work-around for compiler without 64-bit support */
 
 #ifndef _INTEGRAL_MAX_BITS
@@ -62,17 +55,6 @@
 #define LEFT_BRACKET    ('[' | ('a' - 'A')) /* 'lowercase' version */
 
 static int __cdecl _hextodec(_TCHAR);
-#ifdef CPRFLAG
-
-#define INC()           (++charcount, _inc())
-#define UN_INC(chr)     (--charcount, _un_inc(chr))
-#define EAT_WHITE()     _whiteout(&charcount)
-
-static int __cdecl _inc(void);
-static void __cdecl _un_inc(int);
-static int __cdecl _whiteout(int *);
-
-#else  /* CPRFLAG */
 
 #define INC()           (++charcount, _inc(stream))
 #define UN_INC(chr)     (--charcount, _un_inc(chr, stream))
@@ -82,8 +64,6 @@ static int __cdecl _inc(miniFILE *);
 static void __cdecl _un_inc(int, miniFILE *);
 static int __cdecl _whiteout(int *, miniFILE *);
 
-#endif  /* CPRFLAG */
-
 #undef _ISDIGIT
 #undef _ISXDIGIT
 
@@ -158,7 +138,6 @@ static int __check_float_string(size_t nFloatStrUsed,
     return TRUE;
 }
 
-
 #define ASCII       32           /* # of bytes needed to hold 256 bits */
 
 #define SCAN_SHORT     0         /* also for FLOAT */
@@ -281,10 +260,7 @@ static int __check_float_string(size_t nFloatStrUsed,
     _TCHAR tch;
 
     _VALIDATE_RETURN( (format != NULL), EINVAL, EOF);
-
-#ifndef CPRFLAG
     _VALIDATE_RETURN( (stream != NULL), EINVAL, EOF);
-#endif  /* CPRFLAG */
 
     /*
     count = # fields assigned
@@ -618,9 +594,7 @@ scanit:
 
                             ch = INC();
                             if (
-#ifndef CPRFLAG
                                  (_TEOF != ch) &&
-#endif  /* CPRFLAG */
                                    // char conditions
                                  ( ( comchr == _T('c')) ||
                                    // string conditions !isspace()
@@ -1176,10 +1150,8 @@ f_incwidth2:
 #endif
             }
 
-#ifndef CPRFLAG
         if ( (_TEOF == ch) && ((*format != _T('%')) || (*(format + 1) != _T('n'))) )
             break;
-#endif  /* CPRFLAG */
 
     }  /* WHILE (*format) */
 
@@ -1195,12 +1167,10 @@ error_return:
         _free_crt(pFloatStr);
     }
 
-#ifndef CPRFLAG
     if (_TEOF == ch)
         /* If any fields were matched or assigned, return count */
         return ( (count || match) ? count : EOF);
     else
-#endif  /* CPRFLAG */
 #ifdef _SECURE_SCANF
         if(format_error == TRUE) {
             _VALIDATE_RETURN( ("Invalid Input Format" && 0), EINVAL, count);
@@ -1219,40 +1189,6 @@ static int __cdecl _hextodec ( _TCHAR chr)
     return _ISDIGIT(chr) ? chr : (chr & ~(_T('a') - _T('A'))) - _T('A') + 10 + _T('0');
 }
 
-#ifdef CPRFLAG
-
-static int __cdecl _inc(void)
-{
-    return (_gettche_nolock());
-}
-
-static void __cdecl _un_inc(int chr)
-{
-    if (_TEOF != chr) {
-        _ungettch_nolock(chr);
-    }
-}
-
-static int __cdecl _whiteout(REG1 int* counter)
-{
-    REG2 int ch;
-
-    do
-    {
-        ++*counter;
-        ch = _inc();
-
-        if (ch == _TEOF)
-        {
-            break;
-        }
-    }
-    while(_istspace((_TUCHAR)ch));
-    return ch;
-}
-
-#else  /* CPRFLAG */
-
 static int __cdecl _inc(miniFILE* fileptr)
 {
     return (_gettc_nolock(fileptr));
@@ -1282,5 +1218,3 @@ static int __cdecl _whiteout(int* counter, miniFILE* fileptr)
     while(_istspace((_TUCHAR)ch));
     return ch;
 }
-
-#endif  /* CPRFLAG */