diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-11-13 19:38:37 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-11-13 19:38:37 +0000 |
| commit | 27658f2067a43aeddd03a98a562020ae9fea92c6 (patch) | |
| tree | 20a47d05a34bbf147f24631cc9793487fe379056 /stdio-common/vfscanf.c | |
| parent | 77d10f94bf43b73394f9a3eaf1052c4bfc52905f (diff) | |
| download | glibc-27658f2067a43aeddd03a98a562020ae9fea92c6.tar.gz glibc-27658f2067a43aeddd03a98a562020ae9fea92c6.tar.xz glibc-27658f2067a43aeddd03a98a562020ae9fea92c6.zip | |
Update.
* stdio-common/vfscanf.c: Don't return -1 in case of an invalid format, jsut stop.
Diffstat (limited to 'stdio-common/vfscanf.c')
| -rw-r--r-- | stdio-common/vfscanf.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index d2302dd9a2..1b6dc6537d 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -85,11 +85,6 @@ __libc_cleanup_end (0); \ return EOF; \ } while (0) -# define fmt_error() do { \ - _IO_funlockfile (s); \ - __libc_cleanup_end (0); \ - return EOF; \ - } while (0) # define ARGCHECK(s, format) \ do \ { \ @@ -134,10 +129,6 @@ __set_errno (ENOMEM); \ return EOF; \ } while (0) -# define fmt_error() do { \ - funlockfile (s); \ - return EOF; \ - } while (0) # define ARGCHECK(s, format) \ do \ { \ @@ -1259,7 +1250,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) default: /* If this is an unknown format character punt. */ - fmt_error (); + conv_error (); } } |