diff options
| author | des <des@FreeBSD.org> | 2003-03-02 15:50:23 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-03-02 15:50:23 +0000 |
| commit | 765ebc59b49b789f220d5975fee1fafe86545825 (patch) | |
| tree | 766aa4287191c9a533e33cf6294817571b513579 /sys/kern/uipc_socket.c | |
| parent | 8ebe566c39e599ebbb91bc2ea8c7c2fc0c455ace (diff) | |
| download | FreeBSD-src-765ebc59b49b789f220d5975fee1fafe86545825.zip FreeBSD-src-765ebc59b49b789f220d5975fee1fafe86545825.tar.gz | |
uiomove-related caddr_t -> void * (just the low-hanging fruit)
Diffstat (limited to 'sys/kern/uipc_socket.c')
| -rw-r--r-- | sys/kern/uipc_socket.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index c9912bf..85ea572 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -683,7 +683,7 @@ nopages: error = 0; else #endif /* ZERO_COPY_SOCKETS */ - error = uiomove(mtod(m, caddr_t), (int)len, uio); + error = uiomove(mtod(m, void *), (int)len, uio); resid = uio->uio_resid; m->m_len = len; *mp = m; @@ -809,13 +809,13 @@ soreceive(so, psa, uio, mp0, controlp, flagsp) if (uio->uio_offset == -1) uio->uio_offset =IDX_TO_OFF(pg->pindex); - error = uiomoveco(mtod(m, caddr_t), + error = uiomoveco(mtod(m, void *), min(uio->uio_resid, m->m_len), uio, pg->object, disposable); } else #endif /* ZERO_COPY_SOCKETS */ - error = uiomove(mtod(m, caddr_t), + error = uiomove(mtod(m, void *), (int) min(uio->uio_resid, m->m_len), uio); m = m_free(m); } while (uio->uio_resid && error == 0 && m); @@ -987,12 +987,12 @@ dontblock: if (uio->uio_offset == -1) uio->uio_offset =IDX_TO_OFF(pg->pindex); - error = uiomoveco(mtod(m, caddr_t) + moff, + error = uiomoveco(mtod(m, char *) + moff, (int)len, uio,pg->object, disposable); } else #endif /* ZERO_COPY_SOCKETS */ - error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio); + error = uiomove(mtod(m, char *) + moff, (int)len, uio); s = splnet(); if (error) goto release; |
