ANSIfy syscall args

SCCS-vsn: sys/kern/kern_descrip.c 7.37
SCCS-vsn: sys/kern/kern_resource.c 7.21
SCCS-vsn: sys/hp300/hp300/machdep.c 7.30
SCCS-vsn: sys/hp300/hp300/sys_machdep.c 7.9

diff --git a/usr/src/sys/hp300/hp300/machdep.c b/usr/src/sys/hp300/hp300/machdep.c
index 69599ab..ad948bd 100644 (file)
--- a/usr/src/sys/hp300/hp300/machdep.c
+++ b/usr/src/sys/hp300/hp300/machdep.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: machdep.c 1.68 92/01/20$
  *
  *
  * from: Utah $Hdr: machdep.c 1.68 92/01/20$
  *

- *     @(#)machdep.c   7.29 (Berkeley) %G%
+ *     @(#)machdep.c   7.30 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -724,12 +724,13 @@ sendsig(catcher, sig, mask, code)
  * psl to gain improper priviledges or to cause
  * a machine fault.
  */
  * psl to gain improper priviledges or to cause
  * a machine fault.
  */

+struct sigreturn_args {
+       struct sigcontext *sigcntxp;
+};

 /* ARGSUSED */
 sigreturn(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 sigreturn(p, uap, retval)
        struct proc *p;

-       struct args {
-               struct sigcontext *sigcntxp;
-       } *uap;
+       struct sigreturn_args *uap;

        int *retval;
 {
        register struct sigcontext *scp;
        int *retval;
 {
        register struct sigcontext *scp;

diff --git a/usr/src/sys/hp300/hp300/sys_machdep.c b/usr/src/sys/hp300/hp300/sys_machdep.c
index 06e533d..b1b7d0b 100644 (file)
--- a/usr/src/sys/hp300/hp300/sys_machdep.c
+++ b/usr/src/sys/hp300/hp300/sys_machdep.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)sys_machdep.c       7.8 (Berkeley) %G%
+ *     @(#)sys_machdep.c       7.9 (Berkeley) %G%

  */
 
 #include "sys/param.h"
  */
 
 #include "sys/param.h"


@@ -23,12 +23,13 @@
 #ifdef TRACE
 int    nvualarm;
 
 #ifdef TRACE
 int    nvualarm;
 

+struct vtrace_args {
+       int     request;
+       int     value;
+};

 vtrace(p, uap, retval)
        struct proc *p;
 vtrace(p, uap, retval)
        struct proc *p;

-       register struct args {
-               int     request;
-               int     value;
-       } *uap;
+       register struct vtrace_args *uap;

        int *retval;
 {
        int vdoualarm();
        int *retval;
 {
        int vdoualarm();

diff --git a/usr/src/sys/kern/kern_descrip.c b/usr/src/sys/kern/kern_descrip.c
index c8ed416..2c6c0ff 100644 (file)
--- a/usr/src/sys/kern/kern_descrip.c
+++ b/usr/src/sys/kern/kern_descrip.c
@@ -32,10 +32,13 @@ int nfiles;         /* actual number of open files */
 /*
  * System calls on descriptors.
  */
 /*
  * System calls on descriptors.
  */

+struct getdtablesize_args {
+       int     dummy;
+};

 /* ARGSUSED */
 getdtablesize(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 getdtablesize(p, uap, retval)
        struct proc *p;

-       struct args *uap;
+       struct getdtablesize_args *uap;

        int *retval;
 {
 
        int *retval;
 {
 


@@ -46,12 +49,13 @@ getdtablesize(p, uap, retval)
 /*
  * Duplicate a file descriptor.
  */
 /*
  * Duplicate a file descriptor.
  */

+struct dup_args {
+       int     i;
+};

 /* ARGSUSED */
 dup(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 dup(p, uap, retval)
        struct proc *p;

-       struct args {
-               int     i;
-       } *uap;
+       struct dup_args *uap;

        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;
        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;


@@ -80,13 +84,14 @@ dup(p, uap, retval)
 /*
  * Duplicate a file descriptor to a particular value.
  */
 /*
  * Duplicate a file descriptor to a particular value.
  */

+struct dup2_args {
+       u_int   from;
+       u_int   to;
+};

 /* ARGSUSED */
 dup2(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 dup2(p, uap, retval)
        struct proc *p;

-       struct args {
-               u_int   from;
-               u_int   to;
-       } *uap;
+       struct dup2_args *uap;

        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;
        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;


@@ -125,14 +130,15 @@ dup2(p, uap, retval)
 /*
  * The file control system call.
  */
 /*
  * The file control system call.
  */

+struct fcntl_args {
+       int     fd;
+       int     cmd;
+       int     arg;
+};

 /* ARGSUSED */
 fcntl(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 fcntl(p, uap, retval)
        struct proc *p;

-       register struct args {
-               int     fd;
-               int     cmd;
-               int     arg;
-       } *uap;
+       register struct fcntl_args *uap;

        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;
        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;


@@ -273,12 +279,13 @@ fcntl(p, uap, retval)
 /*
  * Close a file descriptor.
  */
 /*
  * Close a file descriptor.
  */

+struct close_args {
+       int     fd;
+};

 /* ARGSUSED */
 close(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 close(p, uap, retval)
        struct proc *p;

-       struct args {
-               int     fd;
-       } *uap;
+       struct close_args *uap;

        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;
        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;


@@ -305,13 +312,14 @@ close(p, uap, retval)
 /*
  * Return status information about a file descriptor.
  */
 /*
  * Return status information about a file descriptor.
  */

+struct ofstat_args {
+       int     fd;
+       struct  ostat *sb;
+};

 /* ARGSUSED */
 ofstat(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 ofstat(p, uap, retval)
        struct proc *p;

-       register struct args {
-               int     fd;
-               struct  ostat *sb;
-       } *uap;
+       register struct ofstat_args *uap;

        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;
        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;


@@ -347,13 +355,14 @@ ofstat(p, uap, retval)
 /*
  * Return status information about a file descriptor.
  */
 /*
  * Return status information about a file descriptor.
  */

+struct fstat_args {
+       int     fd;
+       struct  stat *sb;
+};

 /* ARGSUSED */
 fstat(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 fstat(p, uap, retval)
        struct proc *p;

-       register struct args {
-               int     fd;
-               struct  stat *sb;
-       } *uap;
+       register struct fstat_args *uap;

        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;
        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;


@@ -676,14 +685,14 @@ closef(fp, p)
  * Just attempt to get a record lock of the requested type on
  * the entire file (l_whence = SEEK_SET, l_start = 0, l_len = 0).
  */
  * Just attempt to get a record lock of the requested type on
  * the entire file (l_whence = SEEK_SET, l_start = 0, l_len = 0).
  */

-
+struct flock_args {
+       int     fd;
+       int     how;
+};

 /* ARGSUSED */
 flock(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 flock(p, uap, retval)
        struct proc *p;

-       register struct args {
-               int     fd;
-               int     how;
-       } *uap;
+       register struct flock_args *uap;

        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;
        int *retval;
 {
        register struct filedesc *fdp = p->p_fd;

diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c
index 8041c5e..a51cc42 100644 (file)
--- a/usr/src/sys/kern/kern_resource.c
+++ b/usr/src/sys/kern/kern_resource.c
@@ -19,12 +19,13 @@
  * Resource controls and accounting.
  */
 
  * Resource controls and accounting.
  */
 

+struct getpriority_args {
+       int     which;
+       int     who;
+};

 getpriority(curp, uap, retval)
        struct proc *curp;
 getpriority(curp, uap, retval)
        struct proc *curp;

-       register struct args {
-               int     which;
-               int     who;
-       } *uap;
+       register struct getpriority_args *uap;

        int *retval;
 {
        register struct proc *p;
        int *retval;
 {
        register struct proc *p;


@@ -75,14 +76,15 @@ getpriority(curp, uap, retval)
        return (0);
 }
 
        return (0);
 }
 

+struct setpriority_args {
+       int     which;
+       int     who;
+       int     prio;
+};

 /* ARGSUSED */
 setpriority(curp, uap, retval)
        struct proc *curp;
 /* ARGSUSED */
 setpriority(curp, uap, retval)
        struct proc *curp;

-       register struct args {
-               int     which;
-               int     who;
-               int     prio;
-       } *uap;
+       register struct setpriority_args *uap;

        int *retval;
 {
        register struct proc *p;
        int *retval;
 {
        register struct proc *p;


@@ -155,13 +157,14 @@ donice(curp, chgp, n)
 }
 
 #if defined(COMPAT_43) || defined(COMPAT_SUNOS)
 }
 
 #if defined(COMPAT_43) || defined(COMPAT_SUNOS)

+struct setrlimit_args {
+       u_int   which;
+       struct  orlimit *lim;
+};

 /* ARGSUSED */
 setrlimit(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 setrlimit(p, uap, retval)
        struct proc *p;

-       register struct args {
-               u_int   which;
-               struct  orlimit *lim;
-       } *uap;
+       register struct setrlimit_args *uap;

        int *retval;
 {
        struct orlimit olim;
        int *retval;
 {
        struct orlimit olim;


@@ -176,13 +179,14 @@ setrlimit(p, uap, retval)
        return (dosetrlimit(p, uap->which, &lim));
 }
 
        return (dosetrlimit(p, uap->which, &lim));
 }
 

+struct getrlimit_args {
+       u_int   which;
+       struct  orlimit *rlp;
+};

 /* ARGSUSED */
 getrlimit(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 getrlimit(p, uap, retval)
        struct proc *p;

-       register struct args {
-               u_int   which;
-               struct  orlimit *rlp;
-       } *uap;
+       register struct getrlimit_args *uap;

        int *retval;
 {
        struct orlimit olim;
        int *retval;
 {
        struct orlimit olim;


@@ -199,13 +203,14 @@ getrlimit(p, uap, retval)
 }
 #endif /* COMPAT_43 || COMPAT_SUNOS */
 
 }
 #endif /* COMPAT_43 || COMPAT_SUNOS */
 

+struct __setrlimit_args {
+       u_int   which;
+       struct  rlimit *lim;
+};

 /* ARGSUSED */
 __setrlimit(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 __setrlimit(p, uap, retval)
        struct proc *p;

-       register struct args {
-               u_int   which;
-               struct  rlimit *lim;
-       } *uap;
+       register struct __setrlimit_args *uap;

        int *retval;
 {
        struct rlimit alim;
        int *retval;
 {
        struct rlimit alim;


@@ -286,13 +291,14 @@ dosetrlimit(p, which, limp)
        return (0);
 }
 
        return (0);
 }
 

+struct __getrlimit_args {
+       u_int   which;
+       struct  rlimit *rlp;
+};

 /* ARGSUSED */
 __getrlimit(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 __getrlimit(p, uap, retval)
        struct proc *p;

-       register struct args {
-               u_int   which;
-               struct  rlimit *rlp;
-       } *uap;
+       register struct __getrlimit_args *uap;

        int *retval;
 {
 
        int *retval;
 {
 


@@ -358,13 +364,14 @@ calcru(p, up, sp, ip)
        }
 }
 
        }
 }
 

+struct getrusage_args {
+       int     who;
+       struct  rusage *rusage;
+};

 /* ARGSUSED */
 getrusage(p, uap, retval)
        register struct proc *p;
 /* ARGSUSED */
 getrusage(p, uap, retval)
        register struct proc *p;

-       register struct args {
-               int     who;
-               struct  rusage *rusage;
-       } *uap;
+       register struct getrusage_args *uap;

        int *retval;
 {
        register struct rusage *rup;
        int *retval;
 {
        register struct rusage *rup;