diff options
Diffstat (limited to 'lib/libc/stdio/wbuf.c')
| -rw-r--r-- | lib/libc/stdio/wbuf.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c index 6cd75145a271..7993f3e3d38f 100644 --- a/lib/libc/stdio/wbuf.c +++ b/lib/libc/stdio/wbuf.c @@ -32,12 +32,6 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)wbuf.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <errno.h> #include <stdio.h> #include "local.h" @@ -52,7 +46,6 @@ __FBSDID("$FreeBSD$"); int __swbuf(int c, FILE *fp) { - unsigned char *old_p; int n; /* @@ -82,21 +75,14 @@ __swbuf(int c, FILE *fp) */ n = fp->_p - fp->_bf._base; if (n >= fp->_bf._size) { - if (__fflush(fp)) + if (__fflush(fp) != 0) return (EOF); n = 0; } fp->_w--; *fp->_p++ = c; - old_p = fp->_p; - if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) { - if (__fflush(fp)) { - if (fp->_p == old_p) { - fp->_p--; - fp->_w++; - } + if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) + if (__fflush(fp) != 0) return (EOF); - } - } return (c); } |