First round of __P removal in sys

5 files changed, 147 insertions, 147 deletions

diff --git a/sys/compat/osf1/osf1.h b/sys/compat/osf1/osf1.h
index 55b6962eaea..2a20142b384 100644
--- a/sys/compat/osf1/osf1.h
+++ b/sys/compat/osf1/osf1.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osf1.h,v 1.2 2001/07/09 05:15:24 fgsch Exp $	*/
+/*	$OpenBSD: osf1.h,v 1.3 2002/03/14 01:26:50 millert Exp $	*/
 /*	$NetBSD: osf1.h,v 1.20 1999/05/10 21:41:07 cgd Exp $	*/
 
 /*
@@ -72,7 +72,7 @@ typedef void		*osf1_data_ptr;	/* XXX hard to fix size */
 typedef void		*osf1_fcn_ptr;	/* XXX hard to fix size, bogus */
 typedef	osf1_int	osf1_key_t;
 typedef	osf1_int	osf1_pid_t;
-typedef void    (*osf1_handler_t) __P((int));
+typedef void    (*osf1_handler_t)(int);
 
 struct osf1_timeval {				/* time.h */
 	osf1_time_t	tv_sec;
diff --git a/sys/compat/osf1/osf1_exec.c b/sys/compat/osf1/osf1_exec.c
index dab6d64c3c9..30858fb9e19 100644
--- a/sys/compat/osf1/osf1_exec.c
+++ b/sys/compat/osf1/osf1_exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: osf1_exec.c,v 1.3 2002/01/22 21:50:49 ericj Exp $ */
+/* $OpenBSD: osf1_exec.c,v 1.4 2002/03/14 01:26:50 millert Exp $ */
 /* $NetBSD$ */
 
 /*
@@ -70,8 +70,8 @@ static int osf1_exec_ecoff_dynamic(struct proc *, struct exec_package *);
 #define MAX_AUX_ENTRIES                4        /* max we'll ever push (right now) */
 
 extern struct sysent osf1_sysent[];
-extern void cpu_exec_ecoff_setregs __P((struct proc *, struct exec_package *,
-					u_long, register_t *));
+extern void cpu_exec_ecoff_setregs(struct proc *, struct exec_package *,
+					u_long, register_t *);
 extern char osf1_sigcode[], osf1_esigcode[];
 
 struct emul emul_osf1 = {
diff --git a/sys/compat/osf1/osf1_ioctl.c b/sys/compat/osf1/osf1_ioctl.c
index c9ba9ae7963..46412c7dbbe 100644
--- a/sys/compat/osf1/osf1_ioctl.c
+++ b/sys/compat/osf1/osf1_ioctl.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: osf1_ioctl.c,v 1.4 2000/09/06 13:38:36 ericj Exp $ */
+/* 	$OpenBSD: osf1_ioctl.c,v 1.5 2002/03/14 01:26:50 millert Exp $ */
 /*	$NetBSD: osf1_ioctl.c,v 1.11 1999/05/05 01:51:33 cgd Exp $	*/
 
 /*
@@ -72,14 +72,14 @@
 extern int scdebug;
 #endif
 
-int osf1_ioctl_f	__P((struct proc *p, struct sys_ioctl_args *nuap,
-			    register_t *retval, int cmd, int dir, int len));
-int osf1_ioctl_i	__P((struct proc *p, struct sys_ioctl_args *nuap,
-			    register_t *retval, int cmd, int dir, int len));
-int osf1_ioctl_t	__P((struct proc *p, struct sys_ioctl_args *nuap,
-			    register_t *retval, int cmd, int dir, int len));
-int osf1_ioctl_m 	__P((struct proc *p, struct sys_ioctl_args *nuap,
-			    register_t *retval, int cmd, int dir, int len));
+int osf1_ioctl_f(struct proc *p, struct sys_ioctl_args *nuap,
+			    register_t *retval, int cmd, int dir, int len);
+int osf1_ioctl_i(struct proc *p, struct sys_ioctl_args *nuap,
+			    register_t *retval, int cmd, int dir, int len);
+int osf1_ioctl_t(struct proc *p, struct sys_ioctl_args *nuap,
+			    register_t *retval, int cmd, int dir, int len);
+int osf1_ioctl_m(struct proc *p, struct sys_ioctl_args *nuap,
+			    register_t *retval, int cmd, int dir, int len);
 
 int
 osf1_sys_ioctl(p, v, retval)
diff --git a/sys/compat/osf1/osf1_mount.c b/sys/compat/osf1/osf1_mount.c
index ec17ba7b2ef..c3a4e3ca43a 100644
--- a/sys/compat/osf1/osf1_mount.c
+++ b/sys/compat/osf1/osf1_mount.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: osf1_mount.c,v 1.7 2002/02/22 20:37:45 drahn Exp $ */
+/* 	$OpenBSD: osf1_mount.c,v 1.8 2002/03/14 01:26:50 millert Exp $ */
 /*	$NetBSD: osf1_mount.c,v 1.14 1999/05/05 01:51:34 cgd Exp $	*/
 
 /*
@@ -100,10 +100,10 @@
 #define	OSF1_UNMOUNT_FLAGS	(OSF1_MNT_FORCE|OSF1_MNT_NOFORCE)
 
 
-static int	osf1_mount_mfs __P((struct proc *,
-		    struct osf1_sys_mount_args *, struct sys_mount_args *));
-static int	osf1_mount_nfs __P((struct proc *,
-		    struct osf1_sys_mount_args *, struct sys_mount_args *));
+static int	osf1_mount_mfs(struct proc *,
+		    struct osf1_sys_mount_args *, struct sys_mount_args *);
+static int	osf1_mount_nfs(struct proc *,
+		    struct osf1_sys_mount_args *, struct sys_mount_args *);
 
 int
 osf1_sys_fstatfs(p, v, retval)
diff --git a/sys/compat/osf1/osf1_syscallargs.h b/sys/compat/osf1/osf1_syscallargs.h
index c57fab5c80d..c3d002c2565 100644
--- a/sys/compat/osf1/osf1_syscallargs.h
+++ b/sys/compat/osf1/osf1_syscallargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osf1_syscallargs.h,v 1.9 2001/08/26 04:14:26 deraadt Exp $	*/
+/*	$OpenBSD: osf1_syscallargs.h,v 1.10 2002/03/14 01:26:50 millert Exp $	*/
 
 /*
  * System call argument lists.
@@ -333,130 +333,130 @@ struct osf1_sys_setsysinfo_args {
  * System call prototypes.
  */
 
-int	sys_nosys	__P((struct proc *, void *, register_t *));
-int	sys_exit	__P((struct proc *, void *, register_t *));
-int	sys_fork	__P((struct proc *, void *, register_t *));
-int	sys_read	__P((struct proc *, void *, register_t *));
-int	sys_write	__P((struct proc *, void *, register_t *));
-int	sys_close	__P((struct proc *, void *, register_t *));
-int	osf1_sys_wait4	__P((struct proc *, void *, register_t *));
-int	sys_link	__P((struct proc *, void *, register_t *));
-int	sys_unlink	__P((struct proc *, void *, register_t *));
-int	sys_chdir	__P((struct proc *, void *, register_t *));
-int	sys_fchdir	__P((struct proc *, void *, register_t *));
-int	osf1_sys_mknod	__P((struct proc *, void *, register_t *));
-int	sys_chmod	__P((struct proc *, void *, register_t *));
-int	sys_chown	__P((struct proc *, void *, register_t *));
-int	sys_obreak	__P((struct proc *, void *, register_t *));
-int	osf1_sys_getfsstat	__P((struct proc *, void *, register_t *));
-int	osf1_sys_lseek	__P((struct proc *, void *, register_t *));
-int	sys_getpid	__P((struct proc *, void *, register_t *));
-int	osf1_sys_mount	__P((struct proc *, void *, register_t *));
-int	osf1_sys_unmount	__P((struct proc *, void *, register_t *));
-int	osf1_sys_setuid	__P((struct proc *, void *, register_t *));
-int	sys_getuid	__P((struct proc *, void *, register_t *));
-int	osf1_sys_recvmsg_xopen	__P((struct proc *, void *, register_t *));
-int	osf1_sys_sendmsg_xopen	__P((struct proc *, void *, register_t *));
-int	osf1_sys_access	__P((struct proc *, void *, register_t *));
-int	sys_sync	__P((struct proc *, void *, register_t *));
-int	sys_kill	__P((struct proc *, void *, register_t *));
-int	sys_setpgid	__P((struct proc *, void *, register_t *));
-int	sys_dup	__P((struct proc *, void *, register_t *));
-int	sys_pipe	__P((struct proc *, void *, register_t *));
-int	osf1_sys_set_program_attributes	__P((struct proc *, void *, register_t *));
-int	osf1_sys_open	__P((struct proc *, void *, register_t *));
-int	sys_getgid	__P((struct proc *, void *, register_t *));
-int	sys_sigprocmask	__P((struct proc *, void *, register_t *));
-int	sys_getlogin	__P((struct proc *, void *, register_t *));
-int	sys_setlogin	__P((struct proc *, void *, register_t *));
-int	sys_acct	__P((struct proc *, void *, register_t *));
-int	osf1_sys_classcntl	__P((struct proc *, void *, register_t *));
-int	osf1_sys_ioctl	__P((struct proc *, void *, register_t *));
-int	osf1_sys_reboot	__P((struct proc *, void *, register_t *));
-int	sys_revoke	__P((struct proc *, void *, register_t *));
-int	sys_symlink	__P((struct proc *, void *, register_t *));
-int	sys_readlink	__P((struct proc *, void *, register_t *));
-int	osf1_sys_execve	__P((struct proc *, void *, register_t *));
-int	sys_umask	__P((struct proc *, void *, register_t *));
-int	sys_chroot	__P((struct proc *, void *, register_t *));
-int	sys_getpgrp	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_getpagesize	__P((struct proc *, void *, register_t *));
-int	sys_vfork	__P((struct proc *, void *, register_t *));
-int	osf1_sys_stat	__P((struct proc *, void *, register_t *));
-int	osf1_sys_lstat	__P((struct proc *, void *, register_t *));
-int	osf1_sys_mmap	__P((struct proc *, void *, register_t *));
-int	sys_munmap	__P((struct proc *, void *, register_t *));
-int	osf1_sys_mprotect	__P((struct proc *, void *, register_t *));
-int	osf1_sys_madvise	__P((struct proc *, void *, register_t *));
-int	sys_getgroups	__P((struct proc *, void *, register_t *));
-int	sys_setgroups	__P((struct proc *, void *, register_t *));
-int	sys_setpgid	__P((struct proc *, void *, register_t *));
-int	osf1_sys_setitimer	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_gethostname	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_sethostname	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_getdtablesize	__P((struct proc *, void *, register_t *));
-int	sys_dup2	__P((struct proc *, void *, register_t *));
-int	osf1_sys_fstat	__P((struct proc *, void *, register_t *));
-int	osf1_sys_fcntl	__P((struct proc *, void *, register_t *));
-int	osf1_sys_select	__P((struct proc *, void *, register_t *));
-int	sys_poll	__P((struct proc *, void *, register_t *));
-int	sys_fsync	__P((struct proc *, void *, register_t *));
-int	sys_setpriority	__P((struct proc *, void *, register_t *));
-int	osf1_sys_socket	__P((struct proc *, void *, register_t *));
-int	sys_connect	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_accept	__P((struct proc *, void *, register_t *));
-int	sys_getpriority	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_send	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_recv	__P((struct proc *, void *, register_t *));
-int	sys_sigreturn	__P((struct proc *, void *, register_t *));
-int	sys_bind	__P((struct proc *, void *, register_t *));
-int	sys_setsockopt	__P((struct proc *, void *, register_t *));
-int	sys_listen	__P((struct proc *, void *, register_t *));
-int	sys_sigsuspend	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_sigstack	__P((struct proc *, void *, register_t *));
-int	osf1_sys_gettimeofday	__P((struct proc *, void *, register_t *));
-int	osf1_sys_getrusage	__P((struct proc *, void *, register_t *));
-int	sys_getsockopt	__P((struct proc *, void *, register_t *));
-int	osf1_sys_readv	__P((struct proc *, void *, register_t *));
-int	osf1_sys_writev	__P((struct proc *, void *, register_t *));
-int	osf1_sys_settimeofday	__P((struct proc *, void *, register_t *));
-int	sys_fchown	__P((struct proc *, void *, register_t *));
-int	sys_fchmod	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_recvfrom	__P((struct proc *, void *, register_t *));
-int	sys_rename	__P((struct proc *, void *, register_t *));
-int	osf1_sys_truncate	__P((struct proc *, void *, register_t *));
-int	osf1_sys_ftruncate	__P((struct proc *, void *, register_t *));
-int	osf1_sys_setgid	__P((struct proc *, void *, register_t *));
-int	osf1_sys_sendto	__P((struct proc *, void *, register_t *));
-int	sys_shutdown	__P((struct proc *, void *, register_t *));
-int	osf1_sys_socketpair	__P((struct proc *, void *, register_t *));
-int	sys_mkdir	__P((struct proc *, void *, register_t *));
-int	sys_rmdir	__P((struct proc *, void *, register_t *));
-int	osf1_sys_utimes	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_getpeername	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_gethostid	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_sethostid	__P((struct proc *, void *, register_t *));
-int	osf1_sys_getrlimit	__P((struct proc *, void *, register_t *));
-int	osf1_sys_setrlimit	__P((struct proc *, void *, register_t *));
-int	sys_setsid	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_quota	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_getsockname	__P((struct proc *, void *, register_t *));
-int	osf1_sys_sigaction	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_getdirentries	__P((struct proc *, void *, register_t *));
-int	osf1_sys_statfs	__P((struct proc *, void *, register_t *));
-int	osf1_sys_fstatfs	__P((struct proc *, void *, register_t *));
-int	compat_09_sys_getdomainname	__P((struct proc *, void *, register_t *));
-int	compat_09_sys_setdomainname	__P((struct proc *, void *, register_t *));
-int	osf1_sys_uname	__P((struct proc *, void *, register_t *));
-int	sys_lchown	__P((struct proc *, void *, register_t *));
-int	osf1_sys_shmat	__P((struct proc *, void *, register_t *));
-int	osf1_sys_shmctl	__P((struct proc *, void *, register_t *));
-int	osf1_sys_shmdt	__P((struct proc *, void *, register_t *));
-int	osf1_sys_shmget	__P((struct proc *, void *, register_t *));
-int	sys_getsid	__P((struct proc *, void *, register_t *));
-int	osf1_sys_sigaltstack	__P((struct proc *, void *, register_t *));
-int	osf1_sys_sysinfo	__P((struct proc *, void *, register_t *));
-int	osf1_sys_pathconf	__P((struct proc *, void *, register_t *));
-int	osf1_sys_fpathconf	__P((struct proc *, void *, register_t *));
-int	osf1_sys_usleep_thread	__P((struct proc *, void *, register_t *));
-int	osf1_sys_setsysinfo	__P((struct proc *, void *, register_t *));
+int	sys_nosys(struct proc *, void *, register_t *);
+int	sys_exit(struct proc *, void *, register_t *);
+int	sys_fork(struct proc *, void *, register_t *);
+int	sys_read(struct proc *, void *, register_t *);
+int	sys_write(struct proc *, void *, register_t *);
+int	sys_close(struct proc *, void *, register_t *);
+int	osf1_sys_wait4(struct proc *, void *, register_t *);
+int	sys_link(struct proc *, void *, register_t *);
+int	sys_unlink(struct proc *, void *, register_t *);
+int	sys_chdir(struct proc *, void *, register_t *);
+int	sys_fchdir(struct proc *, void *, register_t *);
+int	osf1_sys_mknod(struct proc *, void *, register_t *);
+int	sys_chmod(struct proc *, void *, register_t *);
+int	sys_chown(struct proc *, void *, register_t *);
+int	sys_obreak(struct proc *, void *, register_t *);
+int	osf1_sys_getfsstat(struct proc *, void *, register_t *);
+int	osf1_sys_lseek(struct proc *, void *, register_t *);
+int	sys_getpid(struct proc *, void *, register_t *);
+int	osf1_sys_mount(struct proc *, void *, register_t *);
+int	osf1_sys_unmount(struct proc *, void *, register_t *);
+int	osf1_sys_setuid(struct proc *, void *, register_t *);
+int	sys_getuid(struct proc *, void *, register_t *);
+int	osf1_sys_recvmsg_xopen(struct proc *, void *, register_t *);
+int	osf1_sys_sendmsg_xopen(struct proc *, void *, register_t *);
+int	osf1_sys_access(struct proc *, void *, register_t *);
+int	sys_sync(struct proc *, void *, register_t *);
+int	sys_kill(struct proc *, void *, register_t *);
+int	sys_setpgid(struct proc *, void *, register_t *);
+int	sys_dup(struct proc *, void *, register_t *);
+int	sys_pipe(struct proc *, void *, register_t *);
+int	osf1_sys_set_program_attributes(struct proc *, void *, register_t *);
+int	osf1_sys_open(struct proc *, void *, register_t *);
+int	sys_getgid(struct proc *, void *, register_t *);
+int	sys_sigprocmask(struct proc *, void *, register_t *);
+int	sys_getlogin(struct proc *, void *, register_t *);
+int	sys_setlogin(struct proc *, void *, register_t *);
+int	sys_acct(struct proc *, void *, register_t *);
+int	osf1_sys_classcntl(struct proc *, void *, register_t *);
+int	osf1_sys_ioctl(struct proc *, void *, register_t *);
+int	osf1_sys_reboot(struct proc *, void *, register_t *);
+int	sys_revoke(struct proc *, void *, register_t *);
+int	sys_symlink(struct proc *, void *, register_t *);
+int	sys_readlink(struct proc *, void *, register_t *);
+int	osf1_sys_execve(struct proc *, void *, register_t *);
+int	sys_umask(struct proc *, void *, register_t *);
+int	sys_chroot(struct proc *, void *, register_t *);
+int	sys_getpgrp(struct proc *, void *, register_t *);
+int	compat_43_sys_getpagesize(struct proc *, void *, register_t *);
+int	sys_vfork(struct proc *, void *, register_t *);
+int	osf1_sys_stat(struct proc *, void *, register_t *);
+int	osf1_sys_lstat(struct proc *, void *, register_t *);
+int	osf1_sys_mmap(struct proc *, void *, register_t *);
+int	sys_munmap(struct proc *, void *, register_t *);
+int	osf1_sys_mprotect(struct proc *, void *, register_t *);
+int	osf1_sys_madvise(struct proc *, void *, register_t *);
+int	sys_getgroups(struct proc *, void *, register_t *);
+int	sys_setgroups(struct proc *, void *, register_t *);
+int	sys_setpgid(struct proc *, void *, register_t *);
+int	osf1_sys_setitimer(struct proc *, void *, register_t *);
+int	compat_43_sys_gethostname(struct proc *, void *, register_t *);
+int	compat_43_sys_sethostname(struct proc *, void *, register_t *);
+int	compat_43_sys_getdtablesize(struct proc *, void *, register_t *);
+int	sys_dup2(struct proc *, void *, register_t *);
+int	osf1_sys_fstat(struct proc *, void *, register_t *);
+int	osf1_sys_fcntl(struct proc *, void *, register_t *);
+int	osf1_sys_select(struct proc *, void *, register_t *);
+int	sys_poll(struct proc *, void *, register_t *);
+int	sys_fsync(struct proc *, void *, register_t *);
+int	sys_setpriority(struct proc *, void *, register_t *);
+int	osf1_sys_socket(struct proc *, void *, register_t *);
+int	sys_connect(struct proc *, void *, register_t *);
+int	compat_43_sys_accept(struct proc *, void *, register_t *);
+int	sys_getpriority(struct proc *, void *, register_t *);
+int	compat_43_sys_send(struct proc *, void *, register_t *);
+int	compat_43_sys_recv(struct proc *, void *, register_t *);
+int	sys_sigreturn(struct proc *, void *, register_t *);
+int	sys_bind(struct proc *, void *, register_t *);
+int	sys_setsockopt(struct proc *, void *, register_t *);
+int	sys_listen(struct proc *, void *, register_t *);
+int	sys_sigsuspend(struct proc *, void *, register_t *);
+int	compat_43_sys_sigstack(struct proc *, void *, register_t *);
+int	osf1_sys_gettimeofday(struct proc *, void *, register_t *);
+int	osf1_sys_getrusage(struct proc *, void *, register_t *);
+int	sys_getsockopt(struct proc *, void *, register_t *);
+int	osf1_sys_readv(struct proc *, void *, register_t *);
+int	osf1_sys_writev(struct proc *, void *, register_t *);
+int	osf1_sys_settimeofday(struct proc *, void *, register_t *);
+int	sys_fchown(struct proc *, void *, register_t *);
+int	sys_fchmod(struct proc *, void *, register_t *);
+int	compat_43_sys_recvfrom(struct proc *, void *, register_t *);
+int	sys_rename(struct proc *, void *, register_t *);
+int	osf1_sys_truncate(struct proc *, void *, register_t *);
+int	osf1_sys_ftruncate(struct proc *, void *, register_t *);
+int	osf1_sys_setgid(struct proc *, void *, register_t *);
+int	osf1_sys_sendto(struct proc *, void *, register_t *);
+int	sys_shutdown(struct proc *, void *, register_t *);
+int	osf1_sys_socketpair(struct proc *, void *, register_t *);
+int	sys_mkdir(struct proc *, void *, register_t *);
+int	sys_rmdir(struct proc *, void *, register_t *);
+int	osf1_sys_utimes(struct proc *, void *, register_t *);
+int	compat_43_sys_getpeername(struct proc *, void *, register_t *);
+int	compat_43_sys_gethostid(struct proc *, void *, register_t *);
+int	compat_43_sys_sethostid(struct proc *, void *, register_t *);
+int	osf1_sys_getrlimit(struct proc *, void *, register_t *);
+int	osf1_sys_setrlimit(struct proc *, void *, register_t *);
+int	sys_setsid(struct proc *, void *, register_t *);
+int	compat_43_sys_quota(struct proc *, void *, register_t *);
+int	compat_43_sys_getsockname(struct proc *, void *, register_t *);
+int	osf1_sys_sigaction(struct proc *, void *, register_t *);
+int	compat_43_sys_getdirentries(struct proc *, void *, register_t *);
+int	osf1_sys_statfs(struct proc *, void *, register_t *);
+int	osf1_sys_fstatfs(struct proc *, void *, register_t *);
+int	compat_09_sys_getdomainname(struct proc *, void *, register_t *);
+int	compat_09_sys_setdomainname(struct proc *, void *, register_t *);
+int	osf1_sys_uname(struct proc *, void *, register_t *);
+int	sys_lchown(struct proc *, void *, register_t *);
+int	osf1_sys_shmat(struct proc *, void *, register_t *);
+int	osf1_sys_shmctl(struct proc *, void *, register_t *);
+int	osf1_sys_shmdt(struct proc *, void *, register_t *);
+int	osf1_sys_shmget(struct proc *, void *, register_t *);
+int	sys_getsid(struct proc *, void *, register_t *);
+int	osf1_sys_sigaltstack(struct proc *, void *, register_t *);
+int	osf1_sys_sysinfo(struct proc *, void *, register_t *);
+int	osf1_sys_pathconf(struct proc *, void *, register_t *);
+int	osf1_sys_fpathconf(struct proc *, void *, register_t *);
+int	osf1_sys_usleep_thread(struct proc *, void *, register_t *);
+int	osf1_sys_setsysinfo(struct proc *, void *, register_t *);