summaryrefslogtreecommitdiff
path: root/lib/libc
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2021-07-19 10:00:32 +0000
committerchristos <christos@NetBSD.org>2021-07-19 10:00:32 +0000
commit8dfd59953b033376ade7d0cf4e4c6f46cfcbcf12 (patch)
treefa69c8b6c47c6c2a89075d5a10f3dc6cca3ee28c /lib/libc
parentc4eecdd8d8d327114601b71cf156d6a3d87ea20f (diff)
There's no need to adjust `iov' in the error path.
Returning the amount written is all that's needed. from RVP
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/stdio/fvwrite.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c
index 87e8bb628b0..a2fcab5f2bc 100644
--- a/lib/libc/stdio/fvwrite.c
+++ b/lib/libc/stdio/fvwrite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fvwrite.c,v 1.28 2021/07/16 12:34:10 christos Exp $ */
+/* $NetBSD: fvwrite.c,v 1.29 2021/07/19 10:00:32 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fvwrite.c,v 1.28 2021/07/16 12:34:10 christos Exp $");
+__RCSID("$NetBSD: fvwrite.c,v 1.29 2021/07/19 10:00:32 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -52,7 +52,7 @@ __RCSID("$NetBSD: fvwrite.c,v 1.28 2021/07/16 12:34:10 christos Exp $");
#include "fvwrite.h"
static int
-flush_adj(FILE *fp, struct __suio *uio, struct __siov *iov, ssize_t w)
+flush_adj(FILE *fp, struct __suio *uio, ssize_t w)
{
int rc;
@@ -74,7 +74,6 @@ flush_adj(FILE *fp, struct __suio *uio, struct __siov *iov, ssize_t w)
/* adjust amt. written */
uio->uio_resid -= i;
- iov->iov_len -= i;
} else {
/* only old stuff was written */
@@ -136,7 +135,7 @@ __sfvwrite(FILE *fp, struct __suio *uio)
if (w <= 0) \
goto err
#define FLUSH(nw) \
- if (flush_adj(fp, uio, iov - 1, nw)) \
+ if (flush_adj(fp, uio, nw)) \
goto err
if (fp->_flags & __SNBF) {