5 files changed, 69 insertions, 71 deletions
diff --git a/sys/fs/ntfs/ntfs_ihash.h b/sys/fs/ntfs/ntfs_ihash.h
index a3f166f..eb3befd 100644
--- a/sys/fs/ntfs/ntfs_ihash.h
+++ b/sys/fs/ntfs/ntfs_ihash.h
@@ -29,9 +29,9 @@
  */
 
 extern struct lock ntfs_hashlock;
-void ntfs_nthashinit __P((void));
-void ntfs_nthashdestroy __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((register struct ntnode *));
+void ntfs_nthashinit(void);
+void ntfs_nthashdestroy(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(register struct ntnode *);
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index de239f0..dd9af4e 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -55,10 +55,10 @@ MALLOC_DEFINE(M_NTFSRDATA, "NTFS res data", "NTFS resident data");
 MALLOC_DEFINE(M_NTFSRUN, "NTFS vrun", "NTFS vrun storage");
 MALLOC_DEFINE(M_NTFSDECOMP, "NTFS decomp", "NTFS decompression temporary");
 
-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/fs/ntfs/ntfs_subr.h b/sys/fs/ntfs/ntfs_subr.h
index 41a2dc7..1d676ab 100644
--- a/sys/fs/ntfs/ntfs_subr.h
+++ b/sys/fs/ntfs/ntfs_subr.h
@@ -74,39 +74,39 @@ struct componentname;
 struct fnode;
 struct uio;
 
-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));
-void ntfs_toupper_destroy __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);
+void ntfs_toupper_destroy(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 *);
 
 int ntfs_u28_init(struct ntfsmount *ntmp, wchar *u2w);
 int ntfs_u28_uninit(struct ntfsmount *ntmp);
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index 48bacbe..5eaa02f 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -64,20 +64,18 @@ MALLOC_DEFINE(M_NTFSDIR,"NTFS dir",  "NTFS dir buffer");
 
 struct sockaddr;
 
-static int	ntfs_root __P((struct mount *, struct vnode **));
-static int	ntfs_statfs __P((struct mount *, struct statfs *,
-				 struct thread *));
-static int	ntfs_unmount __P((struct mount *, int, struct thread *));
-static int	ntfs_vget __P((struct mount *mp, ino_t ino, int lkflags,
-			       struct vnode **vpp));
-static int	ntfs_mountfs __P((register struct vnode *, struct mount *, 
-				  struct ntfs_args *, struct thread *));
-static int	ntfs_vptofh __P((struct vnode *, struct fid *));
-static int	ntfs_fhtovp __P((struct mount *, struct fid *,
-				 struct vnode **));
-static int	ntfs_mount __P((struct mount *, char *, caddr_t,
-				struct nameidata *, struct thread *));
-static int	ntfs_init __P((struct vfsconf *));
+static int	ntfs_root(struct mount *, struct vnode **);
+static int	ntfs_statfs(struct mount *, struct statfs *, struct thread *);
+static int	ntfs_unmount(struct mount *, int, struct thread *);
+static int	ntfs_vget(struct mount *mp, ino_t ino, int lkflags,
+			       struct vnode **vpp);
+static int	ntfs_mountfs(register struct vnode *, struct mount *, 
+				  struct ntfs_args *, struct thread *);
+static int	ntfs_vptofh(struct vnode *, struct fid *);
+static int	ntfs_fhtovp(struct mount *, struct fid *, struct vnode **);
+static int	ntfs_mount(struct mount *, char *, caddr_t,
+				struct nameidata *, struct thread *);
+static int	ntfs_init(struct vfsconf *);
 
 static int
 ntfs_init (
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index 31b910b..f9e09e8 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -70,20 +70,20 @@
 
 #include <sys/unistd.h> /* for pathconf(2) constants */
 
-static int	ntfs_read __P((struct vop_read_args *));
-static int	ntfs_write __P((struct vop_write_args *ap));
-static int	ntfs_getattr __P((struct vop_getattr_args *ap));
-static int	ntfs_inactive __P((struct vop_inactive_args *ap));
-static int	ntfs_print __P((struct vop_print_args *ap));
-static int	ntfs_reclaim __P((struct vop_reclaim_args *ap));
-static int	ntfs_strategy __P((struct vop_strategy_args *ap));
-static int	ntfs_access __P((struct vop_access_args *ap));
-static int	ntfs_open __P((struct vop_open_args *ap));
-static int	ntfs_close __P((struct vop_close_args *ap));
-static int	ntfs_readdir __P((struct vop_readdir_args *ap));
-static int	ntfs_lookup __P((struct vop_lookup_args *ap));
-static int	ntfs_fsync __P((struct vop_fsync_args *ap));
-static int	ntfs_pathconf __P((void *));
+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_fsync(struct vop_fsync_args *ap);
+static int	ntfs_pathconf(void *);
 
 int	ntfs_prtactive = 1;	/* 1 => print out reclaim of active vnodes */