Introduced a type `vop_t' for vnode operation functions and used

it 1138 times (:-() in casts and a few more times in declarations.
This change is null for the i386.

The type has to be `typedef int vop_t(void *)' and not `typedef
int vop_t()' because `gcc -Wstrict-prototypes' warns about the
latter.  Since vnode op functions are called with args of different
(struct pointer) types, neither of these function types is any use
for type checking of the arg, so it would be preferable not to use
the complete function type, especially since using the complete
type requires adding 1138 casts to avoid compiler warnings and
another 40+ casts to reverse the function pointer conversions before
calling the functions.

3 files changed, 136 insertions, 136 deletions

diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index 479ad34..4f0c98d 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.h,v 1.5 1995/03/16 18:12:16 bde Exp $
+ * $Id: cd9660_node.h,v 1.6 1995/10/31 12:13:44 phk Exp $
  */
 
 /*
@@ -111,8 +111,8 @@ struct iso_node {
 #define ISO_ILOCK(ip)	iso_ilock(ip)
 #define ISO_IUNLOCK(ip)	iso_iunlock(ip)
 
-extern int	(**cd9660_fifoop_p)();
-extern int	(**cd9660_specop_p)();
+extern vop_t	**cd9660_fifoop_p;
+extern vop_t	**cd9660_specop_p;
 
 /*
  * Prototypes for ISOFS vnode operations
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index e2e8df2..074de85 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.3 (Berkeley) 1/23/94
- * $Id: cd9660_vnops.c,v 1.17 1995/10/23 02:22:34 dyson Exp $
+ * $Id: cd9660_vnops.c,v 1.18 1995/10/31 12:13:47 phk Exp $
  */
 
 #include <sys/param.h>
@@ -929,50 +929,50 @@ cd9660_enotsupp()
 /*
  * Global vfs data structures for nfs
  */
-int (**cd9660_vnodeop_p)();
+vop_t **cd9660_vnodeop_p;
 static struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, cd9660_lookup },	/* lookup */
