Sync scanf to current wine sources, correct msvcrt cpp sync date

svn path=/trunk/; revision=42766
This commit is contained in:
Gregor Schneider 2009-08-18 14:23:51 +00:00
parent d2fa38f67a
commit 332c985b52
3 changed files with 12 additions and 10 deletions

View file

@ -48,10 +48,10 @@ static int char2digit(char c, int base) {
* given base, or -1 if the given character is not a digit of the base.
*/
static int wchar2digit(wchar_t c, int base) {
if ((c>=L'0') && (c<=L'9') && (c<=L'0'+base-1)) return (c-L'0');
if ((c>='0') && (c<='9') && (c<='0'+base-1)) return (c-'0');
if (base<=10) return -1;
if ((c>=L'A') && (c<=L'Z') && (c<=L'A'+base-11)) return (c-L'A'+10);
if ((c>=L'a') && (c<=L'z') && (c<=L'a'+base-11)) return (c-L'a'+10);
if ((c>='A') && (c<='Z') && (c<='A'+base-11)) return (c-'A'+10);
if ((c>='a') && (c<='z') && (c<='a'+base-11)) return (c-'a'+10);
return -1;
}
@ -166,7 +166,7 @@ int sscanf(const char *str, const char *format, ...)
/*********************************************************************
* swscanf (MSVCRT.@)
*/
int swscanf(const wchar_t *str, const wchar_t *format, ...)
int CDECL swscanf(const wchar_t *str, const wchar_t *format, ...)
{
va_list valist;
int res;
@ -181,7 +181,7 @@ int swscanf(const wchar_t *str, const wchar_t *format, ...)
/*********************************************************************
* _cscanf (MSVCRT.@)
*/
int _cscanf(const char *format, ...)
int CDECL _cscanf(const char *format, ...)
{
va_list valist;
int res;