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/fwrite.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/fwrite.c')
| -rw-r--r-- | lib/libc/stdio/fwrite.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c index 8e7ae01e096..9308e4d66a7 100644 --- a/lib/libc/stdio/fwrite.c +++ b/lib/libc/stdio/fwrite.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fwrite.c,v 1.7 2009/10/21 16:04:23 guenther Exp $ */ +/* $OpenBSD: fwrite.c,v 1.8 2009/10/22 01:23:16 guenther Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -45,7 +45,6 @@ fwrite(const void *buf, size_t size, size_t count, FILE *fp) size_t n; struct __suio uio; struct __siov iov; - int ret; /* * ANSI and SUSv2 require a return value of 0 if size or count are 0. @@ -63,10 +62,7 @@ fwrite(const void *buf, size_t size, size_t count, FILE *fp) * skip the divide if this happens, since divides are * generally slow and since this occurs whenever size==0. */ - FLOCKFILE(fp); - ret = __sfvwrite(fp, &uio); - FUNLOCKFILE(fp); - if (ret == 0) + if (__sfvwrite(fp, &uio) == 0) return (count); return ((n - uio.uio_resid) / size); } |