-	{ &vop_create_desc, cd9660_create },	/* create */
-	{ &vop_mknod_desc, cd9660_mknod },	/* mknod */
-	{ &vop_open_desc, cd9660_open },	/* open */
-	{ &vop_close_desc, cd9660_close },	/* close */
-	{ &vop_access_desc, cd9660_access },	/* access */
-	{ &vop_getattr_desc, cd9660_getattr },	/* getattr */
-	{ &vop_setattr_desc, cd9660_setattr },	/* setattr */
-	{ &vop_read_desc, cd9660_read },	/* read */
-	{ &vop_write_desc, cd9660_write },	/* write */
-	{ &vop_ioctl_desc, cd9660_ioctl },	/* ioctl */
-	{ &vop_select_desc, cd9660_select },	/* select */
-	{ &vop_mmap_desc, cd9660_mmap },	/* mmap */
-	{ &vop_fsync_desc, cd9660_fsync },	/* fsync */
-	{ &vop_seek_desc, cd9660_seek },	/* seek */
-	{ &vop_remove_desc, cd9660_remove },	/* remove */
-	{ &vop_link_desc, cd9660_link },	/* link */
-	{ &vop_rename_desc, cd9660_rename },	/* rename */
-	{ &vop_mkdir_desc, cd9660_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, cd9660_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, cd9660_symlink },	/* symlink */
-	{ &vop_readdir_desc, cd9660_readdir },	/* readdir */
-	{ &vop_readlink_desc, cd9660_readlink },/* readlink */
-	{ &vop_abortop_desc, cd9660_abortop },	/* abortop */
-	{ &vop_inactive_desc, cd9660_inactive },/* inactive */
-	{ &vop_reclaim_desc, cd9660_reclaim },	/* reclaim */
-	{ &vop_lock_desc, cd9660_lock },	/* lock */
-	{ &vop_unlock_desc, cd9660_unlock },	/* unlock */
-	{ &vop_bmap_desc, cd9660_bmap },	/* bmap */
-	{ &vop_strategy_desc, cd9660_strategy },/* strategy */
-	{ &vop_print_desc, cd9660_print },	/* print */
-	{ &vop_islocked_desc, cd9660_islocked },/* islocked */
-	{ &vop_pathconf_desc, cd9660_pathconf },/* pathconf */
-	{ &vop_advlock_desc, cd9660_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, cd9660_blkatoff },/* blkatoff */
-	{ &vop_valloc_desc, cd9660_valloc },	/* valloc */
-	{ &vop_vfree_desc, cd9660_vfree },	/* vfree */
-	{ &vop_truncate_desc, cd9660_truncate },/* truncate */
-	{ &vop_update_desc, cd9660_update },	/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)cd9660_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)cd9660_create },		/* create */
+	{ &vop_mknod_desc, (vop_t *)cd9660_mknod },		/* mknod */
+	{ &vop_open_desc, (vop_t *)cd9660_open },		/* open */
+	{ &vop_close_desc, (vop_t *)cd9660_close },		/* close */
+	{ &vop_access_desc, (vop_t *)cd9660_access },		/* access */
+	{ &vop_getattr_desc, (vop_t *)cd9660_getattr },		/* getattr */
+	{ &vop_setattr_desc, (vop_t *)cd9660_setattr },		/* setattr */
+	{ &vop_read_desc, (vop_t *)cd9660_read },		/* read */
+	{ &vop_write_desc, (vop_t *)cd9660_write },		/* write */
+	{ &vop_ioctl_desc, (vop_t *)cd9660_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)cd9660_select },		/* select */
+	{ &vop_mmap_desc, (vop_t *)cd9660_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)cd9660_fsync },		/* fsync */
+	{ &vop_seek_desc, (vop_t *)cd9660_seek },		/* seek */
+	{ &vop_remove_desc, (vop_t *)cd9660_remove },		/* remove */
+	{ &vop_link_desc, (vop_t *)cd9660_link },		/* link */
+	{ &vop_rename_desc, (vop_t *)cd9660_rename },		/* rename */
+	{ &vop_mkdir_desc, (vop_t *)cd9660_mkdir },		/* mkdir */
+	{ &vop_rmdir_desc, (vop_t *)cd9660_rmdir },		/* rmdir */
+	{ &vop_symlink_desc, (vop_t *)cd9660_symlink },		/* symlink */
+	{ &vop_readdir_desc, (vop_t *)cd9660_readdir },		/* readdir */
+	{ &vop_readlink_desc, (vop_t *)cd9660_readlink },	/* readlink */
+	{ &vop_abortop_desc, (vop_t *)cd9660_abortop },		/* abortop */
+	{ &vop_inactive_desc, (vop_t *)cd9660_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)cd9660_reclaim },		/* reclaim */
+	{ &vop_lock_desc, (vop_t *)cd9660_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)cd9660_unlock },		/* unlock */
+	{ &vop_bmap_desc, (vop_t *)cd9660_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)cd9660_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)cd9660_print },		/* print */
+	{ &vop_islocked_desc, (vop_t *)cd9660_islocked },	/* islocked */
+	{ &vop_pathconf_desc, (vop_t *)cd9660_pathconf },	/* pathconf */
+	{ &vop_advlock_desc, (vop_t *)cd9660_advlock },		/* advlock */
+	{ &vop_blkatoff_desc, (vop_t *)cd9660_blkatoff },	/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)cd9660_valloc },		/* valloc */
+	{ &vop_vfree_desc, (vop_t *)cd9660_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)cd9660_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)cd9660_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc cd9660_vnodeop_opv_desc =
 	{ &cd9660_vnodeop_p, cd9660_vnodeop_entries };
@@ -981,100 +981,100 @@ VNODEOP_SET(cd9660_vnodeop_opv_desc);
 /*
  * Special device vnode ops
  */
-int (**cd9660_specop_p)();
+vop_t **cd9660_specop_p;
 static struct vnodeopv_entry_desc cd9660_specop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, spec_lookup },	/* lookup */
