match syscallargs comments with reality

from Patrick Latifi <patrick.l@hermes.usherb.ca>
ok jason@ tedu@

15 files changed, 112 insertions, 103 deletions

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index e9393e2a2bd..ca4cad5492a 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.106 2003/08/21 18:56:07 tedu Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.107 2003/09/01 18:06:03 henning Exp $	*/
 /*	$NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $	*/
 
 /*
@@ -492,9 +492,9 @@ start_init(arg)
 	struct proc *p = arg;
 	vaddr_t addr;
 	struct sys_execve_args /* {
-		syscallarg(char *) path;
-		syscallarg(char **) argp;
-		syscallarg(char **) envp;
+		syscallarg(const char *) path;
+		syscallarg(char *const *) argp;
+		syscallarg(char *const *) envp;
 	} */ args;
 	int options, error;
 	long i;
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index 36d1aba3f65..bf64c932e9c 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_acct.c,v 1.12 2003/08/15 20:32:18 tedu Exp $	*/
+/*	$OpenBSD: kern_acct.c,v 1.13 2003/09/01 18:06:03 henning Exp $	*/
 /*	$NetBSD: kern_acct.c,v 1.42 1996/02/04 02:15:12 christos Exp $	*/
 
 /*-
@@ -100,7 +100,7 @@ sys_acct(p, v, retval)
 	register_t *retval;
 {
 	struct sys_acct_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 	} */ *uap = v;
 	struct nameidata nd;
 	int error;
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 8be38c028df..c8c4b2e14bb 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exec.c,v 1.81 2003/08/21 18:56:07 tedu Exp $	*/
+/*	$OpenBSD: kern_exec.c,v 1.82 2003/09/01 18:06:03 henning Exp $	*/
 /*	$NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $	*/
 
 /*-
@@ -233,9 +233,9 @@ sys_execve(p, v, retval)
 	register_t *retval;
 {
 	struct sys_execve_args /* {
-		syscallarg(char *) path;
-		syscallarg(char * *) argp;
-		syscallarg(char * *) envp;
+		syscallarg(const char *) path;
+		syscallarg(char *const *) argp;
+		syscallarg(char *const *) envp;
 	} */ *uap = v;
 	int error;
 	struct exec_package pack;
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index b67d8864d32..0172d28efb2 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_ktrace.c,v 1.30 2003/06/02 23:28:05 millert Exp $	*/
+/*	$OpenBSD: kern_ktrace.c,v 1.31 2003/09/01 18:06:03 henning Exp $	*/
 /*	$NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $	*/
 
 /*
@@ -296,7 +296,7 @@ sys_ktrace(curp, v, retval)
 	register_t *retval;
 {
 	struct sys_ktrace_args /* {
-		syscallarg(char *) fname;
+		syscallarg(const char *) fname;
 		syscallarg(int) ops;
 		syscallarg(int) facs;
 		syscallarg(pid_t) pid;
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 08d997605bd..5e082e3f6fd 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_prot.c,v 1.25 2003/08/15 20:32:18 tedu Exp $	*/
+/*	$OpenBSD: kern_prot.c,v 1.26 2003/09/01 18:06:03 henning Exp $	*/
 /*	$NetBSD: kern_prot.c,v 1.33 1996/02/09 18:59:42 christos Exp $	*/
 
 /*
@@ -759,7 +759,7 @@ sys_setgroups(p, v, retval)
 {
 	struct sys_setgroups_args /* {
 		syscallarg(int) gidsetsize;
-		syscallarg(gid_t *) gidset;
+		syscallarg(const gid_t *) gidset;
 	} */ *uap = v;
 	struct pcred *pc = p->p_cred;
 	u_int ngrp;
