Make system calls conform to a standard prototype and bring those

prototypes into scope.
This commit is contained in:
thorpej 1995-09-19 22:49:22 +00:00
parent 9c2a912abe
commit 78f7651c91
1 changed files with 90 additions and 57 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: ultrix_misc.c,v 1.14 1995/06/18 14:46:53 cgd Exp $ */ /* $NetBSD: ultrix_misc.c,v 1.15 1995/09/19 22:49:22 thorpej Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -120,11 +120,12 @@ struct ultrix_getsysinfo_args {
char *arg; char *arg;
}; };
ultrix_getsysinfo(p, uap, retval) ultrix_getsysinfo(p, v, retval)
struct proc *p; struct proc *p;
struct ultrix_getsysinfo_args *uap; void *v;
int *retval; int *retval;
{ {
struct ultrix_getsysinfo_args *uap = v;
static short progenv = 0; static short progenv = 0;
switch (uap->op) { switch (uap->op) {
@ -148,11 +149,12 @@ struct ultrix_setsysinfo_args {
unsigned flag; unsigned flag;
}; };
ultrix_setsysinfo(p, uap, retval) ultrix_setsysinfo(p, v, retval)
struct proc *p; struct proc *p;
struct ultrix_setsysinfo_args *uap; void *v;
int *retval; int *retval;
{ {
struct ultrix_setsysinfo_args *uap = v;
*retval = 0; *retval = 0;
return 0; return 0;
} }
@ -164,11 +166,12 @@ struct ultrix_waitpid_args {
struct rusage *rusage; struct rusage *rusage;
}; };
ultrix_waitpid(p, uap, retval) ultrix_waitpid(p, v, retval)
struct proc *p; struct proc *p;
struct ultrix_waitpid_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct ultrix_waitpid_args *uap = v;
uap->rusage = 0; uap->rusage = 0;
return (wait4(p, uap, retval)); return (wait4(p, uap, retval));
@ -180,11 +183,12 @@ struct sun_wait4_args {
struct rusage *rusage; struct rusage *rusage;
int compat; int compat;
}; };
sun_wait4(p, uap, retval) sun_wait4(p, v, retval)
struct proc *p; struct proc *p;
struct sun_wait4_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_wait4_args *uap = v;
if (uap->pid == 0) if (uap->pid == 0)
uap->pid = WAIT_ANY; uap->pid = WAIT_ANY;
@ -197,11 +201,12 @@ struct sun_wait3_args {
struct rusage *rusage; struct rusage *rusage;
}; };
sun_wait3(p, uap, retval) sun_wait3(p, v, retval)
struct proc *p; struct proc *p;
struct sun_wait3_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_wait3_args *uap = v;
struct sun_wait4_args ua; struct sun_wait4_args ua;
if (uap == NULL) if (uap == NULL)
@ -218,11 +223,12 @@ struct sun_creat_args {
char *fname; char *fname;
int fmode; int fmode;
}; };
sun_creat(p, uap, retval) sun_creat(p, v, retval)
struct proc *p; struct proc *p;
struct sun_creat_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_creat_args *uap = v;
struct args { struct args {
char *fname; char *fname;
int mode; int mode;
@ -240,11 +246,12 @@ struct sun_execv_args {
char **argp; char **argp;
char **envp; /* pseudo */ char **envp; /* pseudo */
}; };
sun_execv(p, uap, retval) sun_execv(p, v, retval)
struct proc *p; struct proc *p;
struct sun_execv_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_execv_args *uap = v;
uap->envp = NULL; uap->envp = NULL;
return (execve(p, uap, retval)); return (execve(p, uap, retval));
@ -255,11 +262,12 @@ struct sun_omsync_args {
int len; int len;
int flags; int flags;
}; };
sun_omsync(p, uap, retval) sun_omsync(p, v, retval)
struct proc *p; struct proc *p;
struct sun_omsync_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_omsync_args *uap = v;
if (uap->flags) if (uap->flags)
return (EINVAL); return (EINVAL);
@ -270,11 +278,12 @@ struct sun_unmount_args {
char *name; char *name;
int flags; /* pseudo */ int flags; /* pseudo */
}; };
sun_unmount(p, uap, retval) sun_unmount(p, v, retval)
struct proc *p; struct proc *p;
struct sun_unmount_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_unmount_args *uap = v;
uap->flags = 0; uap->flags = 0;
return (unmount(p, uap, retval)); return (unmount(p, uap, retval));
@ -312,11 +321,12 @@ struct sun_mount_args {
int flags; int flags;
caddr_t data; caddr_t data;
}; };
sun_mount(p, uap, retval) sun_mount(p, v, retval)
struct proc *p; struct proc *p;
struct sun_mount_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_mount_args *uap = v;
int oflags = uap->flags, nflags, error; int oflags = uap->flags, nflags, error;
extern char sigcode[], esigcode[]; extern char sigcode[], esigcode[];
char fsname[MFSNAMELEN]; char fsname[MFSNAMELEN];
@ -395,11 +405,12 @@ async_daemon(p, uap, retval)
struct sun_sigpending_args { struct sun_sigpending_args {
int *mask; int *mask;
}; };
sun_sigpending(p, uap, retval) sun_sigpending(p, v, retval)
struct proc *p; struct proc *p;
struct sun_sigpending_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_sigpending_args *uap = v;
int mask = p->p_siglist & p->p_sigmask; int mask = p->p_siglist & p->p_sigmask;
return (copyout((caddr_t)&mask, (caddr_t)uap->mask, sizeof(int))); return (copyout((caddr_t)&mask, (caddr_t)uap->mask, sizeof(int)));
@ -440,11 +451,12 @@ struct sun_getdents_args {
char *buf; char *buf;
int nbytes; int nbytes;
}; };
sun_getdents(p, uap, retval) sun_getdents(p, v, retval)
struct proc *p; struct proc *p;
register struct sun_getdents_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
register struct sun_getdents_args *uap = v;
register struct vnode *vp; register struct vnode *vp;
register caddr_t inp, buf; /* BSD-format */ register caddr_t inp, buf; /* BSD-format */
register int len, reclen; /* BSD-format */ register int len, reclen; /* BSD-format */
@ -548,11 +560,12 @@ struct sun_mmap_args {
long off; /* not off_t! */ long off; /* not off_t! */
off_t qoff; /* created here and fed to mmap() */ off_t qoff; /* created here and fed to mmap() */
}; };
sun_mmap(p, uap, retval) sun_mmap(p, v, retval)
register struct proc *p; register struct proc *p;
register struct sun_mmap_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
register struct sun_mmap_args *uap = v;
register struct filedesc *fdp; register struct filedesc *fdp;
register struct file *fp; register struct file *fp;
register struct vnode *vp; register struct vnode *vp;
@ -602,11 +615,12 @@ struct sun_mctl_args {
int func; int func;
void *arg; void *arg;
}; };
sun_mctl(p, uap, retval) sun_mctl(p, v, retval)
register struct proc *p; register struct proc *p;
register struct sun_mctl_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
register struct sun_mctl_args *uap = v;
switch (uap->func) { switch (uap->func) {
@ -628,11 +642,12 @@ struct sun_setsockopt_args {
caddr_t val; caddr_t val;
int valsize; int valsize;
}; };
sun_setsockopt(p, uap, retval) sun_setsockopt(p, v, retval)
struct proc *p; struct proc *p;
register struct sun_setsockopt_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
register struct sun_setsockopt_args *uap = v;
struct file *fp; struct file *fp;
struct mbuf *m = NULL; struct mbuf *m = NULL;
int error; int error;
@ -669,11 +684,12 @@ sun_setsockopt(p, uap, retval)
struct sun_fchroot_args { struct sun_fchroot_args {
int fdes; int fdes;
}; };
sun_fchroot(p, uap, retval) sun_fchroot(p, v, retval)
register struct proc *p; register struct proc *p;
register struct sun_fchroot_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
register struct sun_fchroot_args *uap = v;
register struct filedesc *fdp = p->p_fd; register struct filedesc *fdp = p->p_fd;
register struct vnode *vp; register struct vnode *vp;
struct file *fp; struct file *fp;
@ -719,11 +735,12 @@ struct sun_utsname {
struct sun_uname_args { struct sun_uname_args {
struct sun_utsname *name; struct sun_utsname *name;
}; };
sun_uname(p, uap, retval) sun_uname(p, v, retval)
struct proc *p; struct proc *p;
struct sun_uname_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_uname_args *uap = v;
struct sun_utsname sut; struct sun_utsname sut;
extern char ostype[], machine[], osrelease[]; extern char ostype[], machine[], osrelease[];
@ -744,11 +761,13 @@ struct sun_setpgid_args {
int pgid; /* target pgrp id */ int pgid; /* target pgrp id */
}; };
int int
sun_setpgid(p, uap, retval) sun_setpgid(p, v, retval)
struct proc *p; struct proc *p;
struct sun_setpgid_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_setpgid_args *uap = v;
/* /*
* difference to our setpgid call is to include backwards * difference to our setpgid call is to include backwards
* compatibility to pre-setsid() binaries. Do setsid() * compatibility to pre-setsid() binaries. Do setsid()
@ -766,11 +785,12 @@ struct sun_open_args {
int fmode; int fmode;
int crtmode; int crtmode;
}; };
sun_open(p, uap, retval) sun_open(p, v, retval)
struct proc *p; struct proc *p;
struct sun_open_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_open_args *uap = v;
int l, r; int l, r;
int noctty = uap->fmode & 0x8000; int noctty = uap->fmode & 0x8000;
int ret; int ret;
@ -808,11 +828,12 @@ struct nfssvc_args {
struct sun_nfssvc_args { struct sun_nfssvc_args {
int fd; int fd;
}; };
sun_nfssvc(p, uap, retval) sun_nfssvc(p, v, retval)
struct proc *p; struct proc *p;
struct sun_nfssvc_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_nfssvc_args *uap = v;
struct nfssvc_args outuap; struct nfssvc_args outuap;
struct sockaddr sa; struct sockaddr sa;
int error; int error;
@ -845,11 +866,12 @@ struct sun_ustat_args {
int dev; int dev;
struct sun_ustat *buf; struct sun_ustat *buf;
}; };
sun_ustat(p, uap, retval) sun_ustat(p, v, retval)
struct proc *p; struct proc *p;
struct sun_ustat_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_ustat_args *uap = v;
struct sun_ustat us; struct sun_ustat us;
int error; int error;
@ -871,11 +893,13 @@ struct sun_quotactl_args {
int uid; int uid;
caddr_t addr; caddr_t addr;
}; };
sun_quotactl(p, uap, retval) sun_quotactl(p, v, retval)
struct proc *p; struct proc *p;
struct sun_quotactl_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_quotactl_args *uap = v;
return EINVAL; return EINVAL;
} }
@ -921,11 +945,12 @@ struct sun_statfs_args {
char *path; char *path;
struct sun_statfs *buf; struct sun_statfs *buf;
}; };
sun_statfs(p, uap, retval) sun_statfs(p, v, retval)
struct proc *p; struct proc *p;
struct sun_statfs_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_statfs_args *uap = v;
register struct mount *mp; register struct mount *mp;
register struct statfs *sp; register struct statfs *sp;
int error; int error;
@ -947,11 +972,12 @@ struct sun_fstatfs_args {
int fd; int fd;
struct sun_statfs *buf; struct sun_statfs *buf;
}; };
sun_fstatfs(p, uap, retval) sun_fstatfs(p, v, retval)
struct proc *p; struct proc *p;
struct sun_fstatfs_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_fstatfs_args *uap = v;
struct file *fp; struct file *fp;
struct mount *mp; struct mount *mp;
register struct statfs *sp; register struct statfs *sp;
@ -971,11 +997,13 @@ struct sun_exportfs_args {
char *path; char *path;
char *ex; /* struct sun_export * */ char *ex; /* struct sun_export * */
}; };
sun_exportfs(p, uap, retval) sun_exportfs(p, v, retval)
struct proc *p; struct proc *p;
struct sun_exportfs_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_exportfs_args *uap = v;
/* /*
* XXX: should perhaps translate into a mount(2) * XXX: should perhaps translate into a mount(2)
* with MOUNT_EXPORT? * with MOUNT_EXPORT?
@ -989,11 +1017,13 @@ struct sun_mknod_args {
int dev; int dev;
}; };
sun_mknod(p, uap, retval) sun_mknod(p, v, retval)
struct proc *p; struct proc *p;
struct sun_mknod_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_mknod_args *uap = v;
if (S_ISFIFO(uap->fmode)) if (S_ISFIFO(uap->fmode))
return mkfifo(p, uap, retval); return mkfifo(p, uap, retval);
@ -1013,11 +1043,12 @@ struct sun_sysconf_args {
int name; int name;
}; };
sun_sysconf(p, uap, retval) sun_sysconf(p, v, retval)
struct proc *p; struct proc *p;
struct sun_sysconf_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct sun_sysconf_args *uap = v;
extern int maxfiles; extern int maxfiles;
switch(uap->name) { switch(uap->name) {
@ -1059,10 +1090,12 @@ struct ultrix_sigcleanup_args {
struct sigcontext *sigcntxp; struct sigcontext *sigcntxp;
}; };
int ultrix_sigcleanup(p, uap, retval) int ultrix_sigcleanup(p, v, retval)
struct proc *p; struct proc *p;
struct ultrix_sigcleanup_args *uap; void *v;
register_t *retval; register_t *retval;
{ {
struct ultrix_sigcleanup_args *uap = v;
sigreturn (p, (struct sigreturn_args *)uap, retval); sigreturn (p, (struct sigreturn_args *)uap, retval);
} }