-	{ &vop_create_desc, cd9660_create },	/* create */
-	{ &vop_mknod_desc, cd9660_mknod },	/* mknod */
-	{ &vop_open_desc, spec_open },		/* open */
-	{ &vop_close_desc, spec_close },	/* close */
-	{ &vop_access_desc, cd9660_access },	/* access */
-	{ &vop_getattr_desc, cd9660_getattr },	/* getattr */
-	{ &vop_setattr_desc, cd9660_setattr },	/* setattr */
-	{ &vop_read_desc, spec_read },		/* read */
-	{ &vop_write_desc, spec_write },	/* write */
-	{ &vop_ioctl_desc, spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, spec_select },	/* select */
-	{ &vop_mmap_desc, spec_mmap },		/* mmap */
-	{ &vop_fsync_desc, spec_fsync },	/* fsync */
-	{ &vop_seek_desc, spec_seek },		/* seek */
-	{ &vop_remove_desc, cd9660_remove },	/* remove */
-	{ &vop_link_desc, cd9660_link },	/* link */
-	{ &vop_rename_desc, cd9660_rename },	/* rename */
-	{ &vop_mkdir_desc, cd9660_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, cd9660_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, cd9660_symlink },	/* symlink */
-	{ &vop_readdir_desc, spec_readdir },	/* readdir */
-	{ &vop_readlink_desc, spec_readlink },	/* readlink */
-	{ &vop_abortop_desc, spec_abortop },	/* abortop */
-	{ &vop_inactive_desc, cd9660_inactive },/* inactive */
-	{ &vop_reclaim_desc, cd9660_reclaim },	/* reclaim */
-	{ &vop_lock_desc, cd9660_lock },	/* lock */
-	{ &vop_unlock_desc, cd9660_unlock },	/* unlock */
-	{ &vop_bmap_desc, spec_bmap },		/* bmap */
-	{ &vop_strategy_desc, spec_strategy },  /* strategy */
-	{ &vop_print_desc, cd9660_print },	/* print */
-	{ &vop_islocked_desc, cd9660_islocked },/* islocked */
-	{ &vop_pathconf_desc, spec_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, spec_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },	/* valloc */
-	{ &vop_vfree_desc, spec_vfree },	/* vfree */
-	{ &vop_truncate_desc, spec_truncate },	/* truncate */
-	{ &vop_update_desc, cd9660_update },	/* update */
- 	{ &vop_getpages_desc, spec_getpages},
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)spec_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)cd9660_create },		/* create */
+	{ &vop_mknod_desc, (vop_t *)cd9660_mknod },		/* mknod */
+	{ &vop_open_desc, (vop_t *)spec_open },			/* open */
+	{ &vop_close_desc, (vop_t *)spec_close },		/* close */
+	{ &vop_access_desc, (vop_t *)cd9660_access },		/* access */
+	{ &vop_getattr_desc, (vop_t *)cd9660_getattr },		/* getattr */
+	{ &vop_setattr_desc, (vop_t *)cd9660_setattr },		/* setattr */
+	{ &vop_read_desc, (vop_t *)spec_read },			/* read */
+	{ &vop_write_desc, (vop_t *)spec_write },		/* write */
+	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)spec_select },		/* select */
+	{ &vop_mmap_desc, (vop_t *)spec_mmap },			/* mmap */
+	{ &vop_fsync_desc, (vop_t *)spec_fsync },		/* fsync */
+	{ &vop_seek_desc, (vop_t *)spec_seek },			/* seek */
+	{ &vop_remove_desc, (vop_t *)cd9660_remove },		/* remove */
+	{ &vop_link_desc, (vop_t *)cd9660_link },		/* link */
+	{ &vop_rename_desc, (vop_t *)cd9660_rename },		/* rename */
+	{ &vop_mkdir_desc, (vop_t *)cd9660_mkdir },		/* mkdir */
+	{ &vop_rmdir_desc, (vop_t *)cd9660_rmdir },		/* rmdir */
+	{ &vop_symlink_desc, (vop_t *)cd9660_symlink },		/* symlink */
+	{ &vop_readdir_desc, (vop_t *)spec_readdir },		/* readdir */
+	{ &vop_readlink_desc, (vop_t *)spec_readlink },		/* readlink */
+	{ &vop_abortop_desc, (vop_t *)spec_abortop },		/* abortop */
+	{ &vop_inactive_desc, (vop_t *)cd9660_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)cd9660_reclaim },		/* reclaim */
+	{ &vop_lock_desc, (vop_t *)cd9660_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)cd9660_unlock },		/* unlock */
+	{ &vop_bmap_desc, (vop_t *)spec_bmap },			/* bmap */
+	{ &vop_strategy_desc, (vop_t *)spec_strategy },		/* strategy */
+	{ &vop_print_desc, (vop_t *)cd9660_print },		/* print */
+	{ &vop_islocked_desc, (vop_t *)cd9660_islocked },	/* islocked */
+	{ &vop_pathconf_desc, (vop_t *)spec_pathconf },		/* pathconf */
+	{ &vop_advlock_desc, (vop_t *)spec_advlock },		/* advlock */
+	{ &vop_blkatoff_desc, (vop_t *)spec_blkatoff },		/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)spec_valloc },		/* valloc */
+	{ &vop_vfree_desc, (vop_t *)spec_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)spec_truncate },		/* truncate */
+	{ &vop_update_desc, (vop_t *)cd9660_update },		/* update */
+ 	{ &vop_getpages_desc, (vop_t *)spec_getpages},		/* getpages */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc cd9660_specop_opv_desc =
 	{ &cd9660_specop_p, cd9660_specop_entries };
 VNODEOP_SET(cd9660_specop_opv_desc);
 
