From 2e388ac3c6d30ff7e57718ef0038a94f60566c83 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Fri, 14 Nov 1997 20:56:14 +0000 Subject: convert to void *addr --- lib/libc/sys/madvise.2 | 2 +- lib/libc/sys/mincore.2 | 2 +- lib/libc/sys/minherit.2 | 4 ++-- lib/libc/sys/mlock.2 | 4 ++-- lib/libc/sys/mmap.2 | 2 +- lib/libc/sys/mprotect.2 | 2 +- lib/libc/sys/munmap.2 | 2 +- sys/kern/syscalls.master | 18 +++++++++--------- sys/sys/mman.h | 17 +++++++++-------- sys/vm/vm_mmap.c | 16 ++++++++-------- 10 files changed, 35 insertions(+), 34 deletions(-) diff --git a/lib/libc/sys/madvise.2 b/lib/libc/sys/madvise.2 index 5d18e7ce977..ae72f991756 100644 --- a/lib/libc/sys/madvise.2 +++ b/lib/libc/sys/madvise.2 @@ -43,7 +43,7 @@ .Fd #include .Fd #include .Ft int -.Fn madvise "caddr_t addr" "size_t len" "int behav" +.Fn madvise "void *addr" "size_t len" "int behav" .Sh DESCRIPTION The .Fn madvise diff --git a/lib/libc/sys/mincore.2 b/lib/libc/sys/mincore.2 index 05fb3d6ebd6..9aaa7083993 100644 --- a/lib/libc/sys/mincore.2 +++ b/lib/libc/sys/mincore.2 @@ -43,7 +43,7 @@ .Fd #include .Fd #include .Ft int -.Fn mincore "caddr_t addr" "size_t len" "char *vec" +.Fn mincore "void *addr" "size_t len" "char *vec" .Sh DESCRIPTION The .Fn mincore diff --git a/lib/libc/sys/minherit.2 b/lib/libc/sys/minherit.2 index 2ca140eb5f1..87aa308acb9 100644 --- a/lib/libc/sys/minherit.2 +++ b/lib/libc/sys/minherit.2 @@ -1,4 +1,4 @@ -.\" $Id: minherit.2,v 1.4 1996/09/01 20:50:51 millert Exp $ +.\" $Id: minherit.2,v 1.5 1997/11/14 20:56:11 deraadt Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -43,7 +43,7 @@ .Fd #include .Fd #include .Ft int -.Fn minherit "caddr_t addr" "size_t len" "int inherit" +.Fn minherit "void *addr" "size_t len" "int inherit" .Sh DESCRIPTION The .Fn minherit diff --git a/lib/libc/sys/mlock.2 b/lib/libc/sys/mlock.2 index be33648c592..2ba0af294d5 100644 --- a/lib/libc/sys/mlock.2 +++ b/lib/libc/sys/mlock.2 @@ -44,9 +44,9 @@ .Fd #include .Fd #include .Ft int -.Fn mlock "caddr_t addr" "size_t len" +.Fn mlock "void *addr" "size_t len" .Ft int -.Fn munlock "caddr_t addr" "size_t len" +.Fn munlock "void *addr" "size_t len" .Sh DESCRIPTION The .Nm mlock diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2 index 19de24c96c9..aa14d81f49a 100644 --- a/lib/libc/sys/mmap.2 +++ b/lib/libc/sys/mmap.2 @@ -43,7 +43,7 @@ .Fd #include .Fd #include .Ft caddr_t -.Fn mmap "caddr_t addr" "size_t len" "int prot" "int flags" "int fd" "off_t offset" +.Fn mmap "void *addr" "size_t len" "int prot" "int flags" "int fd" "off_t offset" .Sh DESCRIPTION The .Nm mmap diff --git a/lib/libc/sys/mprotect.2 b/lib/libc/sys/mprotect.2 index 4870751bbc1..2c0662a75a5 100644 --- a/lib/libc/sys/mprotect.2 +++ b/lib/libc/sys/mprotect.2 @@ -43,7 +43,7 @@ .Fd #include .Fd #include .Ft int -.Fn mprotect "caddr_t addr" "size_t len" "int prot" +.Fn mprotect "void *addr" "size_t len" "int prot" .Sh DESCRIPTION The .Fn mprotect diff --git a/lib/libc/sys/munmap.2 b/lib/libc/sys/munmap.2 index ab097b704cf..60911762530 100644 --- a/lib/libc/sys/munmap.2 +++ b/lib/libc/sys/munmap.2 @@ -43,7 +43,7 @@ .Fd #include .Fd #include .Ft int -.Fn munmap "caddr_t addr" "size_t len" +.Fn munmap "void *addr" "size_t len" .Sh DESCRIPTION The .Fn munmap diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 71000ca1dd2..711fc4c20ad 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1,4 +1,4 @@ - $OpenBSD: syscalls.master,v 1.18 1997/11/13 18:35:31 deraadt Exp $ + $OpenBSD: syscalls.master,v 1.19 1997/11/14 20:56:03 deraadt Exp $ ; $NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $ ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -138,14 +138,14 @@ 71 COMPAT_43 { int sys_mmap(caddr_t addr, size_t len, int prot, \ int flags, int fd, long pos); } ommap 72 STD { int sys_ovadvise(int anom); } vadvise -73 STD { int sys_munmap(caddr_t addr, size_t len); } -74 STD { int sys_mprotect(caddr_t addr, size_t len, \ +73 STD { int sys_munmap(void *addr, size_t len); } +74 STD { int sys_mprotect(void *addr, size_t len, \ int prot); } -75 STD { int sys_madvise(caddr_t addr, size_t len, \ +75 STD { int sys_madvise(void *addr, size_t len, \ int behav); } 76 OBSOL vhangup 77 OBSOL vlimit -78 STD { int sys_mincore(caddr_t addr, size_t len, \ +78 STD { int sys_mincore(void *addr, size_t len, \ char *vec); } 79 STD { int sys_getgroups(u_int gidsetsize, gid_t *gidset); } 80 STD { int sys_setgroups(u_int gidsetsize, gid_t *gidset); } @@ -349,7 +349,7 @@ 195 STD { int sys_setrlimit(u_int which, struct rlimit *rlp); } 196 STD { int sys_getdirentries(int fd, char *buf, \ u_int count, long *basep); } -197 STD { caddr_t sys_mmap(caddr_t addr, size_t len, \ +197 STD { caddr_t sys_mmap(void *addr, size_t len, \ int prot, int flags, int fd, long pad, \ off_t pos); } 198 STD { int sys_nosys(void); } __syscall @@ -361,8 +361,8 @@ 202 STD { int sys___sysctl(int *name, u_int namelen, \ void *old, size_t *oldlenp, void *new, \ size_t newlen); } -203 STD { int sys_mlock(caddr_t addr, size_t len); } -204 STD { int sys_munlock(caddr_t addr, size_t len); } +203 STD { int sys_mlock(void *addr, size_t len); } +204 STD { int sys_munlock(void *addr, size_t len); } 205 STD { int sys_undelete(char *path); } 206 STD { int sys_futimes(int fd, struct timeval *tptr); } 207 STD { int sys_getpgid(pid_t pid); } @@ -456,7 +456,7 @@ 247 UNIMPL 248 UNIMPL 249 UNIMPL -250 STD { int sys_minherit(caddr_t addr, size_t len, \ +250 STD { int sys_minherit(void *addr, size_t len, \ int inherit); } 251 STD { int sys_rfork(int flags); } 252 STD { int sys_poll(struct pollfd *fds, \ diff --git a/sys/sys/mman.h b/sys/sys/mman.h index 1354ce8f36a..b3d1affc65d 100644 --- a/sys/sys/mman.h +++ b/sys/sys/mman.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mman.h,v 1.4 1997/11/13 18:35:33 deraadt Exp $ */ +/* $OpenBSD: mman.h,v 1.5 1997/11/14 20:56:06 deraadt Exp $ */ /* $NetBSD: mman.h,v 1.11 1995/03/26 20:24:23 jtc Exp $ */ /*- @@ -90,14 +90,15 @@ __BEGIN_DECLS /* Some of these int's should probably be size_t's */ -caddr_t mmap __P((caddr_t, size_t, int, int, int, off_t)); -int mprotect __P((caddr_t, size_t, int)); -int munmap __P((caddr_t, size_t)); +caddr_t mmap __P((void *, size_t, int, int, int, off_t)); +int mprotect __P((void *, size_t, int)); +int munmap __P((void *, size_t)); int msync __P((void *, size_t, int)); -int mlock __P((caddr_t, size_t)); -int munlock __P((caddr_t, size_t)); -int madvise __P((caddr_t, size_t, int)); -int mincore __P((caddr_t, size_t, char *)); +int mlock __P((void *, size_t)); +int munlock __P((void *, size_t)); +int madvise __P((void *, size_t, int)); +int mincore __P((void *, size_t, char *)); +int minherit __P((void *, size_t, int)); __END_DECLS #endif /* !_KERNEL */ diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 4d9ff6b8a0c..89315f43311 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_mmap.c,v 1.9 1997/11/13 18:35:38 deraadt Exp $ */ +/* $OpenBSD: vm_mmap.c,v 1.10 1997/11/14 20:56:08 deraadt Exp $ */ /* $NetBSD: vm_mmap.c,v 1.47 1996/03/16 23:15:23 christos Exp $ */ /* @@ -123,7 +123,7 @@ sys_mmap(p, v, retval) register_t *retval; { register struct sys_mmap_args /* { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(size_t) len; syscallarg(int) prot; syscallarg(int) flags; @@ -381,7 +381,7 @@ sys_munmap(p, v, retval) register_t *retval; { register struct sys_munmap_args /* { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(size_t) len; } */ *uap = v; vm_offset_t addr; @@ -453,7 +453,7 @@ sys_mprotect(p, v, retval) register_t *retval; { struct sys_mprotect_args /* { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(int) len; syscallarg(int) prot; } */ *uap = v; @@ -543,7 +543,7 @@ sys_madvise(p, v, retval) { #if 0 struct sys_madvise_args /* { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(size_t) len; syscallarg(int) behav; } */ *uap = v; @@ -562,7 +562,7 @@ sys_mincore(p, v, retval) { #if 0 struct sys_mincore_args /* { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(size_t) len; syscallarg(char *) vec; } */ *uap = v; @@ -579,7 +579,7 @@ sys_mlock(p, v, retval) register_t *retval; { struct sys_mlock_args /* { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(size_t) len; } */ *uap = v; vm_offset_t addr; @@ -628,7 +628,7 @@ sys_munlock(p, v, retval) register_t *retval; { struct sys_munlock_args /* { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(size_t) len; } */ *uap = v; vm_offset_t addr; -- cgit v1.2.3