@@ -918,7 +918,7 @@ sys_setlogin(p, v, retval)
 	register_t *retval;
 {
 	struct sys_setlogin_args /* {
-		syscallarg(char *) namebuf;
+		syscallarg(const char *) namebuf;
 	} */ *uap = v;
 	int error;
 
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 272cab6aad3..f47644a55d0 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_resource.c,v 1.23 2003/08/15 20:32:18 tedu Exp $	*/
+/*	$OpenBSD: kern_resource.c,v 1.24 2003/09/01 18:06:03 henning Exp $	*/
 /*	$NetBSD: kern_resource.c,v 1.38 1996/10/23 07:19:38 matthias Exp $	*/
 
 /*-
@@ -210,7 +210,7 @@ sys_setrlimit(p, v, retval)
 {
 	register struct sys_setrlimit_args /* {
 		syscallarg(int) which;
-		syscallarg(struct rlimit *) rlp;
+		syscallarg(const struct rlimit *) rlp;
 	} */ *uap = v;
 	struct rlimit alim;
 	int error;
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 3a34b4d953f..c6c59495628 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sig.c,v 1.67 2003/08/15 20:32:18 tedu Exp $	*/
+/*	$OpenBSD: kern_sig.c,v 1.68 2003/09/01 18:06:03 henning Exp $	*/
 /*	$NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $	*/
 
 /*
@@ -227,7 +227,7 @@ sys_sigaction(p, v, retval)
 {
 	register struct sys_sigaction_args /* {
 		syscallarg(int) signum;
-		syscallarg(struct sigaction *) nsa;
+		syscallarg(const struct sigaction *) nsa;
 		syscallarg(struct sigaction *) osa;
 	} */ *uap = v;
 	struct sigaction vec;
@@ -513,7 +513,7 @@ sys_sigaltstack(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_sigaltstack_args /* {
-		syscallarg(struct sigaltstack *) nss;
+		syscallarg(const struct sigaltstack *) nss;
 		syscallarg(struct sigaltstack *) oss;
 	} */ *uap = v;
 	struct sigacts *psp;
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 9b16726030f..ed00fbc3134 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_time.c,v 1.37 2003/08/26 02:15:13 tedu Exp $	*/
+/*	$OpenBSD: kern_time.c,v 1.38 2003/09/01 18:06:03 henning Exp $	*/
 /*	$NetBSD: kern_time.c,v 1.20 1996/02/18 11:57:06 fvdl Exp $	*/
 
 /*
@@ -312,8 +312,8 @@ sys_settimeofday(p, v, retval)
 	register_t *retval;
 {
 	struct sys_settimeofday_args /* {
-		syscallarg(struct timeval *) tv;
-		syscallarg(struct timezone *) tzp;
+		syscallarg(const struct timeval *) tv;
+		syscallarg(const struct timezone *) tzp;
 	} */ *uap = v;
 	struct timeval atv;
 	struct timezone atz;
@@ -349,7 +349,7 @@ sys_adjtime(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_adjtime_args /* {
-		syscallarg(struct timeval *) delta;
+		syscallarg(const struct timeval *) delta;
 		syscallarg(struct timeval *) olddelta;
 	} */ *uap = v;
 	struct timeval atv;
@@ -469,7 +469,7 @@ sys_setitimer(p, v, retval)
 {
 	register struct sys_setitimer_args /* {
 		syscallarg(int) which;
-		syscallarg(struct itimerval *) itv;
+		syscallarg(const struct itimerval *) itv;
 		syscallarg(struct itimerval *) oitv;
 	} */ *uap = v;
 	struct itimerval aitv;
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 9372e237c5e..58d8f12622a 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_prof.c,v 1.13 2003/06/02 23:28:06 millert Exp $	*/
+/*	$OpenBSD: subr_prof.c,v 1.14 2003/09/01 18:06:03 henning Exp $	*/
 /*	$NetBSD: subr_prof.c,v 1.12 1996/04/22 01:38:50 christos Exp $	*/
 
 /*-
@@ -154,9 +154,9 @@ sys_profil(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_profil_args /* {
-		syscallarg(char *) samples;
-		syscallarg(u_int) size;
-		syscallarg(u_int) offset;
+		syscallarg(caddr_t) samples;
+		syscallarg(size_t) size;
+		syscallarg(u_long) offset;
 		syscallarg(u_int) scale;
 	} */ *uap = v;
 	register struct uprof *upp;
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index a5dedcd587b..3a668bac241 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_generic.c,v 1.44 2003/07/21 22:44:50 tedu Exp $	*/
+/*	$OpenBSD: sys_generic.c,v 1.45 2003/09/01 18:06:03 henning Exp $	*/
 /*	$NetBSD: sys_generic.c,v 1.24 1996/03/29 00:25:32 cgd Exp $	*/
 
 /*
@@ -507,7 +507,7 @@ sys_ioctl(p, v, retval)
 	struct sys_ioctl_args /* {
 		syscallarg(int) fd;
 		syscallarg(u_long) com;
-		syscallarg(caddr_t) data;
+		syscallarg(void *) data;
 	} */ *uap = v;
 	struct file *fp;
 	struct filedesc *fdp;
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index e311bb859eb..c2bf148b725 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_syscalls.c,v 1.55 2003/07/21 22:44:50 tedu Exp $	*/
+/*	$OpenBSD: uipc_syscalls.c,v 1.56 2003/09/01 18:06:03 henning Exp $	*/
 /*	$NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $	*/
 
 /*
@@ -102,7 +102,7 @@ sys_bind(p, v, retval)
 {
 	register struct sys_bind_args /* {
 		syscallarg(int) s;
-		syscallarg(struct sockaddr *) name;
+		syscallarg(const struct sockaddr *) name;
 		syscallarg(socklen_t) namelen;
 	} */ *uap = v;
 	struct file *fp;
@@ -263,7 +263,7 @@ sys_connect(p, v, retval)
 {
 	struct sys_connect_args /* {
 		syscallarg(int) s;
-		syscallarg(struct sockaddr *) name;
+		syscallarg(const struct sockaddr *) name;
 		syscallarg(socklen_t) namelen;
 	} */ *uap = v;
 	struct file *fp;
@@ -391,10 +391,10 @@ sys_sendto(p, v, retval)
 {
 	register struct sys_sendto_args /* {
 		syscallarg(int) s;
-		syscallarg(caddr_t) buf;
+		syscallarg(const void *) buf;
 		syscallarg(size_t) len;
 		syscallarg(int) flags;
-		syscallarg(struct sockaddr *) to;
+		syscallarg(const struct sockaddr *) to;
 		syscallarg(socklen_t) tolen;
 	} */ *uap = v;
 	struct msghdr msg;
@@ -421,7 +421,7 @@ sys_sendmsg(p, v, retval)
 {
 	register struct sys_sendmsg_args /* {
 		syscallarg(int) s;
-		syscallarg(caddr_t) msg;
+		syscallarg(const struct msghdr *) msg;
 		syscallarg(int) flags;
 	} */ *uap = v;
 	struct msghdr msg;
@@ -565,7 +565,7 @@ sys_recvfrom(p, v, retval)
 {
 	register struct sys_recvfrom_args /* {
 		syscallarg(int) s;
-		syscallarg(caddr_t) buf;
+		syscallarg(void *) buf;
 		syscallarg(size_t) len;
 		syscallarg(int) flags;
 		syscallarg(struct sockaddr *) from;
@@ -826,7 +826,7 @@ sys_setsockopt(p, v, retval)
 		syscallarg(int) s;
 		syscallarg(int) level;
 		syscallarg(int) name;
-		syscallarg(caddr_t) val;
+		syscallarg(const void *) val;
 		syscallarg(socklen_t) valsize;
 	} */ *uap = v;
 	struct file *fp;
@@ -880,7 +880,7 @@ sys_getsockopt(p, v, retval)
 		syscallarg(int) s;
 		syscallarg(int) level;
 		syscallarg(int) name;
-		syscallarg(caddr_t) val;
+		syscallarg(void *) val;
 		syscallarg(socklen_t *) avalsize;
 	} */ *uap = v;
 	struct file *fp;
@@ -949,7 +949,7 @@ sys_getsockname(p, v, retval)
 {
 	struct sys_getsockname_args /* {
 		syscallarg(int) fdes;
-		syscallarg(caddr_t) asa;
+		syscallarg(struct sockaddr *) asa;
 		syscallarg(socklen_t *) alen;
 	} */ *uap = v;
 	struct file *fp;
@@ -993,7 +993,7 @@ sys_getpeername(p, v, retval)
 {
 	struct sys_getpeername_args /* {
 		syscallarg(int) fdes;
-		syscallarg(caddr_t) asa;
+		syscallarg(struct sockaddr *) asa;
 		syscallarg(socklen_t *) alen;
 	} */ *uap = v;
 	struct file *fp;
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index de53acc4882..eb8a74fa3ad 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_default.c,v 1.21 2003/07/21 22:44:50 tedu Exp $  */
+/*	$OpenBSD: vfs_default.c,v 1.22 2003/09/01 18:06:03 henning Exp $  */
 
 /*
  *    Portions of this code are:
@@ -62,6 +62,7 @@ vop_generic_revoke(v)
 	void *v;
 {
 	struct vop_revoke_args /* {
+		struct vnodeop_desc *a_desc;
 		struct vnode *a_vp;
 		int a_flags;
 	} */ *ap = v;
@@ -133,6 +134,7 @@ vop_generic_abortop(v)
 	void *v;
 {
 	struct vop_abortop_args /* {
+		struct vnodeop_desc *a_desc;
 		struct vnode *a_dvp;
 		struct componentname *a_cnp;
 	} */ *ap = v;
@@ -153,6 +155,7 @@ vop_generic_lock(v)
 	void *v;
 {
 	struct vop_lock_args /* {
+		struct vnodeop_desc *a_desc;
 		struct vnode *a_vp;
 		int a_flags;
 		struct proc *a_p;
@@ -222,6 +225,7 @@ vop_generic_unlock(v)
 	void *v;
 {
 	struct vop_unlock_args /* {
+		struct vnodeop_desc *a_desc;
 		struct vnode *a_vp;
 		int a_flags;
 		struct proc *a_p;
@@ -242,6 +246,7 @@ vop_generic_islocked(v)
 	void *v;
 {
 	struct vop_islocked_args /* {
+		struct vnodeop_desc *a_desc;
 		struct vnode *a_vp;
 	} */ *ap = v;
 
@@ -260,6 +265,7 @@ vop_generic_kqfilter(v)
 	void *v;
 {
 	struct vop_kqfilter_args /* {
+		struct vnodeop_desc *a_desc;
 		struct vnode *a_vp;
 		struct knote *a_kn;
 	} */ *ap = v;
diff --git a/sys/kern/vfs_sync.c b/sys/kern/vfs_sync.c
index 513bb2a9f92..46f93cd1b43 100644
--- a/sys/kern/vfs_sync.c
+++ b/sys/kern/vfs_sync.c
@@ -1,4 +1,4 @@
-/*       $OpenBSD: vfs_sync.c,v 1.24 2003/06/02 23:28:07 millert Exp $  */
+/*       $OpenBSD: vfs_sync.c,v 1.25 2003/09/01 18:06:03 henning Exp $  */
 
 /*
  *  Portions of this code are:
@@ -325,6 +325,7 @@ sync_fsync(v)
 	void *v;
 {
 	struct vop_fsync_args /* {
+		struct vnodeop_desc *a_desc;
 		struct vnode *a_vp;
 		struct ucred *a_cred;
 		int a_waitfor;
@@ -371,6 +372,7 @@ sync_inactive(v)
 	void *v;
 {
 	struct vop_inactive_args /* {
+		struct vnodeop_desc *a_desc;
 		struct vnode *a_vp;
 		struct proc *a_p;
 	} */ *ap = v;
@@ -398,6 +400,7 @@ sync_print(v)
 
 {
 	struct vop_print_args /* {
+		struct vnodeop_desc *a_desc;
 		struct vnode *a_vp;
 	} */ *ap = v;
 	struct vnode *vp = ap->a_vp;
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index a99d658045d..bf738cf8aef 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_syscalls.c,v 1.106 2003/08/15 20:32:18 tedu Exp $	*/
+/*	$OpenBSD: vfs_syscalls.c,v 1.107 2003/09/01 18:06:03 henning Exp $	*/
 /*	$NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $	*/
 
 /*
@@ -90,8 +90,8 @@ sys_mount(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_mount_args /* {
-		syscallarg(char *) type;
-		syscallarg(char *) path;
+		syscallarg(const char *) type;
+		syscallarg(const char *) path;
 		syscallarg(int) flags;
 		syscallarg(void *) data;
 	} */ *uap = v;
@@ -377,7 +377,7 @@ sys_unmount(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_unmount_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(int) flags;
 	} */ *uap = v;
 	register struct vnode *vp;
@@ -548,10 +548,10 @@ sys_quotactl(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_quotactl_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(int) cmd;
 		syscallarg(int) uid;
-		syscallarg(caddr_t) arg;
+		syscallarg(char *) arg;
 	} */ *uap = v;
 	register struct mount *mp;
 	int error;
@@ -577,7 +577,7 @@ sys_statfs(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_statfs_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(struct statfs *) buf;
 	} */ *uap = v;
 	register struct mount *mp;
@@ -791,7 +791,7 @@ sys_chdir(p, v, retval)
 	register_t *retval;
 {
 	struct sys_chdir_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 	} */ *uap = v;
 	register struct filedesc *fdp = p->p_fd;
 	int error;
@@ -817,7 +817,7 @@ sys_chroot(p, v, retval)
 	register_t *retval;
 {
 	struct sys_chroot_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 	} */ *uap = v;
 	register struct filedesc *fdp = p->p_fd;
 	int error;
@@ -879,7 +879,7 @@ sys_open(p, v, retval)
 	register_t *retval;
 {
 	struct sys_open_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(int) flags;
 		syscallarg(int) mode;
 	} */ *uap = v;
@@ -983,7 +983,7 @@ sys_getfh(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_getfh_args /* {
-		syscallarg(char *) fname;
+		syscallarg(const char *) fname;
 		syscallarg(fhandle_t *) fhp;
 	} */ *uap = v;
 	register struct vnode *vp;
@@ -1229,7 +1229,7 @@ sys_mknod(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_mknod_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(int) mode;
 		syscallarg(int) dev;
 	} */ *uap = v;
@@ -1310,7 +1310,7 @@ sys_mkfifo(p, v, retval)
 	return (EOPNOTSUPP);
 #else
 	register struct sys_mkfifo_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(int) mode;
 	} */ *uap = v;
 	struct vattr vattr;
@@ -1348,8 +1348,8 @@ sys_link(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_link_args /* {
-		syscallarg(char *) path;
-		syscallarg(char *) link;
+		syscallarg(const char *) path;
+		syscallarg(const char *) link;
 	} */ *uap = v;
 	register struct vnode *vp;
 	struct nameidata nd;
@@ -1398,8 +1398,8 @@ sys_symlink(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_symlink_args /* {
-		syscallarg(char *) path;
-		syscallarg(char *) link;
+		syscallarg(const char *) path;
+		syscallarg(const char *) link;
 	} */ *uap = v;
 	struct vattr vattr;
 	char *path;
@@ -1443,7 +1443,7 @@ sys_undelete(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_undelete_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 	} */ *uap = v;
 	int error;
 	struct nameidata nd;
@@ -1483,7 +1483,7 @@ sys_unlink(p, v, retval)
 	register_t *retval;
 {
 	struct sys_unlink_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 	} */ *uap = v;
 	register struct vnode *vp;
 	int error;
@@ -1588,7 +1588,7 @@ sys_access(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_access_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(int) flags;
 	} */ *uap = v;
 	register struct ucred *cred = p->p_ucred;
@@ -1638,7 +1638,7 @@ sys_stat(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_stat_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(struct stat *) ub;
 	} */ *uap = v;
 	struct stat sb;
@@ -1671,7 +1671,7 @@ sys_lstat(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_lstat_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(struct stat *) ub;
 	} */ *uap = v;
 	struct stat sb;
@@ -1704,7 +1704,7 @@ sys_pathconf(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_pathconf_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(int) name;
 	} */ *uap = v;
 	int error;
@@ -1730,7 +1730,7 @@ sys_readlink(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_readlink_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(char *) buf;
 		syscallarg(size_t) count;
 	} */ *uap = v;
@@ -1775,8 +1775,8 @@ sys_chflags(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_chflags_args /* {
-		syscallarg(char *) path;
-		syscallarg(unsigned int) flags;
+		syscallarg(const char *) path;
+		syscallarg(u_int) flags;
 	} */ *uap = v;
 	register struct vnode *vp;
 	struct vattr vattr;
@@ -1823,7 +1823,7 @@ sys_fchflags(p, v, retval)
 {
 	struct sys_fchflags_args /* {
 		syscallarg(int) fd;
-		syscallarg(unsigned int) flags;
+		syscallarg(u_int) flags;
 	} */ *uap = v;
 	struct vattr vattr;
 	struct vnode *vp;
@@ -1870,7 +1870,7 @@ sys_chmod(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_chmod_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(int) mode;
 	} */ *uap = v;
 	register struct vnode *vp;
@@ -1948,9 +1948,9 @@ sys_chown(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_chown_args /* {
-		syscallarg(char *) path;
-		syscallarg(int) uid;
-		syscallarg(int) gid;
+		syscallarg(const char *) path;
+		syscallarg(uid_t) uid;
+		syscallarg(gid_t) gid;
 	} */ *uap = v;
 	register struct vnode *vp;
 	struct vattr vattr;
@@ -2000,9 +2000,9 @@ sys_lchown(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_lchown_args /* {
-		syscallarg(char *) path;
-		syscallarg(int) uid;
-		syscallarg(int) gid;
+		syscallarg(const char *) path;
+		syscallarg(uid_t) uid;
+		syscallarg(gid_t) gid;
 	} */ *uap = v;
 	register struct vnode *vp;
 	struct vattr vattr;
@@ -2053,8 +2053,8 @@ sys_fchown(p, v, retval)
 {
 	struct sys_fchown_args /* {
 		syscallarg(int) fd;
-		syscallarg(int) uid;
-		syscallarg(int) gid;
+		syscallarg(uid_t) uid;
+		syscallarg(gid_t) gid;
 	} */ *uap = v;
 	struct vnode *vp;
 	struct vattr vattr;
@@ -2103,8 +2103,8 @@ sys_utimes(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_utimes_args /* {
-		syscallarg(char *) path;
-		syscallarg(struct timeval *) tptr;
+		syscallarg(const char *) path;
+		syscallarg(const struct timeval *) tptr;
 	} */ *uap = v;
 	register struct vnode *vp;
 	struct timeval tv[2];
@@ -2160,7 +2160,7 @@ sys_futimes(p, v, retval)
 {
 	register struct sys_futimes_args /* {
 		syscallarg(int) fd;
-		syscallarg(struct timeval *) tptr;
+		syscallarg(const struct timeval *) tptr;
 	} */ *uap = v;
 	struct vnode *vp;
 	struct timeval tv[2];
@@ -2214,7 +2214,7 @@ sys_truncate(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_truncate_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(int) pad;
 		syscallarg(off_t) length;
 	} */ *uap = v;
@@ -2327,8 +2327,8 @@ sys_rename(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_rename_args /* {
-		syscallarg(char *) from;
-		syscallarg(char *) to;
+		syscallarg(const char *) from;
+		syscallarg(const char *) to;
 	} */ *uap = v;
 	register struct vnode *tvp, *fvp, *tdvp;
 	struct nameidata fromnd, tond;
@@ -2420,7 +2420,7 @@ sys_mkdir(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_mkdir_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 		syscallarg(int) mode;
 	} */ *uap = v;
 	register struct vnode *vp;
@@ -2463,7 +2463,7 @@ sys_rmdir(p, v, retval)
 	register_t *retval;
 {
 	struct sys_rmdir_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 	} */ *uap = v;
 	register struct vnode *vp;
 	int error;
@@ -2615,7 +2615,7 @@ sys_revoke(p, v, retval)
 	register_t *retval;
 {
 	register struct sys_revoke_args /* {
-		syscallarg(char *) path;
+		syscallarg(const char *) path;
 	} */ *uap = v;
 	register struct vnode *vp;
 	struct vattr vattr;
@@ -2995,8 +2995,8 @@ sys_extattr_set_fd(struct proc *p, void *v, register_t *retval)
 		syscallarg(int) fd;
 		syscallarg(int) attrnamespace;
 		syscallarg(const char *) attrname;
-		syscallarg(struct iovec *) iovp;
-		syscallarg(int) iovcnt;
+		syscallarg(void *) data;
+		syscallarg(size_t) nbytes;
 	} */ *uap = v;
 	struct file *fp;
 	char attrname[EXTATTR_MAXNAMELEN];
@@ -3173,7 +3173,7 @@ sys_extattr_delete_file(p, v, retval)
 	register_t *retval;
 {
 	struct sys_extattr_delete_file_args /* {
-		syscallarg(int) fd;
+		syscallarg(const char *) path;
 		syscallarg(int) attrnamespace;
 		syscallarg(const char *) attrname;
 	} */ *uap = v;
diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c
index 0e3e1fa2a42..2ddb6286b96 100644
--- a/sys/uvm/uvm_mmap.c
+++ b/sys/uvm/uvm_mmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_mmap.c,v 1.51 2003/08/15 20:32:21 tedu Exp $	*/
+/*	$OpenBSD: uvm_mmap.c,v 1.52 2003/09/01 18:06:44 henning Exp $	*/
 /*	$NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $	*/
 
 /*
@@ -89,7 +89,7 @@ sys_sbrk(p, v, retval)
 {
 #if 0
 	struct sys_sbrk_args /* {
-		syscallarg(intptr_t) incr;
+		syscallarg(int) incr;
 	} */ *uap = v;
 #endif
 
@@ -134,7 +134,7 @@ sys_mquery(p, v, retval)
 	register_t *retval;
 {
 	struct sys_mquery_args /* {
-		syscallarg(caddr_t) addr;
+		syscallarg(void *) addr;
 		syscallarg(size_t) len;
 		syscallarg(int) prot;
 		syscallarg(int) flags;
@@ -367,7 +367,7 @@ sys_mmap(p, v, retval)
 	register_t *retval;
 {
 	struct sys_mmap_args /* {
-		syscallarg(caddr_t) addr;
+		syscallarg(void *) addr;
 		syscallarg(size_t) len;
 		syscallarg(int) prot;
 		syscallarg(int) flags;
@@ -624,7 +624,7 @@ sys_msync(p, v, retval)
 	register_t *retval;
 {
 	struct sys_msync_args /* {
-		syscallarg(caddr_t) addr;
+		syscallarg(void *) addr;
 		syscallarg(size_t) len;
 		syscallarg(int) flags;
 	} */ *uap = v;
@@ -725,7 +725,7 @@ sys_munmap(p, v, retval)
 	register_t *retval;
 {
 	struct sys_munmap_args /* {
-		syscallarg(caddr_t) addr;
+		syscallarg(void *) addr;
 		syscallarg(size_t) len;
 	} */ *uap = v;
 	vaddr_t addr;
@@ -804,8 +804,8 @@ sys_mprotect(p, v, retval)
 	register_t *retval;
 {
 	struct sys_mprotect_args /* {
-		syscallarg(caddr_t) addr;
-		syscallarg(int) len;
+		syscallarg(void *) addr;
+		syscallarg(size_t) len;
 		syscallarg(int) prot;
 	} */ *uap = v;
 	vaddr_t addr;
@@ -859,8 +859,8 @@ sys_minherit(p, v, retval)
 	register_t *retval;
 {
 	struct sys_minherit_args /* {
-		syscallarg(caddr_t) addr;
-		syscallarg(int) len;
+		syscallarg(void *) addr;
+		syscallarg(size_t) len;
 		syscallarg(int) inherit;
 	} */ *uap = v;
 	vaddr_t addr;
@@ -904,7 +904,7 @@ sys_madvise(p, v, retval)
 	register_t *retval;
 {
 	struct sys_madvise_args /* {
-		syscallarg(caddr_t) addr;
+		syscallarg(void *) addr;
 		syscallarg(size_t) len;
 		syscallarg(int) behav;
 	} */ *uap = v;