misc syntactic cleanups

SCCS-vsn: sys/miscfs/fdesc/fdesc_vnops.c 1.5

diff --git a/usr/src/sys/miscfs/fdesc/fdesc_vnops.c b/usr/src/sys/miscfs/fdesc/fdesc_vnops.c
index 461030a..3ff65e7 100644 (file)
--- a/usr/src/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/usr/src/sys/miscfs/fdesc/fdesc_vnops.c
@@ -8,7 +8,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)fdesc_vnops.c       1.4 (Berkeley) %G%
+ *     @(#)fdesc_vnops.c       1.5 (Berkeley) %G%

  *
  * $Id: fdesc_vnops.c,v 1.7 1992/05/30 10:05:34 jsp Exp jsp $
  */
  *
  * $Id: fdesc_vnops.c,v 1.7 1992/05/30 10:05:34 jsp Exp jsp $
  */


@@ -32,14 +32,18 @@
 #include <sys/namei.h>
 #include <sys/buf.h>
 #include <sys/dirent.h>
 #include <sys/namei.h>
 #include <sys/buf.h>
 #include <sys/dirent.h>

-#include <fdesc/fdesc.h>
+#include <miscfs/fdesc/fdesc.h>

 
 /*
  * vp is the current namei directory
  * ndp is the name to locate in that directory...
  */
 
 /*
  * vp is the current namei directory
  * ndp is the name to locate in that directory...
  */

-fdesc_lookup (ap)
-       struct vop_lookup_args *ap;
+fdesc_lookup(ap)
+       struct vop_lookup_args /* {
+               struct vnode * a_dvp;
+               struct vnode ** a_vpp;
+               struct componentname * a_cnp;
+       } */ *ap;

 {
        struct vnode **vpp = ap->a_vpp;
        struct vnode *dvp = ap->a_dvp;
 {
        struct vnode **vpp = ap->a_vpp;
        struct vnode *dvp = ap->a_dvp;


@@ -111,8 +115,13 @@ bad:;
        return (error);
 }
 
        return (error);
 }
 

-fdesc_open (ap)
-       struct vop_open_args *ap;
+fdesc_open(ap)
+       struct vop_open_args /* {
+               struct vnode *a_vp;
+               int  a_mode;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

 {
        struct vnode *vp = ap->a_vp;
 
 {
        struct vnode *vp = ap->a_vp;
 


@@ -180,8 +189,13 @@ fdesc_attr(fd, vap, cred, p)
        return (error);
 }
 
        return (error);
 }
 

-fdesc_getattr (ap)
-       struct vop_getattr_args *ap;
+fdesc_getattr(ap)
+       struct vop_getattr_args /* {
+               struct vnode *a_vp;
+               struct vattr *a_vap;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

 {
        struct vnode *vp = ap->a_vp;
        struct vattr *vap = ap->a_vap;
 {
        struct vnode *vp = ap->a_vp;
        struct vattr *vap = ap->a_vap;


@@ -222,8 +236,13 @@ fdesc_getattr (ap)
        return (error);
 }
 
        return (error);
 }
 

-fdesc_setattr (ap)
-       struct vop_setattr_args *ap;
+fdesc_setattr(ap)
+       struct vop_setattr_args /* {
+               struct vnode *a_vp;
+               struct vattr *a_vap;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

 {
        struct filedesc *fdp = ap->a_p->p_fd;
        struct file *fp;
 {
        struct filedesc *fdp = ap->a_p->p_fd;
        struct file *fp;


@@ -270,8 +289,12 @@ fdesc_setattr (ap)
        return (error);
 }
 
        return (error);
 }
 

-fdesc_readdir (ap)
-       struct vop_readdir_args *ap;
+fdesc_readdir(ap)
+       struct vop_readdir_args /* {
+               struct vnode *a_vp;
+               struct uio *a_uio;
+               struct ucred *a_cred;
+       } */ *ap;

 {
        struct uio *uio = ap->a_uio;
        struct filedesc *fdp;
 {
        struct uio *uio = ap->a_uio;
        struct filedesc *fdp;


@@ -329,8 +352,10 @@ fdesc_readdir (ap)
        return (error);
 }
 
        return (error);
 }
 

-fdesc_inactive (ap)
-       struct vop_inactive_args *ap;
+fdesc_inactive(ap)
+       struct vop_inactive_args /* {
+               struct vnode *a_vp;
+       } */ *ap;

 {
        struct vnode *vp = ap->a_vp;
 
 {
        struct vnode *vp = ap->a_vp;
 


@@ -345,8 +370,10 @@ fdesc_inactive (ap)
        return (0);
 }
 
        return (0);
 }
 

-fdesc_reclaim (ap)
-       struct  vop_reclaim_args *ap;
+fdesc_reclaim(ap)
+       struct vop_reclaim_args /* {
+               struct vnode *a_vp;
+       } */ *ap;

 {
        struct vnode *vp = ap->a_vp;
        printf("fdesc_reclaim(%x)\n", vp);
 {
        struct vnode *vp = ap->a_vp;
        printf("fdesc_reclaim(%x)\n", vp);


@@ -361,18 +388,26 @@ fdesc_reclaim (ap)
  * Print out the contents of a /dev/fd vnode.
  */
 /* ARGSUSED */
  * Print out the contents of a /dev/fd vnode.
  */
 /* ARGSUSED */

-fdesc_print (ap)
-       struct vop_print_args *ap;
+fdesc_print(ap)
+       struct vop_print_args /* {
+               struct vnode *a_vp;
+       } */ *ap;

 {
 {

+

        printf("tag VT_NON, fdesc vnode\n");
        printf("tag VT_NON, fdesc vnode\n");

+       return (0);

 }
 
 /*void*/
 }
 
 /*void*/

-fdesc_vfree (ap)
-       struct vop_vfree_args *ap;
+fdesc_vfree(ap)
+       struct vop_vfree_args /* {
+               struct vnode *a_pvp;
+               ino_t a_ino;
+               int a_mode;
+       } */ *ap;

 {
 
 {
 

-       return;
+       return (0);

 }
 
 /*
 }
 
 /*


@@ -380,6 +415,7 @@ fdesc_vfree (ap)
  */
 fdesc_enotsupp()
 {
  */
 fdesc_enotsupp()
 {

+

        return (EOPNOTSUPP);
 }
 
        return (EOPNOTSUPP);
 }
 


@@ -388,6 +424,7 @@ fdesc_enotsupp()
  */
 fdesc_badop()
 {
  */
 fdesc_badop()
 {

+

        panic("fdesc: bad op");
        /* NOTREACHED */
 }
        panic("fdesc: bad op");
        /* NOTREACHED */
 }


@@ -397,6 +434,7 @@ fdesc_badop()
  */
 fdesc_nullop()
 {
  */
 fdesc_nullop()
 {

+

        return (0);
 }
 
        return (0);
 }
 


@@ -416,23 +454,26 @@ fdesc_nullop()
 #define fdesc_rename ((int (*) __P((struct  vop_rename_args *)))fdesc_enotsupp)
 #define fdesc_mkdir ((int (*) __P((struct  vop_mkdir_args *)))fdesc_enotsupp)
 #define fdesc_rmdir ((int (*) __P((struct  vop_rmdir_args *)))fdesc_enotsupp)
 #define fdesc_rename ((int (*) __P((struct  vop_rename_args *)))fdesc_enotsupp)
 #define fdesc_mkdir ((int (*) __P((struct  vop_mkdir_args *)))fdesc_enotsupp)
 #define fdesc_rmdir ((int (*) __P((struct  vop_rmdir_args *)))fdesc_enotsupp)

-#define fdesc_symlink ((int (*) __P((struct  vop_symlink_args *)))fdesc_enotsupp)
-#define fdesc_readlink ((int (*) __P((struct  vop_readlink_args *)))fdesc_enotsupp)
+#define fdesc_symlink ((int (*) __P((struct vop_symlink_args *)))fdesc_enotsupp)
+#define fdesc_readlink
+       ((int (*) __P((struct  vop_readlink_args *)))fdesc_enotsupp)

 #define fdesc_abortop ((int (*) __P((struct  vop_abortop_args *)))nullop)
 #define fdesc_lock ((int (*) __P((struct  vop_lock_args *)))nullop)
 #define fdesc_unlock ((int (*) __P((struct  vop_unlock_args *)))nullop)
 #define fdesc_bmap ((int (*) __P((struct  vop_bmap_args *)))fdesc_badop)
 #define fdesc_strategy ((int (*) __P((struct  vop_strategy_args *)))fdesc_badop)
 #define fdesc_islocked ((int (*) __P((struct  vop_islocked_args *)))nullop)
 #define fdesc_abortop ((int (*) __P((struct  vop_abortop_args *)))nullop)
 #define fdesc_lock ((int (*) __P((struct  vop_lock_args *)))nullop)
 #define fdesc_unlock ((int (*) __P((struct  vop_unlock_args *)))nullop)
 #define fdesc_bmap ((int (*) __P((struct  vop_bmap_args *)))fdesc_badop)
 #define fdesc_strategy ((int (*) __P((struct  vop_strategy_args *)))fdesc_badop)
 #define fdesc_islocked ((int (*) __P((struct  vop_islocked_args *)))nullop)

-#define fdesc_advlock ((int (*) __P((struct  vop_advlock_args *)))fdesc_enotsupp)
-#define fdesc_blkatoff ((int (*) __P((struct  vop_blkatoff_args *)))fdesc_enotsupp)
+#define fdesc_advlock ((int (*) __P((struct vop_advlock_args *)))fdesc_enotsupp)
+#define fdesc_blkatoff
+       ((int (*) __P((struct  vop_blkatoff_args *)))fdesc_enotsupp)

 #define fdesc_vget ((int (*) __P((struct  vop_vget_args *)))fdesc_enotsupp)
 #define fdesc_valloc ((int(*) __P(( \
                struct vnode *pvp, \
                int mode, \
                struct ucred *cred, \
                struct vnode **vpp))) fdesc_enotsupp)
 #define fdesc_vget ((int (*) __P((struct  vop_vget_args *)))fdesc_enotsupp)
 #define fdesc_valloc ((int(*) __P(( \
                struct vnode *pvp, \
                int mode, \
                struct ucred *cred, \
                struct vnode **vpp))) fdesc_enotsupp)

