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/vfprintf.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/vfprintf.c')
| -rw-r--r-- | lib/libc/stdio/vfprintf.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index 2d3fb3ebe13..4ab62b49f29 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfprintf.c,v 1.55 2009/10/21 16:04:23 guenther Exp $ */ +/* $OpenBSD: vfprintf.c,v 1.56 2009/10/22 01:23:16 guenther Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -130,8 +130,8 @@ __sbprintf(FILE *fp, const char *fmt, va_list ap) fake._lbfsize = 0; /* not actually used, but Just In Case */ /* do the work, then copy any error status */ - ret = __vfprintf(&fake, fmt, ap); - if (ret >= 0 && __sflush(&fake)) + ret = vfprintf(&fake, fmt, ap); + if (ret >= 0 && fflush(&fake)) ret = EOF; if (fake._flags & __SERR) fp->_flags |= __SERR; @@ -190,17 +190,6 @@ static int exponent(char *, int, int); int vfprintf(FILE *fp, const char *fmt0, __va_list ap) { - int ret; - - FLOCKFILE(fp); - ret = __vfprintf(fp, fmt0, ap); - FUNLOCKFILE(fp); - return (ret); -} - -int -__vfprintf(FILE *fp, const char *fmt0, __va_list ap) -{ char *fmt; /* format string */ int ch; /* character from fmt */ int n, n2; /* handy integers (short term usage) */ |