diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-07-22 07:26:13 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-07-22 07:26:13 +0000 |
| commit | fcc10ffab6d696cdda8a1a33b8e1720d90f7a15b (patch) | |
| tree | aae8d3effebc9e4e1428c1cedafc35666ebcb62c /stdio-common/vfscanf.c | |
| parent | 40c014b3dcc698ae2cc935aefabbeb2196088128 (diff) | |
| download | glibc-fcc10ffab6d696cdda8a1a33b8e1720d90f7a15b.tar.gz glibc-fcc10ffab6d696cdda8a1a33b8e1720d90f7a15b.tar.xz glibc-fcc10ffab6d696cdda8a1a33b8e1720d90f7a15b.zip | |
Update.
* stdio-common/vfscanf.c: Handle input -- with format %f correctly (it's no input error). * stdio-common/tstscanf.c: Add test case for format %f with input --. * stdio-common/scanf12.c: Correct expected result for first scanf.
Diffstat (limited to 'stdio-common/vfscanf.c')
| -rw-r--r-- | stdio-common/vfscanf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index 90d73bdbde..9457c4c17e 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -1270,7 +1270,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) if (n == 10) { - /*Have not yet found the digit. */ + /* Have not yet found the digit. */ while (++from_level <= to_level) { /* Search all ten digits of this level. */ @@ -1491,7 +1491,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) { /* This is no valid number. */ ungetc (c, s); - input_error (); + conv_error (); } #else /* Match against the decimal point. At this point @@ -1524,7 +1524,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) c = *--cmpp; } - input_error (); + conv_error (); } if (width > 0) /* +1 because we substract below. */ |