-#define fdesc_truncate ((int (*) __P((struct  vop_truncate_args *)))fdesc_enotsupp)
+#define fdesc_truncate
+       ((int (*) __P((struct  vop_truncate_args *)))fdesc_enotsupp)

 #define fdesc_update ((int (*) __P((struct  vop_update_args *)))fdesc_enotsupp)
 #define fdesc_bwrite ((int (*) __P((struct  vop_bwrite_args *)))fdesc_enotsupp)
 
 #define fdesc_update ((int (*) __P((struct  vop_update_args *)))fdesc_enotsupp)
 #define fdesc_bwrite ((int (*) __P((struct  vop_bwrite_args *)))fdesc_enotsupp)
 


@@ -442,20 +483,20 @@ struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
        { &vop_lookup_desc, fdesc_lookup },     /* lookup */
        { &vop_create_desc, fdesc_create },     /* create */
        { &vop_mknod_desc, fdesc_mknod },       /* mknod */
        { &vop_lookup_desc, fdesc_lookup },     /* lookup */
        { &vop_create_desc, fdesc_create },     /* create */
        { &vop_mknod_desc, fdesc_mknod },       /* mknod */

-       { &vop_open_desc, fdesc_open }, /* open */
+       { &vop_open_desc, fdesc_open },         /* open */

        { &vop_close_desc, fdesc_close },       /* close */
        { &vop_access_desc, fdesc_access },     /* access */
        { &vop_getattr_desc, fdesc_getattr },   /* getattr */
        { &vop_setattr_desc, fdesc_setattr },   /* setattr */
        { &vop_close_desc, fdesc_close },       /* close */
        { &vop_access_desc, fdesc_access },     /* access */
        { &vop_getattr_desc, fdesc_getattr },   /* getattr */
        { &vop_setattr_desc, fdesc_setattr },   /* setattr */

