d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert one of our main caddr_t consumers, uiomove(9), to void *.

Browse Source
This commit is contained in:
Dag-Erling Smørgrav 2003-03-02 15:29:13 +00:00
parent f9be0dee1e
commit d5279f20c5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/kern/kern_subr.c
View File

@ -126,7 +126,7 @@ vm_pgmoveco(vm_map_t mapa, vm_object_t srcobj, vm_offset_t kaddr,
#endif /* ZERO_COPY_SOCKETS */
int
uiomove(caddr_t cp, int n, struct uio *uio)
uiomove(void *cp, int n, struct uio *uio)
{
struct thread *td = curthread;
struct iovec *iov;
@ -183,7 +183,7 @@ uiomove(caddr_t cp, int n, struct uio *uio)
iov->iov_len -= cnt;
uio->uio_resid -= cnt;
uio->uio_offset += cnt;
cp += cnt;
cp = (char *)cp + cnt;
n -= cnt;
}
out:
@ -202,7 +202,7 @@ out:
* Experimental support for zero-copy I/O
*/
static int
userspaceco(caddr_t cp, u_int cnt, struct uio *uio, struct vm_object *obj,
userspaceco(void *cp, u_int cnt, struct uio *uio, struct vm_object *obj,
int disposable)
{
struct iovec *iov;
@ -281,7 +281,7 @@ userspaceco(caddr_t cp, u_int cnt, struct uio *uio, struct vm_object *obj,
}
int
uiomoveco(caddr_t cp, int n, struct uio *uio, struct vm_object *obj,
uiomoveco(void *cp, int n, struct uio *uio, struct vm_object *obj,
int disposable)
{
struct iovec *iov;
@ -329,7 +329,7 @@ uiomoveco(caddr_t cp, int n, struct uio *uio, struct vm_object *obj,
iov->iov_len -= cnt;
uio->uio_resid -= cnt;
uio->uio_offset += cnt;
cp += cnt;
cp = (char *)cp + cnt;
n -= cnt;
}
return (0);

4
sys/sys/uio.h
View File

@ -86,8 +86,8 @@ struct uio {
struct vm_object;
void uio_yield(void);
int uiomove(caddr_t, int, struct uio *);
int uiomoveco(caddr_t, int, struct uio *, struct vm_object *, int);
int uiomove(void *, int, struct uio *);
int uiomoveco(void *, int, struct uio *, struct vm_object *, int);
int uioread(int, struct uio *, struct vm_object *, int *);
int copyinfrom(const void *src, void *dst, size_t len, int seg);
int copyinstrfrom(const void *src, void *dst, size_t len,