diff options
| author | silby <silby@FreeBSD.org> | 2004-02-04 08:43:21 +0000 |
|---|---|---|
| committer | silby <silby@FreeBSD.org> | 2004-02-04 08:43:21 +0000 |
| commit | ca8156c1aea45521956b1efc61cb789fd0f5aba9 (patch) | |
| tree | 9917a8d05e25d4e3cbc5d8421e90a036de3320fd /sys | |
| parent | d4d0f8b9e0a190cad13fc3c57d7a83e12760d758 (diff) | |
| download | FreeBSD-src-ca8156c1aea45521956b1efc61cb789fd0f5aba9.zip FreeBSD-src-ca8156c1aea45521956b1efc61cb789fd0f5aba9.tar.gz | |
Rename iov_to_uio to uiofromiov to be more consistent with other
uio* functions.
Suggested by: bde
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_subr.c | 2 | ||||
| -rw-r--r-- | sys/kern/uipc_syscalls.c | 2 | ||||
| -rw-r--r-- | sys/sys/uio.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index 1040aba..a5a2915 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -485,7 +485,7 @@ copyinstrfrom(const void * __restrict src, void * __restrict dst, size_t len, } int -iov_to_uio(struct iovec *iovp, u_int iovcnt, struct uio *uio) +uiofromiov(struct iovec *iovp, u_int iovcnt, struct uio *uio) { struct iovec *iov; u_int iovlen; diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 9bec360..55f588f 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1738,7 +1738,7 @@ do_sendfile(struct thread *td, struct sendfile_args *uap, int compat) if (hdtr.headers != NULL) { hdr_uio.uio_td = td; hdr_uio.uio_rw = UIO_WRITE; - error = iov_to_uio(hdtr.headers, hdtr.hdr_cnt, + error = uiofromiov(hdtr.headers, hdtr.hdr_cnt, &hdr_uio); if (error) goto done; diff --git a/sys/sys/uio.h b/sys/sys/uio.h index ed56aaa..d955529 100644 --- a/sys/sys/uio.h +++ b/sys/sys/uio.h @@ -90,13 +90,13 @@ int copyinfrom(const void * __restrict src, void * __restrict dst, int copyinstrfrom(const void * __restrict src, void * __restrict dst, size_t len, size_t * __restrict copied, int seg); void uio_yield(void); +int uiofromiov(struct iovec *iovp, u_int iovcnt, struct uio *auio); int uiomove(void *cp, int n, struct uio *uio); int uiomove_frombuf(void *buf, int buflen, struct uio *uio); int uiomoveco(void *cp, int n, struct uio *uio, struct vm_object *obj, int disposable); struct mbuf * m_uiotombuf(struct uio *uio, int how, int len); -int iov_to_uio(struct iovec *iovp, u_int iovcnt, struct uio *auio); #else /* !_KERNEL */ |