-       { &vop_read_desc, fdesc_read }, /* read */
+       { &vop_read_desc, fdesc_read },         /* read */

        { &vop_write_desc, fdesc_write },       /* write */
        { &vop_ioctl_desc, fdesc_ioctl },       /* ioctl */
        { &vop_select_desc, fdesc_select },     /* select */
        { &vop_write_desc, fdesc_write },       /* write */
        { &vop_ioctl_desc, fdesc_ioctl },       /* ioctl */
        { &vop_select_desc, fdesc_select },     /* select */

-       { &vop_mmap_desc, fdesc_mmap }, /* mmap */
+       { &vop_mmap_desc, fdesc_mmap },         /* mmap */

        { &vop_fsync_desc, fdesc_fsync },       /* fsync */
        { &vop_fsync_desc, fdesc_fsync },       /* fsync */

-       { &vop_seek_desc, fdesc_seek }, /* seek */
+       { &vop_seek_desc, fdesc_seek },         /* seek */

        { &vop_remove_desc, fdesc_remove },     /* remove */
        { &vop_remove_desc, fdesc_remove },     /* remove */

-       { &vop_link_desc, fdesc_link }, /* link */
+       { &vop_link_desc, fdesc_link },         /* link */

        { &vop_rename_desc, fdesc_rename },     /* rename */
        { &vop_mkdir_desc, fdesc_mkdir },       /* mkdir */
        { &vop_rmdir_desc, fdesc_rmdir },       /* rmdir */
        { &vop_rename_desc, fdesc_rename },     /* rename */
        { &vop_mkdir_desc, fdesc_mkdir },       /* mkdir */
        { &vop_rmdir_desc, fdesc_rmdir },       /* rmdir */


@@ -465,9 +506,9 @@ struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
        { &vop_abortop_desc, fdesc_abortop },   /* abortop */
        { &vop_inactive_desc, fdesc_inactive }, /* inactive */
        { &vop_reclaim_desc, fdesc_reclaim },   /* reclaim */
        { &vop_abortop_desc, fdesc_abortop },   /* abortop */
        { &vop_inactive_desc, fdesc_inactive }, /* inactive */
        { &vop_reclaim_desc, fdesc_reclaim },   /* reclaim */

-       { &vop_lock_desc, fdesc_lock }, /* lock */
+       { &vop_lock_desc, fdesc_lock },         /* lock */

        { &vop_unlock_desc, fdesc_unlock },     /* unlock */
        { &vop_unlock_desc, fdesc_unlock },     /* unlock */

-       { &vop_bmap_desc, fdesc_bmap }, /* bmap */
+       { &vop_bmap_desc, fdesc_bmap },         /* bmap */

        { &vop_strategy_desc, fdesc_strategy }, /* strategy */
        { &vop_print_desc, fdesc_print },       /* print */
        { &vop_islocked_desc, fdesc_islocked }, /* islocked */
        { &vop_strategy_desc, fdesc_strategy }, /* strategy */
        { &vop_print_desc, fdesc_print },       /* print */
        { &vop_islocked_desc, fdesc_islocked }, /* islocked */