summaryrefslogtreecommitdiff
path: root/sys/compat/svr4
diff options
context:
space:
mode:
Diffstat (limited to 'sys/compat/svr4')
-rw-r--r--sys/compat/svr4/svr4_exec.c6
-rw-r--r--sys/compat/svr4/svr4_exec.h6
-rw-r--r--sys/compat/svr4/svr4_fcntl.c18
-rw-r--r--sys/compat/svr4/svr4_filio.c4
-rw-r--r--sys/compat/svr4/svr4_ioctl.c8
-rw-r--r--sys/compat/svr4/svr4_ioctl.h30
-rw-r--r--sys/compat/svr4/svr4_ipc.c56
-rw-r--r--sys/compat/svr4/svr4_jioctl.c4
-rw-r--r--sys/compat/svr4/svr4_misc.c28
-rw-r--r--sys/compat/svr4/svr4_net.c6
-rw-r--r--sys/compat/svr4/svr4_signal.c12
-rw-r--r--sys/compat/svr4/svr4_signal.h12
-rw-r--r--sys/compat/svr4/svr4_socket.h10
-rw-r--r--sys/compat/svr4/svr4_sockio.c6
-rw-r--r--sys/compat/svr4/svr4_stat.c12
-rw-r--r--sys/compat/svr4/svr4_stream.c88
-rw-r--r--sys/compat/svr4/svr4_stropts.h4
-rw-r--r--sys/compat/svr4/svr4_syscallargs.h294
-rw-r--r--sys/compat/svr4/svr4_termios.c26
-rw-r--r--sys/compat/svr4/svr4_ttold.c34
20 files changed, 332 insertions, 332 deletions
diff --git a/sys/compat/svr4/svr4_exec.c b/sys/compat/svr4/svr4_exec.c
index 33c77a100a6..fdfe8756bc1 100644
--- a/sys/compat/svr4/svr4_exec.c
+++ b/sys/compat/svr4/svr4_exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_exec.c,v 1.13 2001/11/06 19:53:18 miod Exp $ */
+/* $OpenBSD: svr4_exec.c,v 1.14 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_exec.c,v 1.16 1995/10/14 20:24:20 christos Exp $ */
/*
@@ -51,8 +51,8 @@
#include <compat/svr4/svr4_exec.h>
#include <compat/svr4/svr4_errno.h>
-static void *svr4_copyargs __P((struct exec_package *, struct ps_strings *,
- void *, void *));
+static void *svr4_copyargs(struct exec_package *, struct ps_strings *,
+ void *, void *);
const char svr4_emul_path[] = "/emul/svr4";
extern char svr4_sigcode[], svr4_esigcode[];
diff --git a/sys/compat/svr4/svr4_exec.h b/sys/compat/svr4/svr4_exec.h
index ac06679d3ed..84e0fb82a4c 100644
--- a/sys/compat/svr4/svr4_exec.h
+++ b/sys/compat/svr4/svr4_exec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_exec.h,v 1.5 2000/06/15 05:44:10 brad Exp $ */
+/* $OpenBSD: svr4_exec.h,v 1.6 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_exec.h,v 1.7 1995/07/02 06:16:06 christos Exp $ */
/*
@@ -62,7 +62,7 @@
# define SVR4_INTERP_ADDR 0
#endif
-int svr4_elf_probe __P((struct proc *, struct exec_package *, char *, u_long *,
- u_int8_t *));
+int svr4_elf_probe(struct proc *, struct exec_package *, char *, u_long *,
+ u_int8_t *);
#endif /* !_SVR4_EXEC_H_ */
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index c8badb3394a..02d10d8399a 100644
--- a/sys/compat/svr4/svr4_fcntl.c
+++ b/sys/compat/svr4/svr4_fcntl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_fcntl.c,v 1.21 2002/02/13 19:08:06 art Exp $ */
+/* $OpenBSD: svr4_fcntl.c,v 1.22 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_fcntl.c,v 1.14 1995/10/14 20:24:24 christos Exp $ */
/*
@@ -50,14 +50,14 @@
#include <compat/svr4/svr4_util.h>
#include <compat/svr4/svr4_fcntl.h>
-static u_long svr4_to_bsd_cmd __P((u_long));
-static int svr4_to_bsd_flags __P((int));
-static int bsd_to_svr4_flags __P((int));
-static void bsd_to_svr4_flock __P((struct flock *, struct svr4_flock *));
-static void svr4_to_bsd_flock __P((struct svr4_flock *, struct flock *));
-static void bsd_to_svr3_flock __P((struct flock *, struct svr4_flock_svr3 *));
-static void svr3_to_bsd_flock __P((struct svr4_flock_svr3 *, struct flock *));
-static int fd_truncate __P((struct proc *, int, struct flock *, register_t *));
+static u_long svr4_to_bsd_cmd(u_long);
+static int svr4_to_bsd_flags(int);
+static int bsd_to_svr4_flags(int);
+static void bsd_to_svr4_flock(struct flock *, struct svr4_flock *);
+static void svr4_to_bsd_flock(struct svr4_flock *, struct flock *);
+static void bsd_to_svr3_flock(struct flock *, struct svr4_flock_svr3 *);
+static void svr3_to_bsd_flock(struct svr4_flock_svr3 *, struct flock *);
+static int fd_truncate(struct proc *, int, struct flock *, register_t *);
static u_long
svr4_to_bsd_cmd(cmd)
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index 6f1d6faec68..127f3f6ad6c 100644
--- a/sys/compat/svr4/svr4_filio.c
+++ b/sys/compat/svr4/svr4_filio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_filio.c,v 1.4 1997/11/04 07:48:51 niklas Exp $ */
+/* $OpenBSD: svr4_filio.c,v 1.5 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_filio.c,v 1.5 1996/04/11 12:54:40 christos Exp $ */
/*
@@ -64,7 +64,7 @@ svr4_fil_ioctl(fp, p, retval, fd, cmd, data)
int error;
int num;
struct filedesc *fdp = p->p_fd;
- int (*ctl) __P((struct file *, u_long, caddr_t, struct proc *)) =
+ int (*ctl)(struct file *, u_long, caddr_t, struct proc *) =
fp->f_ops->fo_ioctl;
*retval = 0;
diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c
index 5586be3f055..5cf7e6e0716 100644
--- a/sys/compat/svr4/svr4_ioctl.c
+++ b/sys/compat/svr4/svr4_ioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_ioctl.c,v 1.10 2002/02/13 19:08:06 art Exp $ */
+/* $OpenBSD: svr4_ioctl.c,v 1.11 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_ioctl.c,v 1.16 1996/04/11 12:54:41 christos Exp $ */
/*
@@ -56,7 +56,7 @@
#include <compat/svr4/svr4_sockio.h>
#ifdef DEBUG_SVR4
-static void svr4_decode_cmd __P((u_long, char *, char *, int *, int *));
+static void svr4_decode_cmd(u_long, char *, char *, int *, int *);
/*
* Decode an ioctl command symbolically
*/
@@ -93,8 +93,8 @@ svr4_sys_ioctl(p, v, retval)
struct file *fp;
struct filedesc *fdp;
u_long cmd;
- int (*fun) __P((struct file *, struct proc *, register_t *,
- int, u_long, caddr_t));
+ int (*fun)(struct file *, struct proc *, register_t *,
+ int, u_long, caddr_t);
int error = 0;
#ifdef DEBUG_SVR4
char dir[4];
diff --git a/sys/compat/svr4/svr4_ioctl.h b/sys/compat/svr4/svr4_ioctl.h
index d35e96369ec..9b5b8d6f7d6 100644
--- a/sys/compat/svr4/svr4_ioctl.h
+++ b/sys/compat/svr4/svr4_ioctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_ioctl.h,v 1.4 1997/11/04 07:45:35 niklas Exp $ */
+/* $OpenBSD: svr4_ioctl.h,v 1.5 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_ioctl.h,v 1.5 1996/04/11 12:54:43 christos Exp $ */
/*
@@ -46,19 +46,19 @@
#define SVR4_IOW(g,n,t) SVR4_IOC(SVR4_IOC_IN, (g), (n), sizeof(t))
#define SVR4_IOWR(g,n,t) SVR4_IOC(SVR4_IOC_INOUT,(g), (n), sizeof(t))
-int svr4_stream_ti_ioctl __P((struct file *, struct proc *, register_t *,
- int, u_long, caddr_t));
-int svr4_stream_ioctl __P((struct file *, struct proc *, register_t *,
- int, u_long, caddr_t));
-int svr4_term_ioctl __P((struct file *, struct proc *, register_t *,
- int, u_long, caddr_t));
-int svr4_ttold_ioctl __P((struct file *, struct proc *, register_t *,
- int, u_long, caddr_t));
-int svr4_fil_ioctl __P((struct file *, struct proc *, register_t *,
- int, u_long, caddr_t));
-int svr4_sock_ioctl __P((struct file *, struct proc *, register_t *,
- int, u_long, caddr_t));
-int svr4_jerq_ioctl __P((struct file *, struct proc *, register_t *,
- int, u_long, caddr_t));
+int svr4_stream_ti_ioctl(struct file *, struct proc *, register_t *,
+ int, u_long, caddr_t);
+int svr4_stream_ioctl(struct file *, struct proc *, register_t *,
+ int, u_long, caddr_t);
+int svr4_term_ioctl(struct file *, struct proc *, register_t *,
+ int, u_long, caddr_t);
+int svr4_ttold_ioctl(struct file *, struct proc *, register_t *,
+ int, u_long, caddr_t);
+int svr4_fil_ioctl(struct file *, struct proc *, register_t *,
+ int, u_long, caddr_t);
+int svr4_sock_ioctl(struct file *, struct proc *, register_t *,
+ int, u_long, caddr_t);
+int svr4_jerq_ioctl(struct file *, struct proc *, register_t *,
+ int, u_long, caddr_t);
#endif /* !_SVR4_IOCTL_H_ */
diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c
index 130bca1dac8..3118a415873 100644
--- a/sys/compat/svr4/svr4_ipc.c
+++ b/sys/compat/svr4/svr4_ipc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_ipc.c,v 1.8 2001/11/02 00:27:05 millert Exp $ */
+/* $OpenBSD: svr4_ipc.c,v 1.9 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_ipc.c,v 1.3 1997/03/30 17:21:02 christos Exp $ */
/*
@@ -56,42 +56,42 @@
#include <compat/svr4/svr4_ipc.h>
#if defined(SYSVMSG) || defined(SYSVSHM) || defined(SYSVSEM)
-static void svr4_to_bsd_ipc_perm __P((const struct svr4_ipc_perm *,
- struct ipc_perm *));
-static void bsd_to_svr4_ipc_perm __P((const struct ipc_perm *,
- struct svr4_ipc_perm *));
+static void svr4_to_bsd_ipc_perm(const struct svr4_ipc_perm *,
+ struct ipc_perm *);
+static void bsd_to_svr4_ipc_perm(const struct ipc_perm *,
+ struct svr4_ipc_perm *);
#endif
#ifdef SYSVSEM
-static void bsd_to_svr4_semid_ds __P((const struct semid_ds *,
- struct svr4_semid_ds *));
-static void svr4_to_bsd_semid_ds __P((const struct svr4_semid_ds *,
- struct semid_ds *));
-static int svr4_semop __P((struct proc *, void *, register_t *));
-static int svr4_semget __P((struct proc *, void *, register_t *));
-static int svr4_semctl __P((struct proc *, void *, register_t *));
+static void bsd_to_svr4_semid_ds(const struct semid_ds *,
+ struct svr4_semid_ds *);
+static void svr4_to_bsd_semid_ds(const struct svr4_semid_ds *,
+ struct semid_ds *);
+static int svr4_semop(struct proc *, void *, register_t *);
+static int svr4_semget(struct proc *, void *, register_t *);
+static int svr4_semctl(struct proc *, void *, register_t *);
#endif
#ifdef SYSVMSG
-static void bsd_to_svr4_msqid_ds __P((const struct msqid_ds *,
- struct svr4_msqid_ds *));
-static void svr4_to_bsd_msqid_ds __P((const struct svr4_msqid_ds *,
- struct msqid_ds *));
-static int svr4_msgsnd __P((struct proc *, void *, register_t *));
-static int svr4_msgrcv __P((struct proc *, void *, register_t *));
-static int svr4_msgget __P((struct proc *, void *, register_t *));
-static int svr4_msgctl __P((struct proc *, void *, register_t *));
+static void bsd_to_svr4_msqid_ds(const struct msqid_ds *,
+ struct svr4_msqid_ds *);
+static void svr4_to_bsd_msqid_ds(const struct svr4_msqid_ds *,
+ struct msqid_ds *);
+static int svr4_msgsnd(struct proc *, void *, register_t *);
+static int svr4_msgrcv(struct proc *, void *, register_t *);
+static int svr4_msgget(struct proc *, void *, register_t *);
+static int svr4_msgctl(struct proc *, void *, register_t *);
#endif
#ifdef SYSVSHM
-static void bsd_to_svr4_shmid_ds __P((const struct shmid_ds *,
- struct svr4_shmid_ds *));
-static void svr4_to_bsd_shmid_ds __P((const struct svr4_shmid_ds *,
- struct shmid_ds *));
-static int svr4_shmat __P((struct proc *, void *, register_t *));
-static int svr4_shmdt __P((struct proc *, void *, register_t *));
-static int svr4_shmget __P((struct proc *, void *, register_t *));
-static int svr4_shmctl __P((struct proc *, void *, register_t *));
+static void bsd_to_svr4_shmid_ds(const struct shmid_ds *,
+ struct svr4_shmid_ds *);
+static void svr4_to_bsd_shmid_ds(const struct svr4_shmid_ds *,
+ struct shmid_ds *);
+static int svr4_shmat(struct proc *, void *, register_t *);
+static int svr4_shmdt(struct proc *, void *, register_t *);
+static int svr4_shmget(struct proc *, void *, register_t *);
+static int svr4_shmctl(struct proc *, void *, register_t *);
#endif
#if defined(SYSVMSG) || defined(SYSVSHM) || defined(SYSVSEM)
diff --git a/sys/compat/svr4/svr4_jioctl.c b/sys/compat/svr4/svr4_jioctl.c
index 7da26ab4f1f..23529e99737 100644
--- a/sys/compat/svr4/svr4_jioctl.c
+++ b/sys/compat/svr4/svr4_jioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_jioctl.c,v 1.1 1997/11/04 07:45:33 niklas Exp $ */
+/* $OpenBSD: svr4_jioctl.c,v 1.2 2002/03/14 01:26:51 millert Exp $ */
/*
* Copyright (c) 1997 Niklas Hallqvist
@@ -56,7 +56,7 @@ svr4_jerq_ioctl(fp, p, retval, fd, cmd, data)
struct svr4_jwinsize jws;
struct winsize ws;
int error;
- int (*ctl) __P((struct file *, u_long, caddr_t, struct proc *)) =
+ int (*ctl)(struct file *, u_long, caddr_t, struct proc *) =
fp->f_ops->fo_ioctl;
switch (cmd) {
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 462b8a8468a..bbe3f4264ea 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_misc.c,v 1.40 2002/02/12 22:13:22 deraadt Exp $ */
+/* $OpenBSD: svr4_misc.c,v 1.41 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_misc.c,v 1.42 1996/12/06 03:22:34 christos Exp $ */
/*
@@ -91,20 +91,20 @@
#include <uvm/uvm_extern.h>
-static __inline clock_t timeval_to_clock_t __P((struct timeval *));
-static int svr4_setinfo __P((struct proc *, int, svr4_siginfo_t *));
+static __inline clock_t timeval_to_clock_t(struct timeval *);
+static int svr4_setinfo(struct proc *, int, svr4_siginfo_t *);
struct svr4_hrtcntl_args;
-static int svr4_hrtcntl __P((struct proc *, struct svr4_hrtcntl_args *,
- register_t *));
-static void bsd_statfs_to_svr4_statvfs __P((const struct statfs *,
- struct svr4_statvfs *));
-static void bsd_statfs_to_svr4_statvfs64 __P((const struct statfs *,
- struct svr4_statvfs64 *));
-static struct proc *svr4_pfind __P((pid_t pid));
+static int svr4_hrtcntl(struct proc *, struct svr4_hrtcntl_args *,
+ register_t *);
+static void bsd_statfs_to_svr4_statvfs(const struct statfs *,
+ struct svr4_statvfs *);
+static void bsd_statfs_to_svr4_statvfs64(const struct statfs *,
+ struct svr4_statvfs64 *);
+static struct proc *svr4_pfind(pid_t pid);
-static int svr4_mknod __P((struct proc *, register_t *, char *,
- svr4_mode_t, svr4_dev_t));
+static int svr4_mknod(struct proc *, register_t *, char *,
+ svr4_mode_t, svr4_dev_t);
int
svr4_sys_wait(p, v, retval)
@@ -218,8 +218,8 @@ svr4_sys_time(p, v, retval)
* This is quite ugly, but what do you expect from compatibility code?
*/
-int svr4_readdir_callback __P((void *, struct dirent *, off_t));
-int svr4_readdir64_callback __P((void *, struct dirent *, off_t));
+int svr4_readdir_callback(void *, struct dirent *, off_t);
+int svr4_readdir64_callback(void *, struct dirent *, off_t);
struct svr4_readdir_callback_args {
caddr_t outp;
diff --git a/sys/compat/svr4/svr4_net.c b/sys/compat/svr4/svr4_net.c
index adf7b0071f8..a4caf5cfac2 100644
--- a/sys/compat/svr4/svr4_net.c
+++ b/sys/compat/svr4/svr4_net.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_net.c,v 1.14 2002/02/08 19:34:16 art Exp $ */
+/* $OpenBSD: svr4_net.c,v 1.15 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_net.c,v 1.12 1996/09/07 12:40:51 mycroft Exp $ */
/*
@@ -77,9 +77,9 @@ enum {
dev_unix_ord_stream = 40
};
-int svr4_netattach __P((int));
+int svr4_netattach(int);
-static int svr4_soo_close __P((struct file *fp, struct proc *p));
+static int svr4_soo_close(struct file *fp, struct proc *p);
static struct fileops svr4_netops = {
soo_read, soo_write, soo_ioctl, soo_select, soo_kqfilter,
diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c
index 285621567b6..c123e0243c8 100644
--- a/sys/compat/svr4/svr4_signal.c
+++ b/sys/compat/svr4/svr4_signal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_signal.c,v 1.9 1998/12/22 07:58:46 deraadt Exp $ */
+/* $OpenBSD: svr4_signal.c,v 1.10 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_signal.c,v 1.24 1996/12/06 03:21:53 christos Exp $ */
/*
@@ -58,11 +58,11 @@
#define svr4_sigismember(s, n) ((s)->bits[svr4_sigword(n)] & svr4_sigmask(n))
#define svr4_sigaddset(s, n) ((s)->bits[svr4_sigword(n)] |= svr4_sigmask(n))
-static __inline void svr4_sigfillset __P((svr4_sigset_t *));
-void svr4_to_bsd_sigaction __P((const struct svr4_sigaction *,
- struct sigaction *));
-void bsd_to_svr4_sigaction __P((const struct sigaction *,
- struct svr4_sigaction *));
+static __inline void svr4_sigfillset(svr4_sigset_t *);
+void svr4_to_bsd_sigaction(const struct svr4_sigaction *,
+ struct sigaction *);
+void bsd_to_svr4_sigaction(const struct sigaction *,
+ struct svr4_sigaction *);
static __inline void
svr4_sigfillset(s)
diff --git a/sys/compat/svr4/svr4_signal.h b/sys/compat/svr4/svr4_signal.h
index 39bf06132ea..411138ce897 100644
--- a/sys/compat/svr4/svr4_signal.h
+++ b/sys/compat/svr4/svr4_signal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_signal.h,v 1.4 1997/06/02 09:42:17 deraadt Exp $ */
+/* $OpenBSD: svr4_signal.h,v 1.5 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_signal.h,v 1.14 1995/10/14 20:24:41 christos Exp $ */
/*
@@ -77,7 +77,7 @@
#define SVR4_SIGIGNORE_MASK 0x0800
#define SVR4_SIGPAUSE_MASK 0x1000
-typedef void (*svr4_sig_t) __P((int, svr4_siginfo_t *, void *));
+typedef void (*svr4_sig_t)(int, svr4_siginfo_t *, void *);
#define SVR4_SIG_DFL (svr4_sig_t) 0
#define SVR4_SIG_ERR (svr4_sig_t) -1
#define SVR4_SIG_IGN (svr4_sig_t) 1
@@ -121,9 +121,9 @@ struct svr4_sigaltstack {
#define SVR4_SS_DISABLE 0x00000002
extern int bsd_to_svr4_sig[];
-void bsd_to_svr4_sigaltstack __P((const struct sigaltstack *, struct svr4_sigaltstack *));
-void bsd_to_svr4_sigset __P((const sigset_t *, svr4_sigset_t *));
-void svr4_to_bsd_sigaltstack __P((const struct svr4_sigaltstack *, struct sigaltstack *));
-void svr4_to_bsd_sigset __P((const svr4_sigset_t *, sigset_t *));
+void bsd_to_svr4_sigaltstack(const struct sigaltstack *, struct svr4_sigaltstack *);
+void bsd_to_svr4_sigset(const sigset_t *, svr4_sigset_t *);
+void svr4_to_bsd_sigaltstack(const struct svr4_sigaltstack *, struct sigaltstack *);
+void svr4_to_bsd_sigset(const svr4_sigset_t *, sigset_t *);
#endif /* !_SVR4_SIGNAL_H_ */
diff --git a/sys/compat/svr4/svr4_socket.h b/sys/compat/svr4/svr4_socket.h
index 381df85ad5c..1360ac172b4 100644
--- a/sys/compat/svr4/svr4_socket.h
+++ b/sys/compat/svr4/svr4_socket.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_socket.h,v 1.1 1996/04/21 22:18:25 deraadt Exp $ */
+/* $OpenBSD: svr4_socket.h,v 1.2 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_socket.h,v 1.1 1996/04/11 12:43:31 christos Exp $ */
/*
@@ -37,9 +37,9 @@ struct sockaddr_un;
struct proc;
struct file;
-struct sockaddr_un *svr4_find_socket __P((struct proc *, struct file *,
- dev_t, ino_t));
-void svr4_delete_socket __P((struct proc *, struct file *));
-int svr4_add_socket __P((struct proc *, const char *, struct stat *));
+struct sockaddr_un *svr4_find_socket(struct proc *, struct file *,
+ dev_t, ino_t);
+void svr4_delete_socket(struct proc *, struct file *);
+int svr4_add_socket(struct proc *, const char *, struct stat *);
#endif /* _SVR4_SOCKET_H_ */
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index 535238412c7..7da1c24b450 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_sockio.c,v 1.7 2000/08/29 02:22:13 brad Exp $ */
+/* $OpenBSD: svr4_sockio.c,v 1.8 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_sockio.c,v 1.10 1996/05/03 17:09:15 christos Exp $ */
/*
@@ -51,7 +51,7 @@
#include <compat/svr4/svr4_ioctl.h>
#include <compat/svr4/svr4_sockio.h>
-static int bsd_to_svr4_flags __P((int));
+static int bsd_to_svr4_flags(int);
#define bsd_to_svr4_flag(a) \
if (bf & __CONCAT(I,a)) sf |= __CONCAT(SVR4_I,a)
@@ -85,7 +85,7 @@ svr4_sock_ioctl(fp, p, retval, fd, cmd, data)
caddr_t data;
{
int error;
- int (*ctl) __P((struct file *, u_long, caddr_t, struct proc *)) =
+ int (*ctl)(struct file *, u_long, caddr_t, struct proc *) =
fp->f_ops->fo_ioctl;
*retval = 0;
diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c
index af41622d988..d9698f40084 100644
--- a/sys/compat/svr4/svr4_stat.c
+++ b/sys/compat/svr4/svr4_stat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_stat.c,v 1.20 2001/11/06 19:53:18 miod Exp $ */
+/* $OpenBSD: svr4_stat.c,v 1.21 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_stat.c,v 1.21 1996/04/22 01:16:07 christos Exp $ */
/*
@@ -68,10 +68,10 @@
# define SVR4_NO_OSTAT
#endif
-static void bsd_to_svr4_xstat __P((struct stat *, struct svr4_xstat *));
-static void bsd_to_svr4_stat64 __P((struct stat *, struct svr4_stat64 *));
-int svr4_ustat __P((struct proc *, void *, register_t *));
-static int svr4_to_bsd_pathconf __P((int));
+static void bsd_to_svr4_xstat(struct stat *, struct svr4_xstat *);
+static void bsd_to_svr4_stat64(struct stat *, struct svr4_stat64 *);
+int svr4_ustat(struct proc *, void *, register_t *);
+static int svr4_to_bsd_pathconf(int);
/*
* SVR4 uses named pipes as named sockets, so we tell programs
@@ -81,7 +81,7 @@ static int svr4_to_bsd_pathconf __P((int));
#ifndef SVR4_NO_OSTAT
-static void bsd_to_svr4_stat __P((struct stat *, struct svr4_stat *));
+static void bsd_to_svr4_stat(struct stat *, struct svr4_stat *);
static void
bsd_to_svr4_stat(st, st4)
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index 09828a6ffce..48dbf16797c 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_stream.c,v 1.16 2002/02/14 22:57:18 pvalchev Exp $ */
+/* $OpenBSD: svr4_stream.c,v 1.17 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_stream.c,v 1.19 1996/12/22 23:00:03 fvdl Exp $ */
/*
@@ -71,59 +71,59 @@
#include <compat/svr4/svr4_socket.h>
/* Utils */
-static int clean_pipe __P((struct proc *, const char *));
-static void getparm __P((struct file *, struct svr4_si_sockparms *));
+static int clean_pipe(struct proc *, const char *);
+static void getparm(struct file *, struct svr4_si_sockparms *);
/* Address Conversions */
-static void sockaddr_to_netaddr_in __P((struct svr4_strmcmd *,
- const struct sockaddr_in *));
-static void sockaddr_to_netaddr_un __P((struct svr4_strmcmd *,
- const struct sockaddr_un *));
-static void netaddr_to_sockaddr_in __P((struct sockaddr_in *,
- const struct svr4_strmcmd *));
-static void netaddr_to_sockaddr_un __P((struct sockaddr_un *,
- const struct svr4_strmcmd *));
+static void sockaddr_to_netaddr_in(struct svr4_strmcmd *,
+ const struct sockaddr_in *);
+static void sockaddr_to_netaddr_un(struct svr4_strmcmd *,
+ const struct sockaddr_un *);
+static void netaddr_to_sockaddr_in(struct sockaddr_in *,
+ const struct svr4_strmcmd *);
+static void netaddr_to_sockaddr_un(struct sockaddr_un *,
+ const struct svr4_strmcmd *);
/* stream ioctls */
-static int i_nread __P((struct file *, struct proc *, register_t *, int,
- u_long, caddr_t));
-static int i_fdinsert __P((struct file *, struct proc *, register_t *, int,
- u_long, caddr_t));
-static int i_str __P((struct file *, struct proc *, register_t *, int,
- u_long, caddr_t));
-static int _i_bind_rsvd __P((struct file *, struct proc *, register_t *, int,
- u_long, caddr_t));
-static int _i_rele_rsvd __P((struct file *, struct proc *, register_t *, int,
- u_long, caddr_t));
+static int i_nread(struct file *, struct proc *, register_t *, int,
+ u_long, caddr_t);
+static int i_fdinsert(struct file *, struct proc *, register_t *, int,
+ u_long, caddr_t);
+static int i_str(struct file *, struct proc *, register_t *, int,
+ u_long, caddr_t);
+static int _i_bind_rsvd(struct file *, struct proc *, register_t *, int,
+ u_long, caddr_t);
+static int _i_rele_rsvd(struct file *, struct proc *, register_t *, int,
+ u_long, caddr_t);
/* i_str sockmod calls */
-static int sockmod __P((struct file *, int, struct svr4_strioctl *,
- struct proc *));
-static int si_listen __P((struct file *, int, struct svr4_strioctl *,
- struct proc *));
-static int si_ogetudata __P((struct file *, int, struct svr4_strioctl *,
- struct proc *));
-static int si_sockparams __P((struct file *, int, struct svr4_strioctl *,
- struct proc *));
-static int si_shutdown __P((struct file *, int, struct svr4_strioctl *,
- struct proc *));
-static int si_getudata __P((struct file *, int, struct svr4_strioctl *,
- struct proc *));
+static int sockmod(struct file *, int, struct svr4_strioctl *,
+ struct proc *);
+static int si_listen(struct file *, int, struct svr4_strioctl *,
+ struct proc *);
+static int si_ogetudata(struct file *, int, struct svr4_strioctl *,
+ struct proc *);
+static int si_sockparams(struct file *, int, struct svr4_strioctl *,
+ struct proc *);
+static int si_shutdown(struct file *, int, struct svr4_strioctl *,
+ struct proc *);
+static int si_getudata(struct file *, int, struct svr4_strioctl *,
+ struct proc *);
/* i_str timod calls */
-static int timod __P((struct file *, int, struct svr4_strioctl *,
- struct proc *));
-static int ti_getinfo __P((struct file *, int, struct svr4_strioctl *,
- struct proc *));
-static int ti_bind __P((struct file *, int, struct svr4_strioctl *,
- struct proc *));
+static int timod(struct file *, int, struct svr4_strioctl *,
+ struct proc *);
+static int ti_getinfo(struct file *, int, struct svr4_strioctl *,
+ struct proc *);
+static int ti_bind(struct file *, int, struct svr4_strioctl *,
+ struct proc *);
#ifdef DEBUG_SVR4
-static void bufprint __P((u_char *, size_t));
-static int show_ioc __P((const char *, struct svr4_strioctl *));
-static int show_strbuf __P((struct svr4_strbuf *));
-static void show_msg __P((const char *, int, struct svr4_strbuf *,
- struct svr4_strbuf *, int));
+static void bufprint(u_char *, size_t);
+static int show_ioc(const char *, struct svr4_strioctl *);
+static int show_strbuf(struct svr4_strbuf *);
+static void show_msg(const char *, int, struct svr4_strbuf *,
+ struct svr4_strbuf *, int);
static void
bufprint(buf, len)
diff --git a/sys/compat/svr4/svr4_stropts.h b/sys/compat/svr4/svr4_stropts.h
index bd217824041..929bb20e8d8 100644
--- a/sys/compat/svr4/svr4_stropts.h
+++ b/sys/compat/svr4/svr4_stropts.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_stropts.h,v 1.4 1997/02/13 19:45:25 niklas Exp $ */
+/* $OpenBSD: svr4_stropts.h,v 1.5 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_stropts.h,v 1.9 1996/10/28 08:46:38 fvdl Exp $ */
/*
@@ -147,6 +147,6 @@ struct svr4_netaddr_un {
#define SVR4_ADDROF(sc) (void *) (((char *) (sc)) + (sc)->offs)
#define SVR4_C_ADDROF(sc) (const void *) (((const char *) (sc)) + (sc)->offs)
-struct svr4_strm *svr4_stream_get __P((struct file *fp));
+struct svr4_strm *svr4_stream_get(struct file *fp);
#endif /* !_SVR4_STROPTS */
diff --git a/sys/compat/svr4/svr4_syscallargs.h b/sys/compat/svr4/svr4_syscallargs.h
index 2e99a8db671..57668125cd7 100644
--- a/sys/compat/svr4/svr4_syscallargs.h
+++ b/sys/compat/svr4/svr4_syscallargs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_syscallargs.h,v 1.32 2001/08/26 04:14:27 deraadt Exp $ */
+/* $OpenBSD: svr4_syscallargs.h,v 1.33 2002/03/14 01:26:51 millert Exp $ */
/*
* System call argument lists.
@@ -453,161 +453,161 @@ struct svr4_sys_socket_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 svr4_sys_open __P((struct proc *, void *, register_t *));
-int sys_close __P((struct proc *, void *, register_t *));
-int svr4_sys_wait __P((struct proc *, void *, register_t *));
-int svr4_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 svr4_sys_execv __P((struct proc *, void *, register_t *));
-int sys_chdir __P((struct proc *, void *, register_t *));
-int svr4_sys_time __P((struct proc *, void *, register_t *));
-int svr4_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 svr4_sys_break __P((struct proc *, void *, register_t *));
-int svr4_sys_stat __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 sys_setuid __P((struct proc *, void *, register_t *));
-int sys_getuid __P((struct proc *, void *, register_t *));
-int svr4_sys_alarm __P((struct proc *, void *, register_t *));
-int svr4_sys_fstat __P((struct proc *, void *, register_t *));
-int svr4_sys_pause __P((struct proc *, void *, register_t *));
-int svr4_sys_utime __P((struct proc *, void *, register_t *));
-int svr4_sys_access __P((struct proc *, void *, register_t *));
-int svr4_sys_nice __P((struct proc *, void *, register_t *));
-int sys_sync __P((struct proc *, void *, register_t *));
-int svr4_sys_kill __P((struct proc *, void *, register_t *));
-int svr4_sys_pgrpsys __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 svr4_sys_times __P((struct proc *, void *, register_t *));
-int sys_setgid __P((struct proc *, void *, register_t *));
-int sys_getgid __P((struct proc *, void *, register_t *));
-int svr4_sys_signal __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 svr4_sys_open(struct proc *, void *, register_t *);
+int sys_close(struct proc *, void *, register_t *);
+int svr4_sys_wait(struct proc *, void *, register_t *);
+int svr4_sys_creat(struct proc *, void *, register_t *);
+int sys_link(struct proc *, void *, register_t *);
+int sys_unlink(struct proc *, void *, register_t *);
+int svr4_sys_execv(struct proc *, void *, register_t *);
+int sys_chdir(struct proc *, void *, register_t *);
+int svr4_sys_time(struct proc *, void *, register_t *);
+int svr4_sys_mknod(struct proc *, void *, register_t *);
+int sys_chmod(struct proc *, void *, register_t *);
+int sys_chown(struct proc *, void *, register_t *);
+int svr4_sys_break(struct proc *, void *, register_t *);
+int svr4_sys_stat(struct proc *, void *, register_t *);
+int compat_43_sys_lseek(struct proc *, void *, register_t *);
+int sys_getpid(struct proc *, void *, register_t *);
+int sys_setuid(struct proc *, void *, register_t *);
+int sys_getuid(struct proc *, void *, register_t *);
+int svr4_sys_alarm(struct proc *, void *, register_t *);
+int svr4_sys_fstat(struct proc *, void *, register_t *);
+int svr4_sys_pause(struct proc *, void *, register_t *);
+int svr4_sys_utime(struct proc *, void *, register_t *);
+int svr4_sys_access(struct proc *, void *, register_t *);
+int svr4_sys_nice(struct proc *, void *, register_t *);
+int sys_sync(struct proc *, void *, register_t *);
+int svr4_sys_kill(struct proc *, void *, register_t *);
+int svr4_sys_pgrpsys(struct proc *, void *, register_t *);
+int sys_dup(struct proc *, void *, register_t *);
+int sys_opipe(struct proc *, void *, register_t *);
+int svr4_sys_times(struct proc *, void *, register_t *);
+int sys_setgid(struct proc *, void *, register_t *);
+int sys_getgid(struct proc *, void *, register_t *);
+int svr4_sys_signal(struct proc *, void *, register_t *);
#ifdef SYSVMSG
-int svr4_sys_msgsys __P((struct proc *, void *, register_t *));
+int svr4_sys_msgsys(struct proc *, void *, register_t *);
#else
#endif
-int svr4_sys_sysarch __P((struct proc *, void *, register_t *));
+int svr4_sys_sysarch(struct proc *, void *, register_t *);
#ifdef SYSVSHM
-int svr4_sys_shmsys __P((struct proc *, void *, register_t *));
+int svr4_sys_shmsys(struct proc *, void *, register_t *);
#else
#endif
#ifdef SYSVSEM
-int svr4_sys_semsys __P((struct proc *, void *, register_t *));
+int svr4_sys_semsys(struct proc *, void *, register_t *);
#else
#endif
-int svr4_sys_ioctl __P((struct proc *, void *, register_t *));
-int svr4_sys_utssys __P((struct proc *, void *, register_t *));
-int sys_fsync __P((struct proc *, void *, register_t *));
-int svr4_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 svr4_sys_fcntl __P((struct proc *, void *, register_t *));
-int svr4_sys_ulimit __P((struct proc *, void *, register_t *));
-int svr4_sys_rdebug __P((struct proc *, void *, register_t *));
-int sys_rmdir __P((struct proc *, void *, register_t *));
-int sys_mkdir __P((struct proc *, void *, register_t *));
-int svr4_sys_getdents __P((struct proc *, void *, register_t *));
-int svr4_sys_getmsg __P((struct proc *, void *, register_t *));
-int svr4_sys_putmsg __P((struct proc *, void *, register_t *));
-int sys_poll __P((struct proc *, void *, register_t *));
-int svr4_sys_lstat __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 sys_getgroups __P((struct proc *, void *, register_t *));
-int sys_setgroups __P((struct proc *, void *, register_t *));
-int sys_fchmod __P((struct proc *, void *, register_t *));
-int sys_fchown __P((struct proc *, void *, register_t *));
-int svr4_sys_sigprocmask __P((struct proc *, void *, register_t *));
-int svr4_sys_sigsuspend __P((struct proc *, void *, register_t *));
-int svr4_sys_sigaltstack __P((struct proc *, void *, register_t *));
-int svr4_sys_sigaction __P((struct proc *, void *, register_t *));
-int svr4_sys_sigpending __P((struct proc *, void *, register_t *));
-int svr4_sys_context __P((struct proc *, void *, register_t *));
-int svr4_sys_statvfs __P((struct proc *, void *, register_t *));
-int svr4_sys_fstatvfs __P((struct proc *, void *, register_t *));
-int svr4_sys_waitsys __P((struct proc *, void *, register_t *));
-int svr4_sys_hrtsys __P((struct proc *, void *, register_t *));
-int svr4_sys_pathconf __P((struct proc *, void *, register_t *));
-int sys_mincore __P((struct proc *, void *, register_t *));
-int svr4_sys_mmap __P((struct proc *, void *, register_t *));
-int sys_mprotect __P((struct proc *, void *, register_t *));
-int sys_munmap __P((struct proc *, void *, register_t *));
-int svr4_sys_fpathconf __P((struct proc *, void *, register_t *));
-int sys_vfork __P((struct proc *, void *, register_t *));
-int sys_fchdir __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 svr4_sys_xstat __P((struct proc *, void *, register_t *));
-int svr4_sys_lxstat __P((struct proc *, void *, register_t *));
-int svr4_sys_fxstat __P((struct proc *, void *, register_t *));
-int svr4_sys_xmknod __P((struct proc *, void *, register_t *));
-int svr4_sys_setrlimit __P((struct proc *, void *, register_t *));
-int svr4_sys_getrlimit __P((struct proc *, void *, register_t *));
-int sys_lchown __P((struct proc *, void *, register_t *));
-int svr4_sys_memcntl __P((struct proc *, void *, register_t *));
-int sys_rename __P((struct proc *, void *, register_t *));
-int svr4_sys_uname __P((struct proc *, void *, register_t *));
-int svr4_sys_setegid __P((struct proc *, void *, register_t *));
-int svr4_sys_sysconfig __P((struct proc *, void *, register_t *));
-int sys_adjtime __P((struct proc *, void *, register_t *));
-int svr4_sys_systeminfo __P((struct proc *, void *, register_t *));
-int sys_seteuid __P((struct proc *, void *, register_t *));
-int svr4_sys_fchroot __P((struct proc *, void *, register_t *));
-int svr4_sys_utimes __P((struct proc *, void *, register_t *));
-int svr4_sys_vhangup __P((struct proc *, void *, register_t *));
-int svr4_sys_gettimeofday __P((struct proc *, void *, register_t *));
-int sys_getitimer __P((struct proc *, void *, register_t *));
-int sys_setitimer __P((struct proc *, void *, register_t *));
-int svr4_sys_pread __P((struct proc *, void *, register_t *));
-int svr4_sys_pwrite __P((struct proc *, void *, register_t *));
-int svr4_sys_llseek __P((struct proc *, void *, register_t *));
-int svr4_sys_acl __P((struct proc *, void *, register_t *));
-int svr4_sys_auditsys __P((struct proc *, void *, register_t *));
-int sys_clock_gettime __P((struct proc *, void *, register_t *));
-int sys_clock_settime __P((struct proc *, void *, register_t *));
-int sys_clock_getres __P((struct proc *, void *, register_t *));
-int sys_nanosleep __P((struct proc *, void *, register_t *));
-int svr4_sys_facl __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 svr4_sys_getdents64 __P((struct proc *, void *, register_t *));
-int svr4_sys_mmap64 __P((struct proc *, void *, register_t *));
-int svr4_sys_stat64 __P((struct proc *, void *, register_t *));
-int svr4_sys_lstat64 __P((struct proc *, void *, register_t *));
-int svr4_sys_fstat64 __P((struct proc *, void *, register_t *));
-int svr4_sys_fstatvfs64 __P((struct proc *, void *, register_t *));
-int svr4_sys_pread64 __P((struct proc *, void *, register_t *));
-int svr4_sys_pwrite64 __P((struct proc *, void *, register_t *));
-int svr4_sys_creat64 __P((struct proc *, void *, register_t *));
-int svr4_sys_open64 __P((struct proc *, void *, register_t *));
-int svr4_sys_socket __P((struct proc *, void *, register_t *));
-int sys_socketpair __P((struct proc *, void *, register_t *));
-int sys_bind __P((struct proc *, void *, register_t *));
-int sys_listen __P((struct proc *, void *, register_t *));
-int compat_43_sys_accept __P((struct proc *, void *, register_t *));
-int sys_connect __P((struct proc *, void *, register_t *));
-int sys_shutdown __P((struct proc *, void *, register_t *));
-int compat_43_sys_recv __P((struct proc *, void *, register_t *));
-int compat_43_sys_recvfrom __P((struct proc *, void *, register_t *));
-int compat_43_sys_recvmsg __P((struct proc *, void *, register_t *));
-int compat_43_sys_send __P((struct proc *, void *, register_t *));
-int compat_43_sys_sendmsg __P((struct proc *, void *, register_t *));
-int sys_sendto __P((struct proc *, void *, register_t *));
-int compat_43_sys_getpeername __P((struct proc *, void *, register_t *));
-int compat_43_sys_getsockname __P((struct proc *, void *, register_t *));
-int sys_getsockopt __P((struct proc *, void *, register_t *));
-int sys_setsockopt __P((struct proc *, void *, register_t *));
+int svr4_sys_ioctl(struct proc *, void *, register_t *);
+int svr4_sys_utssys(struct proc *, void *, register_t *);
+int sys_fsync(struct proc *, void *, register_t *);
+int svr4_sys_execve(struct proc *, void *, register_t *);
+int sys_umask(struct proc *, void *, register_t *);
+int sys_chroot(struct proc *, void *, register_t *);
+int svr4_sys_fcntl(struct proc *, void *, register_t *);
+int svr4_sys_ulimit(struct proc *, void *, register_t *);
+int svr4_sys_rdebug(struct proc *, void *, register_t *);
+int sys_rmdir(struct proc *, void *, register_t *);
+int sys_mkdir(struct proc *, void *, register_t *);
+int svr4_sys_getdents(struct proc *, void *, register_t *);
+int svr4_sys_getmsg(struct proc *, void *, register_t *);
+int svr4_sys_putmsg(struct proc *, void *, register_t *);
+int sys_poll(struct proc *, void *, register_t *);
+int svr4_sys_lstat(struct proc *, void *, register_t *);
+int sys_symlink(struct proc *, void *, register_t *);
+int sys_readlink(struct proc *, void *, register_t *);
+int sys_getgroups(struct proc *, void *, register_t *);
+int sys_setgroups(struct proc *, void *, register_t *);
+int sys_fchmod(struct proc *, void *, register_t *);
+int sys_fchown(struct proc *, void *, register_t *);
+int svr4_sys_sigprocmask(struct proc *, void *, register_t *);
+int svr4_sys_sigsuspend(struct proc *, void *, register_t *);
+int svr4_sys_sigaltstack(struct proc *, void *, register_t *);
+int svr4_sys_sigaction(struct proc *, void *, register_t *);
+int svr4_sys_sigpending(struct proc *, void *, register_t *);
+int svr4_sys_context(struct proc *, void *, register_t *);
+int svr4_sys_statvfs(struct proc *, void *, register_t *);
+int svr4_sys_fstatvfs(struct proc *, void *, register_t *);
+int svr4_sys_waitsys(struct proc *, void *, register_t *);
+int svr4_sys_hrtsys(struct proc *, void *, register_t *);
+int svr4_sys_pathconf(struct proc *, void *, register_t *);
+int sys_mincore(struct proc *, void *, register_t *);
+int svr4_sys_mmap(struct proc *, void *, register_t *);
+int sys_mprotect(struct proc *, void *, register_t *);
+int sys_munmap(struct proc *, void *, register_t *);
+int svr4_sys_fpathconf(struct proc *, void *, register_t *);
+int sys_vfork(struct proc *, void *, register_t *);
+int sys_fchdir(struct proc *, void *, register_t *);
+int sys_readv(struct proc *, void *, register_t *);
+int sys_writev(struct proc *, void *, register_t *);
+int svr4_sys_xstat(struct proc *, void *, register_t *);
+int svr4_sys_lxstat(struct proc *, void *, register_t *);
+int svr4_sys_fxstat(struct proc *, void *, register_t *);
+int svr4_sys_xmknod(struct proc *, void *, register_t *);
+int svr4_sys_setrlimit(struct proc *, void *, register_t *);
+int svr4_sys_getrlimit(struct proc *, void *, register_t *);
+int sys_lchown(struct proc *, void *, register_t *);
+int svr4_sys_memcntl(struct proc *, void *, register_t *);
+int sys_rename(struct proc *, void *, register_t *);
+int svr4_sys_uname(struct proc *, void *, register_t *);
+int svr4_sys_setegid(struct proc *, void *, register_t *);
+int svr4_sys_sysconfig(struct proc *, void *, register_t *);
+int sys_adjtime(struct proc *, void *, register_t *);
+int svr4_sys_systeminfo(struct proc *, void *, register_t *);
+int sys_seteuid(struct proc *, void *, register_t *);
+int svr4_sys_fchroot(struct proc *, void *, register_t *);
+int svr4_sys_utimes(struct proc *, void *, register_t *);
+int svr4_sys_vhangup(struct proc *, void *, register_t *);
+int svr4_sys_gettimeofday(struct proc *, void *, register_t *);
+int sys_getitimer(struct proc *, void *, register_t *);
+int sys_setitimer(struct proc *, void *, register_t *);
+int svr4_sys_pread(struct proc *, void *, register_t *);
+int svr4_sys_pwrite(struct proc *, void *, register_t *);
+int svr4_sys_llseek(struct proc *, void *, register_t *);
+int svr4_sys_acl(struct proc *, void *, register_t *);
+int svr4_sys_auditsys(struct proc *, void *, register_t *);
+int sys_clock_gettime(struct proc *, void *, register_t *);
+int sys_clock_settime(struct proc *, void *, register_t *);
+int sys_clock_getres(struct proc *, void *, register_t *);
+int sys_nanosleep(struct proc *, void *, register_t *);
+int svr4_sys_facl(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 svr4_sys_getdents64(struct proc *, void *, register_t *);
+int svr4_sys_mmap64(struct proc *, void *, register_t *);
+int svr4_sys_stat64(struct proc *, void *, register_t *);
+int svr4_sys_lstat64(struct proc *, void *, register_t *);
+int svr4_sys_fstat64(struct proc *, void *, register_t *);
+int svr4_sys_fstatvfs64(struct proc *, void *, register_t *);
+int svr4_sys_pread64(struct proc *, void *, register_t *);
+int svr4_sys_pwrite64(struct proc *, void *, register_t *);
+int svr4_sys_creat64(struct proc *, void *, register_t *);
+int svr4_sys_open64(struct proc *, void *, register_t *);
+int svr4_sys_socket(struct proc *, void *, register_t *);
+int sys_socketpair(struct proc *, void *, register_t *);
+int sys_bind(struct proc *, void *, register_t *);
+int sys_listen(struct proc *, void *, register_t *);
+int compat_43_sys_accept(struct proc *, void *, register_t *);
+int sys_connect(struct proc *, void *, register_t *);
+int sys_shutdown(struct proc *, void *, register_t *);
+int compat_43_sys_recv(struct proc *, void *, register_t *);
+int compat_43_sys_recvfrom(struct proc *, void *, register_t *);
+int compat_43_sys_recvmsg(struct proc *, void *, register_t *);
+int compat_43_sys_send(struct proc *, void *, register_t *);
+int compat_43_sys_sendmsg(struct proc *, void *, register_t *);
+int sys_sendto(struct proc *, void *, register_t *);
+int compat_43_sys_getpeername(struct proc *, void *, register_t *);
+int compat_43_sys_getsockname(struct proc *, void *, register_t *);
+int sys_getsockopt(struct proc *, void *, register_t *);
+int sys_setsockopt(struct proc *, void *, register_t *);
#ifdef NTP
-int sys_ntp_gettime __P((struct proc *, void *, register_t *));
-int sys_ntp_adjtime __P((struct proc *, void *, register_t *));
+int sys_ntp_gettime(struct proc *, void *, register_t *);
+int sys_ntp_adjtime(struct proc *, void *, register_t *);
#else
#endif
diff --git a/sys/compat/svr4/svr4_termios.c b/sys/compat/svr4/svr4_termios.c
index fcdb1d613e6..f31a61826bb 100644
--- a/sys/compat/svr4/svr4_termios.c
+++ b/sys/compat/svr4/svr4_termios.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_termios.c,v 1.11 2000/08/29 02:22:13 brad Exp $ */
+/* $OpenBSD: svr4_termios.c,v 1.12 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_termios.c,v 1.9 1996/04/11 12:53:48 christos Exp $ */
/*
@@ -61,18 +61,18 @@
# endif
#endif
-u_long bsd_to_svr4_speed __P((u_long, u_long));
-u_long svr4_to_bsd_speed __P((u_long, u_long));
-void svr4_to_bsd_termios __P((const struct svr4_termios *, struct termios *,
- int));
-void bsd_to_svr4_termios __P((const struct termios *, struct svr4_termios *));
-void svr4_termio_to_termios __P((const struct svr4_termio *,
- struct svr4_termios *));
-void svr4_termios_to_termio __P((const struct svr4_termios *,
- struct svr4_termio *));
+u_long bsd_to_svr4_speed(u_long, u_long);
+u_long svr4_to_bsd_speed(u_long, u_long);
+void svr4_to_bsd_termios(const struct svr4_termios *, struct termios *,
+ int);
+void bsd_to_svr4_termios(const struct termios *, struct svr4_termios *);
+void svr4_termio_to_termios(const struct svr4_termio *,
+ struct svr4_termios *);
+void svr4_termios_to_termio(const struct svr4_termios *,
+ struct svr4_termio *);
#ifdef DEBUG_SVR4
-void print_svr4_termios __P((const struct svr4_termios *));
-void print_bsd_termios __P((const struct termios *));
+void print_svr4_termios(const struct svr4_termios *);
+void print_bsd_termios(const struct termios *);
#endif /* DEBUG_SVR4 */
#define undefined_char(a,b) /**/
@@ -528,7 +528,7 @@ svr4_term_ioctl(fp, p, retval, fd, cmd, data)
struct svr4_termios st;
struct svr4_termio t;
int error, new;
- int (*ctl) __P((struct file *, u_long, caddr_t, struct proc *)) =
+ int (*ctl)(struct file *, u_long, caddr_t, struct proc *) =
fp->f_ops->fo_ioctl;
*retval = 0;
diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c
index 5f7fd8f4200..928771f0325 100644
--- a/sys/compat/svr4/svr4_ttold.c
+++ b/sys/compat/svr4/svr4_ttold.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_ttold.c,v 1.6 2000/08/29 02:22:14 brad Exp $ */
+/* $OpenBSD: svr4_ttold.c,v 1.7 2002/03/14 01:26:51 millert Exp $ */
/* $NetBSD: svr4_ttold.c,v 1.9 1996/04/11 12:54:45 christos Exp $ */
/*
@@ -51,23 +51,23 @@
#include <compat/svr4/svr4_ttold.h>
#include <compat/svr4/svr4_ioctl.h>
-static void svr4_tchars_to_bsd_tchars __P((const struct svr4_tchars *st,
- struct tchars *bt));
-static void bsd_tchars_to_svr4_tchars __P((const struct tchars *bt,
- struct svr4_tchars *st));
-static void svr4_sgttyb_to_bsd_sgttyb __P((const struct svr4_sgttyb *ss,
- struct sgttyb *bs));
-static void bsd_sgttyb_to_svr4_sgttyb __P((const struct sgttyb *bs,
- struct svr4_sgttyb *ss));
-static void svr4_ltchars_to_bsd_ltchars __P((const struct svr4_ltchars *sl,
- struct ltchars *bl));
-static void bsd_ltchars_to_svr4_ltchars __P((const struct ltchars *bl,
- struct svr4_ltchars *sl));
+static void svr4_tchars_to_bsd_tchars(const struct svr4_tchars *st,
+ struct tchars *bt);
+static void bsd_tchars_to_svr4_tchars(const struct tchars *bt,
+ struct svr4_tchars *st);
+static void svr4_sgttyb_to_bsd_sgttyb(const struct svr4_sgttyb *ss,
+ struct sgttyb *bs);
+static void bsd_sgttyb_to_svr4_sgttyb(const struct sgttyb *bs,
+ struct svr4_sgttyb *ss);
+static void svr4_ltchars_to_bsd_ltchars(const struct svr4_ltchars *sl,
+ struct ltchars *bl);
+static void bsd_ltchars_to_svr4_ltchars(const struct ltchars *bl,
+ struct svr4_ltchars *sl);
#ifdef DEBUG_SVR4
-static void print_svr4_sgttyb __P((const char *, struct svr4_sgttyb *));
-static void print_svr4_tchars __P((const char *, struct svr4_tchars *));
-static void print_svr4_ltchars __P((const char *, struct svr4_ltchars *));
+static void print_svr4_sgttyb(const char *, struct svr4_sgttyb *);
+static void print_svr4_tchars(const char *, struct svr4_tchars *);
+static void print_svr4_ltchars(const char *, struct svr4_ltchars *);
static void
print_svr4_sgttyb(str, ss)
@@ -192,7 +192,7 @@ svr4_ttold_ioctl(fp, p, retval, fd, cmd, data)
caddr_t data;
{
int error;
- int (*ctl) __P((struct file *, u_long, caddr_t, struct proc *)) =
+ int (*ctl)(struct file *, u_long, caddr_t, struct proc *) =
fp->f_ops->fo_ioctl;
*retval = 0;