Piotr Caban : msvcrt: Use _iswctype_l in _iswspace_l function.
Module: wine Branch: master Commit: 8d2a2c942331c8d6c87617aeb80acc2984b4e905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d2a2c942331c8d6c87617aeb... Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:05:40 2020 +0200 msvcrt: Use _iswctype_l in _iswspace_l function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ff066fb5c5..0c99d0faab 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1912,6 +1912,22 @@ MSVCRT_size_t CDECL MSVCRT_wcrtomb( char *dst, MSVCRT_wchar_t ch, MSVCRT_mbstate return MSVCRT_wctomb(dst, ch); } +/********************************************************************* + * _iswctype_l (MSVCRT.@) + */ +INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale ) +{ + return (get_char_typeW(wc) & 0xffff) & type; +} + +/********************************************************************* + * iswctype (MSVCRT.@) + */ +INT CDECL MSVCRT_iswctype( MSVCRT_wchar_t wc, MSVCRT_wctype_t type ) +{ + return (get_char_typeW(wc) & 0xfff) & type; +} + /********************************************************************* * iswalnum (MSVCRT.@) */ @@ -2045,7 +2061,7 @@ INT CDECL MSVCRT_iswpunct( MSVCRT_wchar_t wc ) */ INT CDECL MSVCRT__iswspace_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isspaceW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__SPACE, locale ); } /********************************************************************* @@ -2053,7 +2069,7 @@ INT CDECL MSVCRT__iswspace_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) */ INT CDECL MSVCRT_iswspace( MSVCRT_wchar_t wc ) { - return isspaceW( wc ); + return MSVCRT__iswspace_l( wc, NULL ); } /********************************************************************* @@ -2088,22 +2104,6 @@ int CDECL MSVCRT__iswxdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) return isxdigitW( wc ); } -/********************************************************************* - * _iswctype_l (MSVCRT.@) - */ -INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale ) -{ - return (get_char_typeW(wc) & 0xffff) & type; -} - -/********************************************************************* - * iswctype (MSVCRT.@) - */ -INT CDECL MSVCRT_iswctype( MSVCRT_wchar_t wc, MSVCRT_wctype_t type ) -{ - return (get_char_typeW(wc) & 0xfff) & type; -} - /********************************************************************* * _iswblank_l (MSVCRT.@) */
participants (1)
-
Alexandre Julliard