RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/stdio/vfscanf.c
View File

@ -169,32 +169,22 @@ int vfscanf(FILE *restrict f, const char *restrict fmt, va_list ap)
t = *p;
switch (t) {
case 'C':
if (width < 1) width = 1;
case 'S':
/* C or S */
if ((t&0x2f) == 3) {
t |= 32;
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);
/* do not increment match count, etc! */
continue;
}
if (t != '[' && (t|32) != 'c') {
default:
shlim(f, 0);
while (isspace(shgetc(f)));
shunget(f);