summaryrefslogtreecommitdiff
path: root/sys/ntfs
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2003-05-20 03:36:43 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2003-05-20 03:36:43 +0000
commit81020f5a7f03d4c5027a93d1c1cda72b2b46d8bb (patch)
treebe66ccab36aa20cced132ab8a4b5ca2a8e670099 /sys/ntfs
parent9a4ae01ecf772821f2d62fdfa0ace97e6b4c161f (diff)
un __P
Diffstat (limited to 'sys/ntfs')
-rw-r--r--sys/ntfs/ntfs.h12
-rw-r--r--sys/ntfs/ntfs_ihash.h16
-rw-r--r--sys/ntfs/ntfs_subr.c10
-rw-r--r--sys/ntfs/ntfs_subr.h130
-rw-r--r--sys/ntfs/ntfs_vfsops.c78
-rw-r--r--sys/ntfs/ntfs_vnops.c38
6 files changed, 142 insertions, 142 deletions
diff --git a/sys/ntfs/ntfs.h b/sys/ntfs/ntfs.h
index e5cbfb4742e..1afac27cc25 100644
--- a/sys/ntfs/ntfs.h
+++ b/sys/ntfs/ntfs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntfs.h,v 1.2 2003/05/20 03:23:11 mickey Exp $ */
+/* $OpenBSD: ntfs.h,v 1.3 2003/05/20 03:36:42 tedu Exp $ */
/* $NetBSD: ntfs.h,v 1.5 2003/04/24 07:50:19 christos Exp $ */
/*-
@@ -243,9 +243,9 @@ struct bootfile {
#pragma pack()
-typedef wchar (ntfs_wget_func_t) __P((const char **));
-typedef int (ntfs_wput_func_t) __P((char *, size_t, wchar));
-typedef int (ntfs_wcmp_func_t) __P((wchar, wchar));
+typedef wchar (ntfs_wget_func_t)(const char **);
+typedef int (ntfs_wput_func_t)(char *, size_t, wchar);
+typedef int (ntfs_wcmp_func_t)(wchar, wchar);
#define NTFS_SYSNODESNUM 0x0B
struct ntfsmount {
@@ -304,7 +304,7 @@ MALLOC_DECLARE(M_NTFSRUN);
#endif
#ifdef __NetBSD__
-typedef int (vop_t) __P((void *));
+typedef int (vop_t)(void *);
#define HASHINIT(a, b, c, d) hashinit((a), HASH_LIST, (b), (c), (d))
#define bqrelse(bp) brelse(bp)
#define VOP__UNLOCK(a, b, c) VOP_UNLOCK((a), (b))
@@ -312,7 +312,7 @@ typedef int (vop_t) __P((void *));
#define VN_LOCK(a, b, c) vn_lock((a), (b))
#elif defined(__OpenBSD__)
-typedef int (vop_t) (void *);
+typedef int (vop_t)(void *);
#define HASHINIT(a, b, c, d) hashinit((a), (b), (c), (d))
#define bqrelse(bp) brelse(bp)
#define VOP__UNLOCK(a, b, c) VOP_UNLOCK((a), (b), (c))
diff --git a/sys/ntfs/ntfs_ihash.h b/sys/ntfs/ntfs_ihash.h
index 08438740552..01c8fc3587a 100644
--- a/sys/ntfs/ntfs_ihash.h
+++ b/sys/ntfs/ntfs_ihash.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntfs_ihash.h,v 1.2 2003/05/20 03:23:11 mickey Exp $ */
+/* $OpenBSD: ntfs_ihash.h,v 1.3 2003/05/20 03:36:42 tedu Exp $ */
/* $NetBSD: ntfs_ihash.h,v 1.1 2002/12/23 17:38:32 jdolecek Exp $ */
/*-
@@ -30,10 +30,10 @@
*/
extern struct lock ntfs_hashlock;
-void ntfs_nthashinit __P((void));
-void ntfs_nthashreinit __P((void));
-void ntfs_nthashdone __P((void));
-struct ntnode *ntfs_nthashlookup __P((dev_t, ino_t));
-struct ntnode *ntfs_nthashget __P((dev_t, ino_t));
-void ntfs_nthashins __P((struct ntnode *));
-void ntfs_nthashrem __P((struct ntnode *));
+void ntfs_nthashinit(void);
+void ntfs_nthashreinit(void);
+void ntfs_nthashdone(void);
+struct ntnode *ntfs_nthashlookup(dev_t, ino_t);
+struct ntnode *ntfs_nthashget(dev_t, ino_t);
+void ntfs_nthashins(struct ntnode *);
+void ntfs_nthashrem(struct ntnode *);
diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c
index af5a22ad1c6..029dcf8dc2b 100644
--- a/sys/ntfs/ntfs_subr.c
+++ b/sys/ntfs/ntfs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntfs_subr.c,v 1.2 2003/05/20 03:23:12 mickey Exp $ */
+/* $OpenBSD: ntfs_subr.c,v 1.3 2003/05/20 03:36:42 tedu Exp $ */
/* $NetBSD: ntfs_subr.c,v 1.4 2003/04/10 21:37:32 jdolecek Exp $ */
/*-
@@ -89,10 +89,10 @@ struct ntfs_lookup_ctx {
struct ntfs_lookup_ctx *prev;
};
-static int ntfs_ntlookupattr __P((struct ntfsmount *, const char *, int, int *, char **));
-static int ntfs_findvattr __P((struct ntfsmount *, struct ntnode *, struct ntvattr **, struct ntvattr **, u_int32_t, const char *, size_t, cn_t));
-static int ntfs_uastricmp __P((struct ntfsmount *, const wchar *, size_t, const char *, size_t));
-static int ntfs_uastrcmp __P((struct ntfsmount *, const wchar *, size_t, const char *, size_t));
+static int ntfs_ntlookupattr(struct ntfsmount *, const char *, int, int *, char **);
+static int ntfs_findvattr(struct ntfsmount *, struct ntnode *, struct ntvattr **, struct ntvattr **, u_int32_t, const char *, size_t, cn_t);
+static int ntfs_uastricmp(struct ntfsmount *, const wchar *, size_t, const char *, size_t);
+static int ntfs_uastrcmp(struct ntfsmount *, const wchar *, size_t, const char *, size_t);
/* table for mapping Unicode chars into uppercase; it's filled upon first
* ntfs mount, freed upon last ntfs umount */
diff --git a/sys/ntfs/ntfs_subr.h b/sys/ntfs/ntfs_subr.h
index 98c57a819d4..4d1aa088cd5 100644
--- a/sys/ntfs/ntfs_subr.h
+++ b/sys/ntfs/ntfs_subr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntfs_subr.h,v 1.2 2003/05/20 03:23:12 mickey Exp $ */
+/* $OpenBSD: ntfs_subr.h,v 1.3 2003/05/20 03:36:42 tedu Exp $ */
/* $NetBSD: ntfs_subr.h,v 1.1 2002/12/23 17:38:33 jdolecek Exp $ */
/*-
@@ -72,71 +72,71 @@ struct ntvattr {
#define va_a_ialloc va_d.ialloc
#ifndef __OpenBSD__
-int ntfs_procfixups __P(( struct ntfsmount *, u_int32_t, caddr_t, size_t ));
-int ntfs_parserun __P(( cn_t *, cn_t *, u_int8_t *, u_long, u_long *));
-int ntfs_runtocn __P(( cn_t *, struct ntfsmount *, u_int8_t *, u_long, cn_t));
-int ntfs_readntvattr_plain __P(( struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *,size_t *, struct uio *));
-int ntfs_readattr_plain __P(( struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *,size_t *, struct uio *));
-int ntfs_readattr __P(( struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, struct uio *));
-int ntfs_filesize __P(( struct ntfsmount *, struct fnode *, u_int64_t *, u_int64_t *));
-int ntfs_times __P(( struct ntfsmount *, struct ntnode *, ntfs_times_t *));
-struct timespec ntfs_nttimetounix __P(( u_int64_t ));
-int ntfs_ntreaddir __P(( struct ntfsmount *, struct fnode *, u_int32_t, struct attr_indexentry **));
-int ntfs_runtovrun __P(( cn_t **, cn_t **, u_long *, u_int8_t *));
-int ntfs_attrtontvattr __P(( struct ntfsmount *, struct ntvattr **, struct attr * ));
-void ntfs_freentvattr __P(( struct ntvattr * ));
-int ntfs_loadntvattrs __P(( struct ntfsmount *, struct vnode *, caddr_t, struct ntvattr **));
-struct ntvattr * ntfs_findntvattr __P(( struct ntfsmount *, struct ntnode *, u_int32_t, cn_t ));
-int ntfs_ntlookupfile __P((struct ntfsmount *, struct vnode *, struct componentname *, struct vnode **));
-int ntfs_isnamepermitted __P((struct ntfsmount *, struct attr_indexentry * ));
-int ntfs_ntvattrrele __P((struct ntvattr * ));
-int ntfs_ntvattrget __P((struct ntfsmount *, struct ntnode *, u_int32_t, const char *, cn_t , struct ntvattr **));
-int ntfs_ntlookup __P((struct ntfsmount *, ino_t, struct ntnode **));
-int ntfs_ntget __P((struct ntnode *));
-void ntfs_ntref __P((struct ntnode *));
-void ntfs_ntrele __P((struct ntnode *));
-void ntfs_ntput __P((struct ntnode *));
-int ntfs_loadntnode __P(( struct ntfsmount *, struct ntnode * ));
-int ntfs_writentvattr_plain __P((struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *, size_t *, struct uio *));
-int ntfs_writeattr_plain __P((struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, size_t *, struct uio *));
-void ntfs_toupper_init __P((void));
-int ntfs_toupper_use __P((struct mount *, struct ntfsmount *));
-void ntfs_toupper_unuse __P((void));
-int ntfs_fget __P((struct ntfsmount *, struct ntnode *, int, char *, struct fnode **));
-void ntfs_frele __P((struct fnode *));
+int ntfs_procfixups( struct ntfsmount *, u_int32_t, caddr_t, size_t );
+int ntfs_parserun( cn_t *, cn_t *, u_int8_t *, u_long, u_long *);
+int ntfs_runtocn( cn_t *, struct ntfsmount *, u_int8_t *, u_long, cn_t);
+int ntfs_readntvattr_plain( struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *,size_t *, struct uio *);
+int ntfs_readattr_plain( struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *,size_t *, struct uio *);
+int ntfs_readattr( struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, struct uio *);
+int ntfs_filesize( struct ntfsmount *, struct fnode *, u_int64_t *, u_int64_t *);
+int ntfs_times( struct ntfsmount *, struct ntnode *, ntfs_times_t *);
+struct timespec ntfs_nttimetounix( u_int64_t );
+int ntfs_ntreaddir( struct ntfsmount *, struct fnode *, u_int32_t, struct attr_indexentry **);
+int ntfs_runtovrun( cn_t **, cn_t **, u_long *, u_int8_t *);
+int ntfs_attrtontvattr( struct ntfsmount *, struct ntvattr **, struct attr * );
+void ntfs_freentvattr( struct ntvattr * );
+int ntfs_loadntvattrs( struct ntfsmount *, struct vnode *, caddr_t, struct ntvattr **);
+struct ntvattr * ntfs_findntvattr( struct ntfsmount *, struct ntnode *, u_int32_t, cn_t );
+int ntfs_ntlookupfile(struct ntfsmount *, struct vnode *, struct componentname *, struct vnode **);
+int ntfs_isnamepermitted(struct ntfsmount *, struct attr_indexentry * );
+int ntfs_ntvattrrele(struct ntvattr * );
+int ntfs_ntvattrget(struct ntfsmount *, struct ntnode *, u_int32_t, const char *, cn_t , struct ntvattr **);
+int ntfs_ntlookup(struct ntfsmount *, ino_t, struct ntnode **);
+int ntfs_ntget(struct ntnode *);
+void ntfs_ntref(struct ntnode *);
+void ntfs_ntrele(struct ntnode *);
+void ntfs_ntput(struct ntnode *);
+int ntfs_loadntnode( struct ntfsmount *, struct ntnode * );
+int ntfs_writentvattr_plain(struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *, size_t *, struct uio *);
+int ntfs_writeattr_plain(struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, size_t *, struct uio *);
+void ntfs_toupper_init(void);
+int ntfs_toupper_use(struct mount *, struct ntfsmount *);
+void ntfs_toupper_unuse(void);
+int ntfs_fget(struct ntfsmount *, struct ntnode *, int, char *, struct fnode **);
+void ntfs_frele(struct fnode *);
#else
-int ntfs_procfixups (struct ntfsmount *, u_int32_t, caddr_t, size_t);
-int ntfs_parserun (cn_t *, cn_t *, u_int8_t *, u_long, u_long *);
-int ntfs_runtocn (cn_t *, struct ntfsmount *, u_int8_t *, u_long, cn_t);
-int ntfs_readntvattr_plain (struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *,size_t *, struct uio *);
-int ntfs_readattr_plain (struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *,size_t *, struct uio *);
-int ntfs_readattr (struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, struct uio *);
-int ntfs_filesize (struct ntfsmount *, struct fnode *, u_int64_t *, u_int64_t *);
-int ntfs_times (struct ntfsmount *, struct ntnode *, ntfs_times_t *);
-struct timespec ntfs_nttimetounix (u_int64_t);
-int ntfs_ntreaddir (struct ntfsmount *, struct fnode *, u_int32_t, struct attr_indexentry **, struct proc *);
-int ntfs_runtovrun (cn_t **, cn_t **, u_long *, u_int8_t *);
-int ntfs_attrtontvattr (struct ntfsmount *, struct ntvattr **, struct attr *);
-void ntfs_freentvattr (struct ntvattr *);
-int ntfs_loadntvattrs (struct ntfsmount *, struct vnode *, caddr_t, struct ntvattr **);
-struct ntvattr * ntfs_findntvattr (struct ntfsmount *, struct ntnode *, u_int32_t, cn_t);
-int ntfs_ntlookupfile (struct ntfsmount *, struct vnode *, struct componentname *, struct vnode **, struct proc *);
-int ntfs_isnamepermitted (struct ntfsmount *, struct attr_indexentry *);
-int ntfs_ntvattrrele (struct ntvattr * );
-int ntfs_ntvattrget (struct ntfsmount *, struct ntnode *, u_int32_t, const char *, cn_t , struct ntvattr **);
-int ntfs_ntlookup (struct ntfsmount *, ino_t, struct ntnode **, struct proc *);
-int ntfs_ntget (struct ntnode *, struct proc *);
-void ntfs_ntref (struct ntnode *);
-void ntfs_ntrele (struct ntnode *);
-void ntfs_ntput (struct ntnode *, struct proc *);
-int ntfs_loadntnode ( struct ntfsmount *, struct ntnode *);
-int ntfs_writentvattr_plain (struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *, size_t *, struct uio *);
-int ntfs_writeattr_plain (struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, size_t *, struct uio *);
-void ntfs_toupper_init (void);
-int ntfs_toupper_use (struct mount *, struct ntfsmount *, struct proc *);
-void ntfs_toupper_unuse (struct proc *);
-int ntfs_fget (struct ntfsmount *, struct ntnode *, int, char *, struct fnode **);
-void ntfs_frele (struct fnode *);
+int ntfs_procfixups(struct ntfsmount *, u_int32_t, caddr_t, size_t);
+int ntfs_parserun(cn_t *, cn_t *, u_int8_t *, u_long, u_long *);
+int ntfs_runtocn(cn_t *, struct ntfsmount *, u_int8_t *, u_long, cn_t);
+int ntfs_readntvattr_plain(struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *,size_t *, struct uio *);
+int ntfs_readattr_plain(struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *,size_t *, struct uio *);
+int ntfs_readattr(struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, struct uio *);
+int ntfs_filesize(struct ntfsmount *, struct fnode *, u_int64_t *, u_int64_t *);
+int ntfs_times(struct ntfsmount *, struct ntnode *, ntfs_times_t *);
+struct timespec ntfs_nttimetounix(u_int64_t);
+int ntfs_ntreaddir(struct ntfsmount *, struct fnode *, u_int32_t, struct attr_indexentry **, struct proc *);
+int ntfs_runtovrun(cn_t **, cn_t **, u_long *, u_int8_t *);
+int ntfs_attrtontvattr(struct ntfsmount *, struct ntvattr **, struct attr *);
+void ntfs_freentvattr(struct ntvattr *);
+int ntfs_loadntvattrs(struct ntfsmount *, struct vnode *, caddr_t, struct ntvattr **);
+struct ntvattr * ntfs_findntvattr(struct ntfsmount *, struct ntnode *, u_int32_t, cn_t);
+int ntfs_ntlookupfile(struct ntfsmount *, struct vnode *, struct componentname *, struct vnode **, struct proc *);
+int ntfs_isnamepermitted(struct ntfsmount *, struct attr_indexentry *);
+int ntfs_ntvattrrele(struct ntvattr * );
+int ntfs_ntvattrget(struct ntfsmount *, struct ntnode *, u_int32_t, const char *, cn_t , struct ntvattr **);
+int ntfs_ntlookup(struct ntfsmount *, ino_t, struct ntnode **, struct proc *);
+int ntfs_ntget(struct ntnode *, struct proc *);
+void ntfs_ntref(struct ntnode *);
+void ntfs_ntrele(struct ntnode *);
+void ntfs_ntput(struct ntnode *, struct proc *);
+int ntfs_loadntnode( struct ntfsmount *, struct ntnode *);
+int ntfs_writentvattr_plain(struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *, size_t *, struct uio *);
+int ntfs_writeattr_plain(struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, size_t *, struct uio *);
+void ntfs_toupper_init(void);
+int ntfs_toupper_use(struct mount *, struct ntfsmount *, struct proc *);
+void ntfs_toupper_unuse(struct proc *);
+int ntfs_fget(struct ntfsmount *, struct ntnode *, int, char *, struct fnode **);
+void ntfs_frele(struct fnode *);
#endif
/* ntfs_conv.c stuff */
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index ea3b1621178..712d249fe60 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntfs_vfsops.c,v 1.2 2003/05/20 03:23:12 mickey Exp $ */
+/* $OpenBSD: ntfs_vfsops.c,v 1.3 2003/05/20 03:36:42 tedu Exp $ */
/* $NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $ */
/*-
@@ -81,56 +81,56 @@ MALLOC_DEFINE(M_NTFSDIR,"NTFS dir", "NTFS dir buffer");
#endif
#if defined(__FreeBSD__)
-static int ntfs_mount __P((struct mount *, char *, caddr_t,
- struct nameidata *, struct proc *));
+static int ntfs_mount(struct mount *, char *, caddr_t,
+ struct nameidata *, struct proc *);
#else
-static int ntfs_mount __P((struct mount *, const char *, void *,
- struct nameidata *, struct proc *));
+static int ntfs_mount(struct mount *, const char *, void *,
+ struct nameidata *, struct proc *);
#endif
-static int ntfs_quotactl __P((struct mount *, int, uid_t, caddr_t,
- struct proc *));
-static int ntfs_root __P((struct mount *, struct vnode **));
-static int ntfs_start __P((struct mount *, int, struct proc *));
-static int ntfs_statfs __P((struct mount *, struct statfs *,
- struct proc *));
-static int ntfs_sync __P((struct mount *, int, struct ucred *,
- struct proc *));
-static int ntfs_unmount __P((struct mount *, int, struct proc *));
-static int ntfs_vget __P((struct mount *mp, ino_t ino,
- struct vnode **vpp));
-static int ntfs_mountfs __P((struct vnode *, struct mount *,
- struct ntfs_args *, struct proc *));
-static int ntfs_vptofh __P((struct vnode *, struct fid *));
+static int ntfs_quotactl(struct mount *, int, uid_t, caddr_t,
+ struct proc *);
+static int ntfs_root(struct mount *, struct vnode **);
+static int ntfs_start(struct mount *, int, struct proc *);
+static int ntfs_statfs(struct mount *, struct statfs *,
+ struct proc *);
+static int ntfs_sync(struct mount *, int, struct ucred *,
+ struct proc *);
+static int ntfs_unmount(struct mount *, int, struct proc *);
+static int ntfs_vget(struct mount *mp, ino_t ino,
+ struct vnode **vpp);
+static int ntfs_mountfs(struct vnode *, struct mount *,
+ struct ntfs_args *, struct proc *);
+static int ntfs_vptofh(struct vnode *, struct fid *);
#if defined(__FreeBSD__)
-static int ntfs_init __P((struct vfsconf *));
-static int ntfs_fhtovp __P((struct mount *, struct fid *,
+static int ntfs_init(struct vfsconf *);
+static int ntfs_fhtovp(struct mount *, struct fid *,
struct sockaddr *, struct vnode **,
- int *, struct ucred **));
+ int *, struct ucred **);
#elif defined(__NetBSD__)
-static void ntfs_init __P((void));
-static void ntfs_reinit __P((void));
-static void ntfs_done __P((void));
-static int ntfs_fhtovp __P((struct mount *, struct fid *,
- struct vnode **));
-static int ntfs_checkexp __P((struct mount *, struct mbuf *,
- int *, struct ucred **));
-static int ntfs_mountroot __P((void));
-static int ntfs_sysctl __P((int *, u_int, void *, size_t *, void *,
- size_t, struct proc *));
+static void ntfs_init(void);
+static void ntfs_reinit(void);
+static void ntfs_done(void);
+static int ntfs_fhtovp(struct mount *, struct fid *,
+ struct vnode **);
+static int ntfs_checkexp(struct mount *, struct mbuf *,
+ int *, struct ucred **);
+static int ntfs_mountroot(void);
+static int ntfs_sysctl(int *, u_int, void *, size_t *, void *,
+ size_t, struct proc *);
#elif defined(__OpenBSD__)
-static int ntfs_init (struct vfsconf *);
-static int ntfs_fhtovp (struct mount *, struct fid *,
+static int ntfs_init(struct vfsconf *);
+static int ntfs_fhtovp(struct mount *, struct fid *,
struct vnode **);
-static int ntfs_checkexp (struct mount *, struct mbuf *,
+static int ntfs_checkexp(struct mount *, struct mbuf *,
int *, struct ucred **);
-static int ntfs_sysctl (int *, u_int, void *, size_t *, void *,
+static int ntfs_sysctl(int *, u_int, void *, size_t *, void *,
size_t, struct proc *);
#else
-static int ntfs_init __P((void));
-static int ntfs_fhtovp __P((struct mount *, struct fid *,
+static int ntfs_init(void);
+static int ntfs_fhtovp(struct mount *, struct fid *,
struct mbuf *, struct vnode **,
- int *, struct ucred **));
+ int *, struct ucred **);
#endif
#if defined(__FreeBSD__) || defined(__NetBSD__)
diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c
index 73c129c13e4..29355215f66 100644
--- a/sys/ntfs/ntfs_vnops.c
+++ b/sys/ntfs/ntfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntfs_vnops.c,v 1.2 2003/05/20 03:23:12 mickey Exp $ */
+/* $OpenBSD: ntfs_vnops.c,v 1.3 2003/05/20 03:36:42 tedu Exp $ */
/* $NetBSD: ntfs_vnops.c,v 1.6 2003/04/10 21:57:26 jdolecek Exp $ */
/*
@@ -84,28 +84,28 @@ __KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.6 2003/04/10 21:57:26 jdolecek Exp
#include <sys/unistd.h> /* for pathconf(2) constants */
-static int ntfs_bypass (struct vop_generic_args *ap);
-static int ntfs_read (struct vop_read_args *);
-static int ntfs_write (struct vop_write_args *ap);
-static int ntfs_getattr (struct vop_getattr_args *ap);
-static int ntfs_inactive (struct vop_inactive_args *ap);
-static int ntfs_print (struct vop_print_args *ap);
-static int ntfs_reclaim (struct vop_reclaim_args *ap);
-static int ntfs_strategy (struct vop_strategy_args *ap);
-static int ntfs_access (struct vop_access_args *ap);
-static int ntfs_open (struct vop_open_args *ap);
-static int ntfs_close (struct vop_close_args *ap);
-static int ntfs_readdir (struct vop_readdir_args *ap);
-static int ntfs_lookup (struct vop_lookup_args *ap);
-static int ntfs_bmap (struct vop_bmap_args *ap);
+static int ntfs_bypass(struct vop_generic_args *ap);
+static int ntfs_read(struct vop_read_args *);
+static int ntfs_write(struct vop_write_args *ap);
+static int ntfs_getattr(struct vop_getattr_args *ap);
+static int ntfs_inactive(struct vop_inactive_args *ap);
+static int ntfs_print(struct vop_print_args *ap);
+static int ntfs_reclaim(struct vop_reclaim_args *ap);
+static int ntfs_strategy(struct vop_strategy_args *ap);
+static int ntfs_access(struct vop_access_args *ap);
+static int ntfs_open(struct vop_open_args *ap);
+static int ntfs_close(struct vop_close_args *ap);
+static int ntfs_readdir(struct vop_readdir_args *ap);
+static int ntfs_lookup(struct vop_lookup_args *ap);
+static int ntfs_bmap(struct vop_bmap_args *ap);
#if defined(__FreeBSD__)
-static int ntfs_getpages (struct vop_getpages_args *ap);
-static int ntfs_putpages (struct vop_putpages_args *);
+static int ntfs_getpages(struct vop_getpages_args *ap);
+static int ntfs_putpages(struct vop_putpages_args *);
#endif
#if defined(__FreeBSD__) || defined(__OpenBSD__)
-static int ntfs_fsync (struct vop_fsync_args *ap);
+static int ntfs_fsync(struct vop_fsync_args *ap);
#endif
-static int ntfs_pathconf (void *);
+static int ntfs_pathconf(void *);
int ntfs_prtactive = 1; /* 1 => print out reclaim of active vnodes */