Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 12:55:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[crt]

Browse source 
partial sync of with wine 1.7.11

svn path=/trunk/; revision=62199
This commit is contained in:
Christoph von Wittich 2014-02-15 19:12:07 +00:00
parent 484e8c8db2
commit ac49d0b2d3
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
reactos/lib/sdk/crt/string/scanf.h
View file

@ -131,8 +131,14 @@ _FUNCTION_ {
/* read prefix (if any) */ /* read prefix (if any) */
while (!prefix_finished) { while (!prefix_finished) {
switch(*format) { switch(*format) {
case 'h': h_prefix = 1; break; case 'h': h_prefix++; break;
case 'l': l_prefix = 1; break; case 'l':
if(*(format+1) == 'l') {
I64_prefix = 1;
format++;
}
l_prefix = 1;
break;
case 'w': w_prefix = 1; break; case 'w': w_prefix = 1; break;
case 'L': L_prefix = 1; break; case 'L': L_prefix = 1; break;
case 'I': case 'I':
@ -227,15 +233,15 @@ _FUNCTION_ {
#define _SET_NUMBER_(type) *va_arg(ap, type*) = (type)(negative ? -cur : cur) #define _SET_NUMBER_(type) *va_arg(ap, type*) = (type)(negative ? -cur : cur)
if (I64_prefix) _SET_NUMBER_(LONGLONG); if (I64_prefix) _SET_NUMBER_(LONGLONG);
else if (l_prefix) _SET_NUMBER_(LONG); else if (l_prefix) _SET_NUMBER_(LONG);
else if (h_prefix) _SET_NUMBER_(short int); else if (h_prefix == 1) _SET_NUMBER_(short int);
else _SET_NUMBER_(int); else _SET_NUMBER_(int);
} }
} }
break; break;
case 'e': case 'e':
case 'E': case 'E':
case 'f': case 'f':
case 'g': case 'g':
case 'G': { /* read a float */ case 'G': { /* read a float */
long double cur = 0; long double cur = 0;
int negative = 0; int negative = 0;
@ -527,6 +533,7 @@ _FUNCTION_ {
if (nch!=_EOF_) { if (nch!=_EOF_) {
_UNGETC_(nch, file); _UNGETC_(nch, file);
} }
TRACE("returning %d\n", rd); TRACE("returning %d\n", rd);
return rd; return rd;
} }