diff options
author | Mike Silbersack <silby@FreeBSD.org> | 2004-02-04 08:14:47 +0000 |
---|---|---|
committer | Mike Silbersack <silby@FreeBSD.org> | 2004-02-04 08:14:47 +0000 |
commit | 2ccbe4b596b63020c32613ed34a9a1a37e8b9954 (patch) | |
tree | 7c4c1e11bc21dffb33f99fcc9520af7824d2d413 /sys/kern/kern_subr.c | |
parent | 4133136ba7e3c75ec12ba2bf6f4d7eb0207d9421 (diff) | |
download | src-2ccbe4b596b63020c32613ed34a9a1a37e8b9954.tar.gz src-2ccbe4b596b63020c32613ed34a9a1a37e8b9954.zip |
Style fixes
Submitted by: bde
Notes
Notes:
svn path=/head/; revision=125420
Diffstat (limited to 'sys/kern/kern_subr.c')
-rw-r--r-- | sys/kern/kern_subr.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index e2c9efea7be8..1040aba81dce 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -485,39 +485,39 @@ copyinstrfrom(const void * __restrict src, void * __restrict dst, size_t len, } int -iov_to_uio(struct iovec *iovp, u_int iovcnt, struct uio *auio) +iov_to_uio(struct iovec *iovp, u_int iovcnt, struct uio *uio) { - int error = 0, i; + struct iovec *iov; u_int iovlen; - struct iovec *iov = NULL; - - /* note: can't use iovlen until iovcnt is validated */ - iovlen = iovcnt * sizeof (struct iovec); - if (iovcnt > UIO_MAXIOV) { - error = EINVAL; - goto done; - } - MALLOC(iov, struct iovec *, iovlen, M_IOV, M_WAITOK); - auio->uio_iov = iov; - auio->uio_iovcnt = iovcnt; - auio->uio_segflg = UIO_USERSPACE; - auio->uio_offset = -1; - if ((error = copyin(iovp, iov, iovlen))) - goto done; - auio->uio_resid = 0; - for (i = 0; i < iovcnt; i++) { - if (iov->iov_len > INT_MAX - auio->uio_resid) { - error = EINVAL; - goto done; - } - auio->uio_resid += iov->iov_len; - iov++; - } + int error, i; + + /* note: can't use iovlen until iovcnt is validated */ + iovlen = iovcnt * sizeof (struct iovec); + if (iovcnt > UIO_MAXIOV) { + error = EINVAL; + goto done; + } + MALLOC(iov, struct iovec *, iovlen, M_IOV, M_WAITOK); + uio->uio_iov = iov; + uio->uio_iovcnt = iovcnt; + uio->uio_segflg = UIO_USERSPACE; + uio->uio_offset = -1; + if ((error = copyin(iovp, iov, iovlen))) + goto done; + uio->uio_resid = 0; + for (i = 0; i < iovcnt; i++) { + if (iov->iov_len > INT_MAX - uio->uio_resid) { + error = EINVAL; + goto done; + } + uio->uio_resid += iov->iov_len; + iov++; + } done: - if (error && auio->uio_iov) { - FREE(auio->uio_iov, M_IOV); - auio->uio_iov = NULL; + if (error && uio->uio_iov) { + FREE(uio->uio_iov, M_IOV); + uio->uio_iov = NULL; } return (error); |