entered into RCS

21 files changed, 30 insertions, 14 deletions

diff --git a/libtrivfs/dir-link.c b/libtrivfs/dir-link.c
index 29380406..0e89ae46 100644
--- a/libtrivfs/dir-link.c
+++ b/libtrivfs/dir-link.c
@@ -20,8 +20,6 @@
 
 kern_return_t
 trivfs_S_dir_link (struct trivfs_protid *file, 
-		   mach_port_t reply,
-		   mach_msg_type_name_t replytype,
 		   struct trivfs_protid *dir, char *name)
 {
   if (!file)
diff --git a/libtrivfs/dir-mkdir.c b/libtrivfs/dir-mkdir.c
index 7d5db976..63689288 100644
--- a/libtrivfs/dir-mkdir.c
+++ b/libtrivfs/dir-mkdir.c
@@ -20,8 +20,6 @@
 
 kern_return_t
 trivfs_S_dir_mkdir (struct trivfs_protid *cred, 
-		    mach_port_t reply,
-		    mach_msg_type_name_t replytype,
 		    char *name, mode_t mode)
 {
   return cred ? ENOTDIR : EOPNOTSUPP;
diff --git a/libtrivfs/dir-mkfile.c b/libtrivfs/dir-mkfile.c
index 139b434f..46554005 100644
--- a/libtrivfs/dir-mkfile.c
+++ b/libtrivfs/dir-mkfile.c
@@ -20,8 +20,6 @@
 
 kern_return_t
 trivfs_S_dir_mkfile (struct trivfs_protid *file,
-		     mach_port_t reply,
-		     mach_msg_type_name_t replytype,
 		     int flags,
 		     mode_t mode,
 		     mach_port_t *newnod,
diff --git a/libtrivfs/dir-readdir.c b/libtrivfs/dir-readdir.c
index 4761d783..2dba1ff0 100644
--- a/libtrivfs/dir-readdir.c
+++ b/libtrivfs/dir-readdir.c
@@ -20,8 +20,6 @@
 
 kern_return_t
 trivfs_S_dir_readdir (struct trivfs_protid *cred,
-		      mach_port_t reply,
-		      mach_msg_type_name_t replytype,
 		      char **data,
 		      u_int *datalen,
 		      int entry,
diff --git a/libtrivfs/dir-rename.c b/libtrivfs/dir-rename.c
index 2f6426a3..acdccbcc 100644
--- a/libtrivfs/dir-rename.c
+++ b/libtrivfs/dir-rename.c
@@ -19,7 +19,8 @@
 #include "fs_S.h"
 
 kern_return_t
-trivfs_S_dir_rename (struct trivfs_protid *cred, char *name,
+trivfs_S_dir_rename (struct trivfs_protid *cred, 
+		     char *name,
 		     struct trivfs_protid *cred2, char *name2)
 {
   if (!cred)
diff --git a/libtrivfs/dir-rmdir.c b/libtrivfs/dir-rmdir.c
index 7ce71413..ecffef43 100644
--- a/libtrivfs/dir-rmdir.c
+++ b/libtrivfs/dir-rmdir.c
@@ -20,8 +20,6 @@
 
 kern_return_t
 trivfs_S_dir_rmdir (struct trivfs_protid *cred, 
-		    mach_port_t reply,
-		    mach_msg_type_name_t replytype,
 		    char *name)
 {
   return cred ? ENOTDIR : EOPNOTSUPP;
diff --git a/libtrivfs/dir-unlink.c b/libtrivfs/dir-unlink.c
index 9c21346a..06657ba9 100644
--- a/libtrivfs/dir-unlink.c
+++ b/libtrivfs/dir-unlink.c
@@ -19,7 +19,8 @@
 #include "fs_S.h"
 
 kern_return_t
-trivfs_S_dir_unlink (struct trivfs_protid *cred, char *name)
+trivfs_S_dir_unlink (struct trivfs_protid *cred, 
+		     char *name)
 {
   return cred ? ENOTDIR : EOPNOTSUPP;
 }
diff --git a/libtrivfs/file-chflags.c b/libtrivfs/file-chflags.c
index efe47ffb..edf04ac5 100644
--- a/libtrivfs/file-chflags.c
+++ b/libtrivfs/file-chflags.c
@@ -20,8 +20,6 @@
 
 kern_return_t
 trivfs_S_file_chflags (struct trivfs_protid *cred, 
-		       mach_port_t reply,
-		       mach_msg_type_name_t replytype,
 		       int flags)
 {
   return cred ? file_chflags (cred->realnode, flags) : EOPNOTSUPP;
diff --git a/libtrivfs/io-async-icky.c b/libtrivfs/io-async-icky.c
index 80100d73..0f0b99ea 100644
--- a/libtrivfs/io-async-icky.c
+++ b/libtrivfs/io-async-icky.c
@@ -25,6 +25,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 kern_return_t
 trivfs_S_io_get_icky_async_id (struct trivfs_protid *cred,
+			       mach_port_t reply,
+			       mach_msg_type_name_t replytype,
 			       mach_port_t *id,
 			       mach_msg_type_name_t *idtype)
 {
diff --git a/libtrivfs/io-async.c b/libtrivfs/io-async.c
index 6e2a841f..0a2646a3 100644
--- a/libtrivfs/io-async.c
+++ b/libtrivfs/io-async.c
@@ -25,6 +25,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 kern_return_t
 trivfs_S_io_async (struct trivfs_protid *cred,
+		   mach_port_t reply,
+		   mach_msg_type_name_t replytype,
 		   mach_port_t notify,
 		   mach_port_t *id,
 		   mach_msg_type_name_t *idtype)
diff --git a/libtrivfs/io-duplicate.c b/libtrivfs/io-duplicate.c
index 8f0a3c74..faf500c6 100644
--- a/libtrivfs/io-duplicate.c
+++ b/libtrivfs/io-duplicate.c
@@ -25,6 +25,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 kern_return_t
 trivfs_S_io_duplicate (struct trivfs_protid *cred,
+		       mach_port_t reply,
+		       mach_msg_type_name_t replytype,
 		       mach_port_t *newport,
 		       mach_msg_type_name_t *newporttype)
 {
diff --git a/libtrivfs/io-map.c b/libtrivfs/io-map.c
index 7d54ee11..f94bf8a5 100644
--- a/libtrivfs/io-map.c
+++ b/libtrivfs/io-map.c
@@ -25,6 +25,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 kern_return_t
 trivfs_S_io_map (struct trivfs_protid *cred,
+		 mach_port_t reply,
+		 mach_msg_type_name_t replytype,
 		 mach_port_t *rdobj,
 		 mach_msg_type_name_t *rdtype,
 		 mach_port_t *wrobj,
diff --git a/libtrivfs/io-modes-get.c b/libtrivfs/io-modes-get.c
index 76653a89..025ed782 100644
--- a/libtrivfs/io-modes-get.c
+++ b/libtrivfs/io-modes-get.c
@@ -25,6 +25,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 kern_return_t
 trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
+			   mach_port_t reply,
+			   mach_msg_type_name_t replytype,
 			   int *bits)
 {
   assert (!trivfs_support_read && !trivfs_support_write);
diff --git a/libtrivfs/io-modes-on.c b/libtrivfs/io-modes-on.c
index 213f6602..8ca82bcf 100644
--- a/libtrivfs/io-modes-on.c
+++ b/libtrivfs/io-modes-on.c
@@ -25,6 +25,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 kern_return_t
 trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
+				mach_port_t reply,
+				mach_msg_type_name_t replytype,
 				int bits)
 {
   assert (!trivfs_support_read && !trivfs_support_write);
diff --git a/libtrivfs/io-modes-set.c b/libtrivfs/io-modes-set.c
index 9eaf0a37..c1bc7405 100644
--- a/libtrivfs/io-modes-set.c
+++ b/libtrivfs/io-modes-set.c
@@ -24,6 +24,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 error_t
 trivfs_S_io_set_all_openmodes (struct trivfs_protid *cred,
+			       mach_port_t reply,
+			       mach_msg_type_name_t replytype,
 			       int mode)
 {
   assert (!trivfs_support_read && !trivfs_support_write);
diff --git a/libtrivfs/io-owner-get.c b/libtrivfs/io-owner-get.c
index 115c8074..d91cd4cc 100644
--- a/libtrivfs/io-owner-get.c
+++ b/libtrivfs/io-owner-get.c
@@ -25,6 +25,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 kern_return_t
 trivfs_S_io_get_owner (struct trivfs_protid *cred,
+		       mach_port_t reply,
+		       mach_msg_type_name_t replytype,
 		       pid_t *owner)
 {
   assert (!trivfs_support_read && !trivfs_support_write);
diff --git a/libtrivfs/io-owner-mod.c b/libtrivfs/io-owner-mod.c
index 1c5463fe..e499776e 100644
--- a/libtrivfs/io-owner-mod.c
+++ b/libtrivfs/io-owner-mod.c
@@ -25,6 +25,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 kern_return_t
 trivfs_S_io_mod_owner (struct trivfs_protid *cred,
+		       mach_port_t reply,
+		       mach_msg_type_name_t replytype,
 		       pid_t owner)
 {
   assert (!trivfs_support_read && !trivfs_support_write);
diff --git a/libtrivfs/io-read.c b/libtrivfs/io-read.c
index a9fac879..1f25bb88 100644
--- a/libtrivfs/io-read.c
+++ b/libtrivfs/io-read.c
@@ -21,6 +21,8 @@
 
 kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
+		  mach_port_t reply,
+		  mach_msg_type_name_t replytype,
 		  char **data,
 		  u_int *datalen,
 		  off_t off,
diff --git a/libtrivfs/io-seek.c b/libtrivfs/io-seek.c
index 8fb53f46..8d810786 100644
--- a/libtrivfs/io-seek.c
+++ b/libtrivfs/io-seek.c
@@ -21,6 +21,8 @@
 
 kern_return_t
 trivfs_S_io_seek (struct trivfs_protid *cred,
+		  mach_port_t reply,
+		  mach_msg_type_name_t replytype,
 		  off_t off,
 		  int whence,
 		  off_t *newp)
diff --git a/libtrivfs/io-stat.c b/libtrivfs/io-stat.c
index ad8f3fde..e7eab9c6 100644
--- a/libtrivfs/io-stat.c
+++ b/libtrivfs/io-stat.c
@@ -24,6 +24,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 kern_return_t
 trivfs_S_io_stat (struct trivfs_protid *cred,
+		  mach_port_t reply,
+		  mach_msg_type_name_t replytype,
 		  struct stat *st)
 {
   error_t err;
diff --git a/libtrivfs/io-write.c b/libtrivfs/io-write.c
index b69a798c..4155a635 100644
--- a/libtrivfs/io-write.c
+++ b/libtrivfs/io-write.c
@@ -21,6 +21,8 @@
 
 kern_return_t
 trivfs_S_io_write (struct trivfs_protid *cred,
+		   mach_port_t reply,
+		   mach_msg_type_name_t replytype,
 		   char *data,
 		   u_int datalen,
 		   off_t off,