Final __P removal plus some cosmetic fixups

6 files changed, 17 insertions, 17 deletions

diff --git a/sys/compat/common/compat_dir.h b/sys/compat/common/compat_dir.h
index d070d578138..1fb3baba9c9 100644
--- a/sys/compat/common/compat_dir.h
+++ b/sys/compat/common/compat_dir.h
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: compat_dir.h,v 1.1 2001/01/23 05:48:04 csapuntz Exp $	*/
+/* 	$OpenBSD: compat_dir.h,v 1.2 2002/03/14 03:16:02 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Constantine Sapuntzakis
@@ -27,7 +27,7 @@
 
 #ifdef _KERNEL
 
-int readdir_with_callback __P((struct file *, off_t *, u_long, 
-    int (*append_func) (void *, struct dirent *, off_t), void *));
+int readdir_with_callback(struct file *, off_t *, u_long, 
+    int (*append_func) (void *, struct dirent *, off_t), void *);
 
 #endif
diff --git a/sys/compat/ibcs2/ibcs2_misc.c b/sys/compat/ibcs2/ibcs2_misc.c
index 3b3137ba2c2..70462e15189 100644
--- a/sys/compat/ibcs2/ibcs2_misc.c
+++ b/sys/compat/ibcs2/ibcs2_misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ibcs2_misc.c,v 1.22 2002/03/14 01:26:50 millert Exp $	*/
+/*	$OpenBSD: ibcs2_misc.c,v 1.23 2002/03/14 03:16:03 millert Exp $	*/
 /*	$NetBSD: ibcs2_misc.c,v 1.23 1997/01/15 01:37:49 perry Exp $	*/
 
 /*
@@ -1145,7 +1145,7 @@ xenix_sys_rdchk(p, v, retval)
 	SCARG(&sa, data) = stackgap_alloc(&sg, sizeof(int));
 	if ((error = sys_ioctl(p, &sa, retval)) != 0)
 		return error;
-	*retval = (*((int*)SCARG(&sa, data))) ? 1 : 0;
+	*retval = (*((int *)SCARG(&sa, data))) ? 1 : 0;
 	return 0;
 }
 
diff --git a/sys/compat/ibcs2/syscalls.master b/sys/compat/ibcs2/syscalls.master
index 70ca3f47c9f..35b75efbe68 100644
--- a/sys/compat/ibcs2/syscalls.master
+++ b/sys/compat/ibcs2/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.7 1999/06/07 07:17:47 deraadt Exp $
+	$OpenBSD: syscalls.master,v 1.8 2002/03/14 03:16:03 millert Exp $
 ;	$NetBSD: syscalls.master,v 1.10 1996/09/07 14:21:59 mycroft Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
@@ -58,11 +58,11 @@
 11	STD		{ int ibcs2_sys_execv(char *path, char **argp); }
 12	STD		{ int ibcs2_sys_chdir(char *path); }
 13	STD		{ int ibcs2_sys_time(ibcs2_time_t *tp); }
-14	STD		{ int ibcs2_sys_mknod(char* path, int mode, int dev); }
+14	STD		{ int ibcs2_sys_mknod(char *path, int mode, int dev); }
 15	STD		{ int ibcs2_sys_chmod(char *path, int mode); }
 16	STD		{ int ibcs2_sys_chown(char *path, int uid, int gid); }
 17	NOARGS		{ int sys_obreak(caddr_t nsize); }
-18	STD		{ int ibcs2_sys_stat(char* path, \
+18	STD		{ int ibcs2_sys_stat(char *path, \
 			    struct ibcs2_stat *st); }
 19	NOARGS		{ long compat_43_sys_lseek(int fd, long offset, \
 			    int whence); }
diff --git a/sys/compat/svr4/syscalls.master b/sys/compat/svr4/syscalls.master
index 4eb37afb183..f2eaa6f6fc3 100644
--- a/sys/compat/svr4/syscalls.master
+++ b/sys/compat/svr4/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.30 2000/08/23 19:31:35 fgsch Exp $
+	$OpenBSD: syscalls.master,v 1.31 2002/03/14 03:16:03 millert Exp $
 ;	$NetBSD: syscalls.master,v 1.17 1996/02/10 17:12:51 christos Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
@@ -60,11 +60,11 @@
 11	STD		{ int svr4_sys_execv(char *path, char **argp); }
 12	NOARGS		{ int sys_chdir(char *path); }
 13	STD		{ int svr4_sys_time(svr4_time_t *t); }
-14	STD		{ int svr4_sys_mknod(char* path, int mode, int dev); }
+14	STD		{ int svr4_sys_mknod(char *path, int mode, int dev); }
 15	NOARGS		{ int sys_chmod(char *path, int mode); }
 16	NOARGS		{ int sys_chown(char *path, int uid, int gid); }
 17	STD		{ int svr4_sys_break(caddr_t nsize); }
-18	STD		{ int svr4_sys_stat(char* path, struct svr4_stat* ub); }
+18	STD		{ int svr4_sys_stat(char *path, struct svr4_stat* ub); }
 19	NOARGS		{ long compat_43_sys_lseek(int fd, long offset, \
 			    int whence); }
 20	NOARGS		{ pid_t sys_getpid(void); }
diff --git a/sys/compat/ultrix/ultrix_fs.c b/sys/compat/ultrix/ultrix_fs.c
index 1c36b2910ef..a088fedf7f0 100644
--- a/sys/compat/ultrix/ultrix_fs.c
+++ b/sys/compat/ultrix/ultrix_fs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ultrix_fs.c,v 1.6 2001/11/06 19:53:18 miod Exp $	*/
+/*	$OpenBSD: ultrix_fs.c,v 1.7 2002/03/14 03:16:03 millert Exp $	*/
 /*	$NetBSD: ultrix_fs.c,v 1.4 1996/04/07 17:23:06 jonathan Exp $	*/
 
 /*
@@ -237,12 +237,12 @@ ultrix_sys_getmnt(p, v, retval)
 				    sizeof(*SCARG(uap, start))))  != 0)
 			goto bad;
 		for (skip = start, mp = mountlist.cqh_first;
-		    mp != (void*)&mountlist && skip-- > 0; mp = nmp)
+		    mp != (void *)&mountlist && skip-- > 0; mp = nmp)
 			nmp = mp->mnt_list.cqe_next;
 	}
 
 	for (count = 0, mp = mountlist.cqh_first;
-	    mp != (void*)&mountlist && count < maxcount; mp = nmp) {
+	    mp != (void *)&mountlist && count < maxcount; mp = nmp) {
 		nmp = mp->mnt_list.cqe_next;
 		if (sfsp != NULL && (mp->mnt_flag & MNT_MLOCK) == 0) {
 			struct ultrix_fs_data tem;
@@ -390,7 +390,7 @@ ultrix_sys_mount(p, v, retval)
 		 */
 		fsname[0] = 0;
 		if ((error = copyinstr((caddr_t)SCARG(&nuap, path), fsname,
-				      sizeof fsname, (u_int*)0)) != 0)
+				      sizeof fsname, (u_int *)0)) != 0)
 			return(error);
 		if (strcmp(fsname, "/") == 0) {
 			SCARG(&nuap, flags) |= MNT_UPDATE;
diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c
index 8baba7f1d91..7860af1e99e 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.24 2002/03/14 01:26:51 millert Exp $	*/
+/*	$OpenBSD: ultrix_misc.c,v 1.25 2002/03/14 03:16:03 millert Exp $	*/
 /*	$NetBSD: ultrix_misc.c,v 1.23 1996/04/07 17:23:04 jonathan Exp $	*/
 
 /*
@@ -279,7 +279,7 @@ ultrix_sys_select(p, v, retval)
 #endif
 
 	}
-	error = sys_select(p, (void*) uap, retval);
+	error = sys_select(p, (void *) uap, retval);
 	if (error == EINVAL)
 		printf("ultrix select: bad args?\n");