diff options
| author | des <des@FreeBSD.org> | 2003-03-03 09:14:26 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-03-03 09:14:26 +0000 |
| commit | 021faa11ac3e8868e33ee981995319d77cba1b58 (patch) | |
| tree | 328039d4f363f2179be4fe277b395b7f3e9d2d3f /sys/compat/linux/linux_file.c | |
| parent | 0968a2b9642c2cbd0a4a82a8fcd1e16cd8f356de (diff) | |
| download | FreeBSD-src-021faa11ac3e8868e33ee981995319d77cba1b58.zip FreeBSD-src-021faa11ac3e8868e33ee981995319d77cba1b58.tar.gz | |
More caddr_t removal, in conjunction with copy{in,out}(9) this time.
Also clean up some egregious casts and incorrect use of sizeof.
Diffstat (limited to 'sys/compat/linux/linux_file.c')
| -rw-r--r-- | sys/compat/linux/linux_file.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 2b37dcd..56b1fc8 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -191,7 +191,7 @@ linux_llseek(struct thread *td, struct linux_llseek_args *args) if ((error = lseek(td, &bsd_args))) return error; - if ((error = copyout(td->td_retval, (caddr_t)args->res, sizeof (off_t)))) + if ((error = copyout(td->td_retval, args->res, sizeof (off_t)))) return error; td->td_retval[0] = 0; @@ -980,7 +980,7 @@ fcntl_common(struct thread *td, struct linux_fcntl64_args *args) return (kern_fcntl(td, args->fd, F_SETFL, arg)); case LINUX_F_GETLK: - error = copyin((caddr_t)args->arg, &linux_flock, + error = copyin((void *)args->arg, &linux_flock, sizeof(linux_flock)); if (error) return (error); @@ -989,11 +989,11 @@ fcntl_common(struct thread *td, struct linux_fcntl64_args *args) if (error) return (error); bsd_to_linux_flock(&bsd_flock, &linux_flock); - return (copyout(&linux_flock, (caddr_t)args->arg, + return (copyout(&linux_flock, (void *)args->arg, sizeof(linux_flock))); case LINUX_F_SETLK: - error = copyin((caddr_t)args->arg, &linux_flock, + error = copyin((void *)args->arg, &linux_flock, sizeof(linux_flock)); if (error) return (error); @@ -1002,7 +1002,7 @@ fcntl_common(struct thread *td, struct linux_fcntl64_args *args) (intptr_t)&bsd_flock)); case LINUX_F_SETLKW: - error = copyin((caddr_t)args->arg, &linux_flock, + error = copyin((void *)args->arg, &linux_flock, sizeof(linux_flock)); if (error) return (error); @@ -1065,7 +1065,7 @@ linux_fcntl64(struct thread *td, struct linux_fcntl64_args *args) switch (args->cmd) { case LINUX_F_GETLK64: - error = copyin((caddr_t)args->arg, &linux_flock, + error = copyin((void *)args->arg, &linux_flock, sizeof(linux_flock)); if (error) return (error); @@ -1074,11 +1074,11 @@ linux_fcntl64(struct thread *td, struct linux_fcntl64_args *args) if (error) return (error); bsd_to_linux_flock64(&bsd_flock, &linux_flock); - return (copyout(&linux_flock, (caddr_t)args->arg, - sizeof(linux_flock))); + return (copyout(&linux_flock, (void *)args->arg, + sizeof(linux_flock))); case LINUX_F_SETLK64: - error = copyin((caddr_t)args->arg, &linux_flock, + error = copyin((void *)args->arg, &linux_flock, sizeof(linux_flock)); if (error) return (error); @@ -1087,7 +1087,7 @@ linux_fcntl64(struct thread *td, struct linux_fcntl64_args *args) (intptr_t)&bsd_flock)); case LINUX_F_SETLKW64: - error = copyin((caddr_t)args->arg, &linux_flock, + error = copyin((void *)args->arg, &linux_flock, sizeof(linux_flock)); if (error) return (error); |
