From 9cb413a93c0c68c45292e4086ffc7cc2f6d36d3e Mon Sep 17 00:00:00 2001 From: phk Date: Thu, 14 Dec 1995 09:55:16 +0000 Subject: Another mega commit to staticize things. --- sys/fs/fifofs/fifo.h | 6 +----- sys/fs/fifofs/fifo_vnops.c | 19 ++++++++++++------- sys/fs/specfs/spec_vnops.c | 7 +++++-- 3 files changed, 18 insertions(+), 14 deletions(-) (limited to 'sys/fs') diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h index c54d3d7..62cd4df 100644 --- a/sys/fs/fifofs/fifo.h +++ b/sys/fs/fifofs/fifo.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo.h 8.2 (Berkeley) 2/2/94 - * $Id: fifo.h,v 1.8 1995/12/11 09:24:09 phk Exp $ + * $Id: fifo.h,v 1.9 1995/12/11 10:26:32 phk Exp $ */ extern vop_t **fifo_vnodeop_p; @@ -40,7 +40,6 @@ extern vop_t **fifo_vnodeop_p; * Prototypes for fifo operations on vnodes. */ int fifo_badop __P((void)); -int fifo_ebadf __P((void)); int fifo_printinfo __P((struct vnode *)); int fifo_lookup __P((struct vop_lookup_args *)); #define fifo_create ((int (*) __P((struct vop_create_args *)))fifo_badop) @@ -68,11 +67,8 @@ int fifo_select __P((struct vop_select_args *)); #define fifo_abortop ((int (*) __P((struct vop_abortop_args *)))fifo_badop) #define fifo_inactive ((int (*) __P((struct vop_inactive_args *)))nullop) #define fifo_reclaim ((int (*) __P((struct vop_reclaim_args *)))nullop) -int fifo_lock __P((struct vop_lock_args *)); -int fifo_unlock __P((struct vop_unlock_args *)); int fifo_bmap __P((struct vop_bmap_args *)); #define fifo_strategy ((int (*) __P((struct vop_strategy_args *)))fifo_badop) -int fifo_print __P((struct vop_print_args *)); #define fifo_islocked ((int (*) __P((struct vop_islocked_args *)))nullop) int fifo_pathconf __P((struct vop_pathconf_args *)); int fifo_advlock __P((struct vop_advlock_args *)); diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index b274365..a0a34f7 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/fifofs/fifo_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.2 (Berkeley) 1/4/94 - * $Id: fifo_vnops.c,v 1.13 1995/12/11 09:24:13 phk Exp $ + * $Id: fifo_vnops.c,v 1.14 1995/12/11 10:26:34 phk Exp $ */ #include @@ -62,8 +62,13 @@ struct fifoinfo { long fi_writers; }; +static int fifo_ebadf __P((void)); +static int fifo_unlock __P((struct vop_unlock_args *)); +static int fifo_lock __P((struct vop_lock_args *)); +static int fifo_print __P((struct vop_print_args *)); + vop_t **fifo_vnodeop_p; -struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { +static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { { &vop_default_desc, (vop_t *)vn_default_error }, { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ { &vop_create_desc, (vop_t *)fifo_create }, /* create */ @@ -107,7 +112,7 @@ struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { { &vop_bwrite_desc, (vop_t *)fifo_bwrite }, /* bwrite */ { NULL, NULL } }; -struct vnodeopv_desc fifo_vnodeop_opv_desc = +static struct vnodeopv_desc fifo_vnodeop_opv_desc = { &fifo_vnodeop_p, fifo_vnodeop_entries }; VNODEOP_SET(fifo_vnodeop_opv_desc); @@ -382,7 +387,7 @@ fifo_bmap(ap) * At the moment we do not do any locking. */ /* ARGSUSED */ -int +static int fifo_lock(ap) struct vop_lock_args /* { struct vnode *a_vp; @@ -393,7 +398,7 @@ fifo_lock(ap) } /* ARGSUSED */ -int +static int fifo_unlock(ap) struct vop_unlock_args /* { struct vnode *a_vp; @@ -459,7 +464,7 @@ fifo_printinfo(vp) /* * Print out the contents of a fifo vnode. */ -int +static int fifo_print(ap) struct vop_print_args /* { struct vnode *a_vp; @@ -503,7 +508,7 @@ fifo_pathconf(ap) /* * Fifo failed operation */ -int +static int fifo_ebadf() { diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index d9a3d2c..14d9939 100644 --- a/sys/fs/specfs/spec_vnops.c +++ b/sys/fs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.6 (Berkeley) 4/9/94 - * $Id: spec_vnops.c,v 1.24 1995/12/11 09:24:50 phk Exp $ + * $Id: spec_vnops.c,v 1.25 1995/12/13 15:13:31 julian Exp $ */ #include @@ -60,6 +60,9 @@ #include +static int spec_ebadf __P((void)); +static int spec_getattr __P((struct vop_getattr_args *)); + struct vnode *speclisth[SPECHSZ]; vop_t **spec_vnodeop_p; static struct vnodeopv_entry_desc spec_vnodeop_entries[] = { @@ -842,7 +845,7 @@ spec_getpages(ap) } /* ARGSUSED */ -int +static int spec_getattr(ap) struct vop_getattr_args /* { struct vnode *a_vp; -- cgit v1.1