diff options
| author |   guenther <guenther@openbsd.org> | 2009-10-22 01:23:16 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2009-10-22 01:23:16 +0000 |
| commit | 7ff09c5c6c97039a5c7f7864c46007f47d652b03 (patch) | |
| tree | 85241012fd1c4ec9714f130877e15fb5088fd2d7 /lib/libc/stdio/vfscanf.c | |
| parent | Add delete example since it has come up several times. (diff) | |
| download | wireguard-openbsd-7ff09c5c6c97039a5c7f7864c46007f47d652b03.tar.xz wireguard-openbsd-7ff09c5c6c97039a5c7f7864c46007f47d652b03.zip | |
Back out previous commit, as it caused too much growth for the install
media to fit
Diffstat (limited to 'lib/libc/stdio/vfscanf.c')
| -rw-r--r-- | lib/libc/stdio/vfscanf.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c index 3a579b19a02..5b2fd03f4eb 100644 --- a/lib/libc/stdio/vfscanf.c +++ b/lib/libc/stdio/vfscanf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfscanf.c,v 1.23 2009/10/21 16:04:23 guenther Exp $ */ +/* $OpenBSD: vfscanf.c,v 1.24 2009/10/22 01:23:16 guenther Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -117,7 +117,6 @@ VFSCANF(FILE *fp, const char *fmt0, __va_list ap) static short basefix[17] = { 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }; - FLOCKFILE(fp); _SET_ORIENTATION(fp, -1); nassigned = 0; @@ -125,10 +124,8 @@ VFSCANF(FILE *fp, const char *fmt0, __va_list ap) base = 0; /* XXX just to keep gcc happy */ for (;;) { c = *fmt++; - if (c == 0) { - FUNLOCKFILE(fp); + if (c == 0) return (nassigned); - } if (isspace(c)) { while ((fp->_r > 0 || __srefill(fp) == 0) && isspace(*fp->_p)) @@ -296,7 +293,6 @@ literal: * Disgusting backwards compatibility hacks. XXX */ case '\0': /* compat */ - FUNLOCKFILE(fp); return (EOF); default: /* compat */ @@ -694,10 +690,8 @@ literal: } } input_failure: - if (nassigned == 0) - nassigned = -1; + return (nassigned ? nassigned : -1); match_failure: - FUNLOCKFILE(fp); return (nassigned); } |