-int (**cd9660_fifoop_p)();
+vop_t **cd9660_fifoop_p;
 static struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, fifo_lookup },	/* lookup */
-	{ &vop_create_desc, cd9660_create },	/* create */
-	{ &vop_mknod_desc, cd9660_mknod },	/* mknod */
-	{ &vop_open_desc, fifo_open },		/* open */
-	{ &vop_close_desc, fifo_close },	/* close */
-	{ &vop_access_desc, cd9660_access },	/* access */
-	{ &vop_getattr_desc, cd9660_getattr },	/* getattr */
-	{ &vop_setattr_desc, cd9660_setattr },	/* setattr */
-	{ &vop_read_desc, fifo_read },		/* read */
-	{ &vop_write_desc, fifo_write },	/* write */
-	{ &vop_ioctl_desc, fifo_ioctl },	/* ioctl */
-	{ &vop_select_desc, fifo_select },	/* select */
-	{ &vop_mmap_desc, fifo_mmap },		/* mmap */
-	{ &vop_fsync_desc, fifo_fsync },	/* fsync */
-	{ &vop_seek_desc, fifo_seek },		/* seek */
-	{ &vop_remove_desc, cd9660_remove },	/* remove */
-	{ &vop_link_desc, cd9660_link },	/* link */
-	{ &vop_rename_desc, cd9660_rename },	/* rename */
-	{ &vop_mkdir_desc, cd9660_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, cd9660_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, cd9660_symlink },	/* symlink */
-	{ &vop_readdir_desc, fifo_readdir },	/* readdir */
-	{ &vop_readlink_desc, fifo_readlink },	/* readlink */
-	{ &vop_abortop_desc, fifo_abortop },	/* abortop */
-	{ &vop_inactive_desc, cd9660_inactive },/* inactive */
-	{ &vop_reclaim_desc, cd9660_reclaim },	/* reclaim */
-	{ &vop_lock_desc, cd9660_lock },	/* lock */
-	{ &vop_unlock_desc, cd9660_unlock },	/* unlock */
-	{ &vop_bmap_desc, fifo_bmap },		/* bmap */
-	{ &vop_strategy_desc, fifo_badop },	/* strategy */
-	{ &vop_print_desc, cd9660_print },	/* print */
-	{ &vop_islocked_desc, cd9660_islocked },/* islocked */
-	{ &vop_pathconf_desc, fifo_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, fifo_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },	/* valloc */
-	{ &vop_vfree_desc, fifo_vfree },	/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },	/* truncate */
-	{ &vop_update_desc, cd9660_update },	/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)fifo_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)cd9660_create },		/* create */
+	{ &vop_mknod_desc, (vop_t *)cd9660_mknod },		/* mknod */
+	{ &vop_open_desc, (vop_t *)fifo_open },			/* open */
+	{ &vop_close_desc, (vop_t *)fifo_close },		/* close */
+	{ &vop_access_desc, (vop_t *)cd9660_access },		/* access */
+	{ &vop_getattr_desc, (vop_t *)cd9660_getattr },		/* getattr */
+	{ &vop_setattr_desc, (vop_t *)cd9660_setattr },		/* setattr */
+	{ &vop_read_desc, (vop_t *)fifo_read },			/* read */
+	{ &vop_write_desc, (vop_t *)fifo_write },		/* write */
+	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)fifo_select },		/* select */
+	{ &vop_mmap_desc, (vop_t *)fifo_mmap },			/* mmap */
+	{ &vop_fsync_desc, (vop_t *)fifo_fsync },		/* fsync */
+	{ &vop_seek_desc, (vop_t *)fifo_seek },			/* seek */
+	{ &vop_remove_desc, (vop_t *)cd9660_remove },		/* remove */
+	{ &vop_link_desc, (vop_t *)cd9660_link },		/* link */
+	{ &vop_rename_desc, (vop_t *)cd9660_rename },		/* rename */
+	{ &vop_mkdir_desc, (vop_t *)cd9660_mkdir },		/* mkdir */
+	{ &vop_rmdir_desc, (vop_t *)cd9660_rmdir },		/* rmdir */
+	{ &vop_symlink_desc, (vop_t *)cd9660_symlink },		/* symlink */
+	{ &vop_readdir_desc, (vop_t *)fifo_readdir },		/* readdir */
+	{ &vop_readlink_desc, (vop_t *)fifo_readlink },		/* readlink */
+	{ &vop_abortop_desc, (vop_t *)fifo_abortop },		/* abortop */
+	{ &vop_inactive_desc, (vop_t *)cd9660_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)cd9660_reclaim },		/* reclaim */
+	{ &vop_lock_desc, (vop_t *)cd9660_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)cd9660_unlock },		/* unlock */
+	{ &vop_bmap_desc, (vop_t *)fifo_bmap },			/* bmap */
+	{ &vop_strategy_desc, (vop_t *)fifo_badop },		/* strategy */
+	{ &vop_print_desc, (vop_t *)cd9660_print },		/* print */
+	{ &vop_islocked_desc, (vop_t *)cd9660_islocked },	/* islocked */
+	{ &vop_pathconf_desc, (vop_t *)fifo_pathconf },		/* pathconf */
+	{ &vop_advlock_desc, (vop_t *)fifo_advlock },		/* advlock */
+	{ &vop_blkatoff_desc, (vop_t *)fifo_blkatoff },		/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)fifo_valloc },		/* valloc */
+	{ &vop_vfree_desc, (vop_t *)fifo_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)fifo_truncate },		/* truncate */
+	{ &vop_update_desc, (vop_t *)cd9660_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc cd9660_fifoop_opv_desc =
 	{ &cd9660_fifoop_p, cd9660_fifoop_entries };
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index bf5c44c..fa9e2c0 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.2 (Berkeley) 1/23/94
- * $Id: iso.h,v 1.6 1995/07/25 21:50:50 bde Exp $
+ * $Id: iso.h,v 1.7 1995/10/31 12:13:49 phk Exp $
  */
 
 #define ISODCL(from, to) (to - from + 1)
@@ -223,7 +223,7 @@ int iso_ilock __P((struct iso_node *ip));
 int iso_iunlock __P((struct iso_node *ip));
 int cd9660_mountroot __P((void));
 
-extern int (**cd9660_vnodeop_p)();
+extern vop_t **cd9660_vnodeop_p;
 
 static inline int
 isonum_711(p)