diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2009-10-22 01:23:17 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2009-10-22 01:23:17 +0000 |
| commit | be40cf4f6608dcb8157ec353ae0fc6e449a06a2d (patch) | |
| tree | 29977358369874429c14c743243db3114f2dc01d /lib/libc/stdio/fread.c | |
| parent | e990becb683185ae6d8df39ba534ec5200132b04 (diff) | |
Back out previous commit, as it caused too much growth for the install
media to fit
Diffstat (limited to 'lib/libc/stdio/fread.c')
| -rw-r--r-- | lib/libc/stdio/fread.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c index 572be07160f..99185385b0d 100644 --- a/lib/libc/stdio/fread.c +++ b/lib/libc/stdio/fread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fread.c,v 1.8 2009/10/21 16:04:23 guenther Exp $ */ +/* $OpenBSD: fread.c,v 1.9 2009/10/22 01:23:16 guenther Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -48,7 +48,6 @@ fread(void *buf, size_t size, size_t count, FILE *fp) */ if ((resid = count * size) == 0) return (0); - FLOCKFILE(fp); if (fp->_r < 0) fp->_r = 0; total = resid; @@ -61,13 +60,11 @@ fread(void *buf, size_t size, size_t count, FILE *fp) resid -= r; if (__srefill(fp)) { /* no more input: return partial result */ - FUNLOCKFILE(fp); return ((total - resid) / size); } } (void)memcpy((void *)p, (void *)fp->_p, resid); fp->_r -= resid; fp->_p += resid; - FUNLOCKFILE(fp); return (count); } |