mirror of
https://github.com/reactos/reactos.git
synced 2024-07-01 18:24:24 +00:00
[0.4.13][CRT] Fix 2 MSVC compiler warnings CORE-17812
observed with MSVC2010SP1 16.0.40219.1 x86-target in dbg+rls-config several times:
sdk\lib\crt\string\wtoi64.c(28) : warning C4146: unary minus operator applied to unsigned type, result still unsigned
sdk\lib\crt\string\wtoi64.c(194) : warning C4146: unary minus operator applied to unsigned type, result still unsigned
the fix is a PARTIAL port of 0.4.15-dev-2951-g 5d8e834897
and while touching the file
fix another white-space-glitch.
in sum that brings us 100% in sync in this file to master 0.4.15-dev-3264-g570cedf.
This commit is contained in:
parent
785d360ffc
commit
4fe719fdfa
|
@ -6,7 +6,7 @@
|
||||||
*/
|
*/
|
||||||
__int64 CDECL _wtoi64_l(const wchar_t *str, _locale_t locale)
|
__int64 CDECL _wtoi64_l(const wchar_t *str, _locale_t locale)
|
||||||
{
|
{
|
||||||
ULONGLONG RunningTotal = 0;
|
LONGLONG RunningTotal = 0;
|
||||||
BOOL bMinus = FALSE;
|
BOOL bMinus = FALSE;
|
||||||
|
|
||||||
while (iswctype((int)*str, _SPACE)) {
|
while (iswctype((int)*str, _SPACE)) {
|
||||||
|
@ -104,7 +104,7 @@ __int64 CDECL _wcstoi64_l(const wchar_t *nptr,
|
||||||
ret = _I64_MIN;
|
ret = _I64_MIN;
|
||||||
#ifndef _LIBCNT_
|
#ifndef _LIBCNT_
|
||||||
*_errno() = ERANGE;
|
*_errno() = ERANGE;
|
||||||
#endif
|
#endif
|
||||||
} else
|
} else
|
||||||
ret = ret*base + v;
|
ret = ret*base + v;
|
||||||
}
|
}
|
||||||
|
@ -191,7 +191,7 @@ unsigned __int64 CDECL _wcstoui64_l(const wchar_t *nptr,
|
||||||
if(endptr)
|
if(endptr)
|
||||||
*endptr = (wchar_t*)nptr;
|
*endptr = (wchar_t*)nptr;
|
||||||
|
|
||||||
return negative ? -ret : ret;
|
return negative ? -(__int64)ret : ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
|
|
Loading…
Reference in a new issue