mirrors/musl
1
0
Fork 0
mirror of https://git.musl-libc.org/git/musl synced 2025-04-03 16:33:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

simplify some logic in scanf and remove redundant invalid-format check

Browse Source
This commit is contained in:
Rich Felker 2013-06-04 16:22:02 -04:00
parent f18846dd3a
commit 1ab59de81e
1 changed files with 9 additions and 19 deletions

28
src/stdio/vfscanf.c

@ -169,32 +169,22 @@ int vfscanf(FILE *restrict f, const char *restrict fmt, va_list ap)
t = *p; t = *p;
switch (t) { /* C or S */
case 'C': if ((t&0x2f) == 3) {
if (width < 1) width = 1;
case 'S':
t |= 32; t |= 32;
size = SIZE_l; size = SIZE_l;
break;
case 'c':
if (width < 1) width = 1;
case 'd': case 'i': case 'o': case 'u': case 'x':
case 'a': case 'e': case 'f': case 'g':
case 'A': case 'E': case 'F': case 'G': case 'X':
case '[': case 's':
case 'p': case 'n':
break;
default:
goto fmt_fail;
} }
if (t == 'n') { switch (t) {
case 'c':
if (width < 1) width = 1;
case '[':
break;
case 'n':
store_int(dest, size, pos); store_int(dest, size, pos);
/* do not increment match count, etc! */ /* do not increment match count, etc! */
continue; continue;
} default:
if (t != '[' && (t|32) != 'c') {
shlim(f, 0); shlim(f, 0);
while (isspace(shgetc(f))); while (isspace(shgetc(f)));
shunget(f); shunget(f);