First round of __P removal in sys

2 files changed, 135 insertions, 135 deletions

diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c
index 8e46acd843f..8baba7f1d91 100644
--- a/sys/compat/ultrix/ultrix_misc.c
+++ b/sys/compat/ultrix/ultrix_misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ultrix_misc.c,v 1.23 2002/02/12 13:05:31 art Exp $	*/
+/*	$OpenBSD: ultrix_misc.c,v 1.24 2002/03/14 01:26:51 millert Exp $	*/
 /*	$NetBSD: ultrix_misc.c,v 1.23 1996/04/07 17:23:04 jonathan Exp $	*/
 
 /*
@@ -145,8 +145,8 @@ extern char *ultrix_syscallnames[];
 #endif /* __vax__ */
 
 
-extern void ULTRIX_EXEC_SETREGS __P((struct proc *, struct exec_package *,
-					u_long, register_t *));
+extern void ULTRIX_EXEC_SETREGS(struct proc *, struct exec_package *,
+					u_long, register_t *);
 extern char sigcode[], esigcode[];
 
 struct emul emul_ultrix = {
diff --git a/sys/compat/ultrix/ultrix_syscallargs.h b/sys/compat/ultrix/ultrix_syscallargs.h
index 4156963ca9f..b0caec22c4b 100644
--- a/sys/compat/ultrix/ultrix_syscallargs.h
+++ b/sys/compat/ultrix/ultrix_syscallargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ultrix_syscallargs.h,v 1.9 2001/08/26 04:14:27 deraadt Exp $	*/
+/*	$OpenBSD: ultrix_syscallargs.h,v 1.10 2002/03/14 01:26:51 millert Exp $	*/
 
 /*
  * System call argument lists.
@@ -193,140 +193,140 @@ struct ultrix_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	ultrix_sys_open	__P((struct proc *, void *, register_t *));
-int	sys_close	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_wait	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_creat	__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	ultrix_sys_execv	__P((struct proc *, void *, register_t *));
-int	sys_chdir	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_mknod	__P((struct proc *, void *, register_t *));
-int	sys_chmod	__P((struct proc *, void *, register_t *));
-int	sys_lchown	__P((struct proc *, void *, register_t *));
-int	sys_obreak	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_lseek	__P((struct proc *, void *, register_t *));
-int	sys_getpid	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_mount	__P((struct proc *, void *, register_t *));
-int	sys_setuid	__P((struct proc *, void *, register_t *));
-int	sys_getuid	__P((struct proc *, void *, register_t *));
-int	ultrix_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	ultrix_sys_stat	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_lstat	__P((struct proc *, void *, register_t *));
-int	sys_dup	__P((struct proc *, void *, register_t *));
-int	sys_opipe	__P((struct proc *, void *, register_t *));
-int	sys_profil	__P((struct proc *, void *, register_t *));
-int	sys_getgid	__P((struct proc *, void *, register_t *));
-int	sys_acct	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_ioctl	__P((struct proc *, void *, register_t *));
-int	sys_reboot	__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	ultrix_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	compat_43_sys_fstat	__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	sys_sbrk	__P((struct proc *, void *, register_t *));
-int	sys_sstk	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_mmap	__P((struct proc *, void *, register_t *));
-int	sys_ovadvise	__P((struct proc *, void *, register_t *));
-int	sys_munmap	__P((struct proc *, void *, register_t *));
-int	sys_mprotect	__P((struct proc *, void *, register_t *));
-int	sys_madvise	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_vhangup	__P((struct proc *, void *, register_t *));
-int	sys_mincore	__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_getpgrp	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_setpgrp	__P((struct proc *, void *, register_t *));
-int	sys_setitimer	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_wait3	__P((struct proc *, void *, register_t *));
-int	sys_swapon	__P((struct proc *, void *, register_t *));
-int	sys_getitimer	__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	sys_fcntl	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_select	__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	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	ultrix_sys_setsockopt	__P((struct proc *, void *, register_t *));
-int	sys_listen	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_sigvec	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_sigblock	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_sigsetmask	__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	compat_43_sys_recvmsg	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_sendmsg	__P((struct proc *, void *, register_t *));
-int	sys_gettimeofday	__P((struct proc *, void *, register_t *));
-int	sys_getrusage	__P((struct proc *, void *, register_t *));
-int	sys_getsockopt	__P((struct proc *, void *, register_t *));
-int	sys_readv	__P((struct proc *, void *, register_t *));
-int	sys_writev	__P((struct proc *, void *, register_t *));
-int	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	compat_43_sys_setreuid	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_setregid	__P((struct proc *, void *, register_t *));
-int	sys_rename	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_truncate	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_ftruncate	__P((struct proc *, void *, register_t *));
-int	sys_flock	__P((struct proc *, void *, register_t *));
-int	sys_sendto	__P((struct proc *, void *, register_t *));
-int	sys_shutdown	__P((struct proc *, void *, register_t *));
-int	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	sys_utimes	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_sigcleanup	__P((struct proc *, void *, register_t *));
-int	sys_adjtime	__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_getrlimit	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_setrlimit	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_killpg	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_getsockname	__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	ultrix_sys_open(struct proc *, void *, register_t *);
+int	sys_close(struct proc *, void *, register_t *);
+int	compat_43_sys_wait(struct proc *, void *, register_t *);
+int	ultrix_sys_creat(struct proc *, void *, register_t *);
+int	sys_link(struct proc *, void *, register_t *);
+int	sys_unlink(struct proc *, void *, register_t *);
+int	ultrix_sys_execv(struct proc *, void *, register_t *);
+int	sys_chdir(struct proc *, void *, register_t *);
+int	ultrix_sys_mknod(struct proc *, void *, register_t *);
+int	sys_chmod(struct proc *, void *, register_t *);
+int	sys_lchown(struct proc *, void *, register_t *);
+int	sys_obreak(struct proc *, void *, register_t *);
+int	compat_43_sys_lseek(struct proc *, void *, register_t *);
+int	sys_getpid(struct proc *, void *, register_t *);
+int	ultrix_sys_mount(struct proc *, void *, register_t *);
+int	sys_setuid(struct proc *, void *, register_t *);
+int	sys_getuid(struct proc *, void *, register_t *);
+int	ultrix_sys_access(struct proc *, void *, register_t *);
+int	sys_sync(struct proc *, void *, register_t *);
+int	sys_kill(struct proc *, void *, register_t *);
+int	ultrix_sys_stat(struct proc *, void *, register_t *);
+int	ultrix_sys_lstat(struct proc *, void *, register_t *);
+int	sys_dup(struct proc *, void *, register_t *);
+int	sys_opipe(struct proc *, void *, register_t *);
+int	sys_profil(struct proc *, void *, register_t *);
+int	sys_getgid(struct proc *, void *, register_t *);
+int	sys_acct(struct proc *, void *, register_t *);
+int	ultrix_sys_ioctl(struct proc *, void *, register_t *);
+int	sys_reboot(struct proc *, void *, register_t *);
+int	sys_symlink(struct proc *, void *, register_t *);
+int	sys_readlink(struct proc *, void *, register_t *);
+int	ultrix_sys_execve(struct proc *, void *, register_t *);
+int	sys_umask(struct proc *, void *, register_t *);
+int	sys_chroot(struct proc *, void *, register_t *);
+int	compat_43_sys_fstat(struct proc *, void *, register_t *);
+int	compat_43_sys_getpagesize(struct proc *, void *, register_t *);
+int	sys_vfork(struct proc *, void *, register_t *);
+int	sys_sbrk(struct proc *, void *, register_t *);
+int	sys_sstk(struct proc *, void *, register_t *);
+int	ultrix_sys_mmap(struct proc *, void *, register_t *);
+int	sys_ovadvise(struct proc *, void *, register_t *);
+int	sys_munmap(struct proc *, void *, register_t *);
+int	sys_mprotect(struct proc *, void *, register_t *);
+int	sys_madvise(struct proc *, void *, register_t *);
+int	ultrix_sys_vhangup(struct proc *, void *, register_t *);
+int	sys_mincore(struct proc *, void *, register_t *);
+int	sys_getgroups(struct proc *, void *, register_t *);
+int	sys_setgroups(struct proc *, void *, register_t *);
+int	sys_getpgrp(struct proc *, void *, register_t *);
+int	ultrix_sys_setpgrp(struct proc *, void *, register_t *);
+int	sys_setitimer(struct proc *, void *, register_t *);
+int	ultrix_sys_wait3(struct proc *, void *, register_t *);
+int	sys_swapon(struct proc *, void *, register_t *);
+int	sys_getitimer(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	sys_fcntl(struct proc *, void *, register_t *);
+int	ultrix_sys_select(struct proc *, void *, register_t *);
+int	sys_fsync(struct proc *, void *, register_t *);
+int	sys_setpriority(struct proc *, void *, register_t *);
+int	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	ultrix_sys_setsockopt(struct proc *, void *, register_t *);
+int	sys_listen(struct proc *, void *, register_t *);
+int	compat_43_sys_sigvec(struct proc *, void *, register_t *);
+int	compat_43_sys_sigblock(struct proc *, void *, register_t *);
+int	compat_43_sys_sigsetmask(struct proc *, void *, register_t *);
+int	sys_sigsuspend(struct proc *, void *, register_t *);
+int	compat_43_sys_sigstack(struct proc *, void *, register_t *);
+int	compat_43_sys_recvmsg(struct proc *, void *, register_t *);
+int	compat_43_sys_sendmsg(struct proc *, void *, register_t *);
+int	sys_gettimeofday(struct proc *, void *, register_t *);
+int	sys_getrusage(struct proc *, void *, register_t *);
+int	sys_getsockopt(struct proc *, void *, register_t *);
+int	sys_readv(struct proc *, void *, register_t *);
+int	sys_writev(struct proc *, void *, register_t *);
+int	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	compat_43_sys_setreuid(struct proc *, void *, register_t *);
+int	compat_43_sys_setregid(struct proc *, void *, register_t *);
+int	sys_rename(struct proc *, void *, register_t *);
+int	compat_43_sys_truncate(struct proc *, void *, register_t *);
+int	compat_43_sys_ftruncate(struct proc *, void *, register_t *);
+int	sys_flock(struct proc *, void *, register_t *);
+int	sys_sendto(struct proc *, void *, register_t *);
+int	sys_shutdown(struct proc *, void *, register_t *);
+int	sys_socketpair(struct proc *, void *, register_t *);
+int	sys_mkdir(struct proc *, void *, register_t *);
+int	sys_rmdir(struct proc *, void *, register_t *);
+int	sys_utimes(struct proc *, void *, register_t *);
+int	ultrix_sys_sigcleanup(struct proc *, void *, register_t *);
+int	sys_adjtime(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_getrlimit(struct proc *, void *, register_t *);
+int	compat_43_sys_setrlimit(struct proc *, void *, register_t *);
+int	compat_43_sys_killpg(struct proc *, void *, register_t *);
+int	compat_43_sys_getsockname(struct proc *, void *, register_t *);
 #ifdef NFSSERVER
-int	ultrix_sys_nfssvc	__P((struct proc *, void *, register_t *));
+int	ultrix_sys_nfssvc(struct proc *, void *, register_t *);
 #else
 #endif
-int	compat_43_sys_getdirentries	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_statfs	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_fstatfs	__P((struct proc *, void *, register_t *));
+int	compat_43_sys_getdirentries(struct proc *, void *, register_t *);
+int	ultrix_sys_statfs(struct proc *, void *, register_t *);
+int	ultrix_sys_fstatfs(struct proc *, void *, register_t *);
 #ifdef NFSCLIENT
-int	async_daemon	__P((struct proc *, void *, register_t *));
-int	sys_getfh	__P((struct proc *, void *, register_t *));
+int	async_daemon(struct proc *, void *, register_t *);
+int	sys_getfh(struct proc *, void *, register_t *);
 #else
 #endif
-int	compat_09_sys_getdomainname	__P((struct proc *, void *, register_t *));
-int	compat_09_sys_setdomainname	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_quotactl	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_exportfs	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_uname	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_ustat	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_getmnt	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_sigpending	__P((struct proc *, void *, register_t *));
-int	sys_setsid	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_waitpid	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_getsysinfo	__P((struct proc *, void *, register_t *));
-int	ultrix_sys_setsysinfo	__P((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	ultrix_sys_quotactl(struct proc *, void *, register_t *);
+int	ultrix_sys_exportfs(struct proc *, void *, register_t *);
+int	ultrix_sys_uname(struct proc *, void *, register_t *);
+int	ultrix_sys_ustat(struct proc *, void *, register_t *);
+int	ultrix_sys_getmnt(struct proc *, void *, register_t *);
+int	ultrix_sys_sigpending(struct proc *, void *, register_t *);
+int	sys_setsid(struct proc *, void *, register_t *);
+int	ultrix_sys_waitpid(struct proc *, void *, register_t *);
+int	ultrix_sys_getsysinfo(struct proc *, void *, register_t *);
+int	ultrix_sys_setsysinfo(struct proc *, void *, register_t *);