Get rid of u_int in RPCs

To get mach_msg_type_number_t everywhere

9 files changed, 23 insertions, 23 deletions

diff --git a/exec/hashexec.c b/exec/hashexec.c
index 0c94673e..9e00704e 100644
--- a/exec/hashexec.c
+++ b/exec/hashexec.c
@@ -37,13 +37,13 @@ check_hashbang (struct execdata *e,
 		task_t oldtask,
 		int flags,
 		const char *file_name_exec,
-		char *argv, u_int argvlen, boolean_t argv_copy,
-		char *envp, u_int envplen, boolean_t envp_copy,
-		mach_port_t *dtable, u_int dtablesize, boolean_t dtable_copy,
-		mach_port_t *portarray, u_int nports, boolean_t portarray_copy,
-		int *intarray, u_int nints, boolean_t intarray_copy,
-		const mach_port_t *deallocnames, u_int ndeallocnames,
-		const mach_port_t *destroynames, u_int ndestroynames)
+		char *argv, mach_msg_type_number_t argvlen, boolean_t argv_copy,
+		char *envp, mach_msg_type_number_t envplen, boolean_t envp_copy,
+		mach_port_t *dtable, mach_msg_type_number_t dtablesize, boolean_t dtable_copy,
+		mach_port_t *portarray, mach_msg_type_number_t nports, boolean_t portarray_copy,
+		int *intarray, mach_msg_type_number_t nints, boolean_t intarray_copy,
+		const mach_port_t *deallocnames, mach_msg_type_number_t ndeallocnames,
+		const mach_port_t *destroynames, mach_msg_type_number_t ndestroynames)
 {
   char *p;
   char *interp, *arg;		/* Interpreter file name, and first argument */
@@ -52,7 +52,7 @@ check_hashbang (struct execdata *e,
   char *new_argv;
   size_t new_argvlen;
   mach_port_t *new_dtable = NULL;
-  u_int new_dtablesize;
+  mach_msg_type_number_t new_dtablesize;
 
   file_t user_fd (int fd)
     {
diff --git a/exec/priv.h b/exec/priv.h
index 6077932c..4c2e19ed 100644
--- a/exec/priv.h
+++ b/exec/priv.h
@@ -137,15 +137,15 @@ void check_hashbang (struct execdata *e,
 		     task_t oldtask,
 		     int flags,
 		     const char *filename,
-		     char *argv, u_int argvlen, boolean_t argv_copy,
-		     char *envp, u_int envplen, boolean_t envp_copy,
-		     mach_port_t *dtable, u_int dtablesize,
+		     char *argv, mach_msg_type_number_t argvlen, boolean_t argv_copy,
+		     char *envp, mach_msg_type_number_t envplen, boolean_t envp_copy,
+		     mach_port_t *dtable, mach_msg_type_number_t dtablesize,
 		     boolean_t dtable_copy,
-		     mach_port_t *portarray, u_int nports,
+		     mach_port_t *portarray, mach_msg_type_number_t nports,
 		     boolean_t portarray_copy,
-		     int *intarray, u_int nints, boolean_t intarray_copy,
-		     const mach_port_t *deallocnames, u_int ndeallocnames,
-		     const mach_port_t *destroynames, u_int ndestroynames);
+		     int *intarray, mach_msg_type_number_t nints, boolean_t intarray_copy,
+		     const mach_port_t *deallocnames, mach_msg_type_number_t ndeallocnames,
+		     const mach_port_t *destroynames, mach_msg_type_number_t ndestroynames);
 
 
 /* Standard exec data for secure execs.  */
diff --git a/libtrivfs/priv.c b/libtrivfs/priv.c
index f4d9898f..6eaabe3d 100644
--- a/libtrivfs/priv.c
+++ b/libtrivfs/priv.c
@@ -54,7 +54,7 @@ error_t (*trivfs_getroot_hook) (struct trivfs_control *cntl,
 				mach_port_t reply_port,
 				mach_msg_type_name_t reply_port_type,
 				mach_port_t dotdot,
-				const uid_t *uids, u_int nuids, const uid_t *gids, u_int ngids,
+				const uid_t *uids, mach_msg_type_number_t nuids, const uid_t *gids, mach_msg_type_number_t ngids,
 				int flags,
 				retry_type *do_retry, char *retry_name,
 				mach_port_t *node, mach_msg_type_name_t *node_type)
diff --git a/libtrivfs/trivfs.h b/libtrivfs/trivfs.h
index 25b601ff..6e545428 100644
--- a/libtrivfs/trivfs.h
+++ b/libtrivfs/trivfs.h
@@ -150,7 +150,7 @@ typedef error_t (*trivfs_getroot_hook_fun) (struct trivfs_control *cntl,
 				       mach_port_t reply_port,
 				       mach_msg_type_name_t reply_port_type,
 				       mach_port_t dotdot,
-				       const uid_t *uids, u_int nuids, const uid_t *gids, u_int ngids,
+				       const uid_t *uids, mach_msg_type_number_t nuids, const uid_t *gids, mach_msg_type_number_t ngids,
 				       int flags,
 				       retry_type *do_retry, char *retry_name,
 				       mach_port_t *node, mach_msg_type_name_t *node_type);
diff --git a/storeio/storeio.c b/storeio/storeio.c
index fb9a0041..4e8a9628 100644
--- a/storeio/storeio.c
+++ b/storeio/storeio.c
@@ -227,7 +227,7 @@ getroot_hook (struct trivfs_control *cntl,
 	      mach_port_t reply_port,
 	      mach_msg_type_name_t reply_port_type,
 	      mach_port_t dotdot,
-	      const uid_t *uids, u_int nuids, const uid_t *gids, u_int ngids,
+	      const uid_t *uids, mach_msg_type_number_t nuids, const uid_t *gids, mach_msg_type_number_t ngids,
 	      int flags,
 	      retry_type *do_retry, char *retry_name,
 	      mach_port_t *node, mach_msg_type_name_t *node_type)
@@ -413,7 +413,7 @@ error_t (*trivfs_getroot_hook) (struct trivfs_control *cntl,
 				mach_port_t reply_port,
 				mach_msg_type_name_t reply_port_type,
 				mach_port_t dotdot,
-				const uid_t *uids, u_int nuids, const uid_t *gids, u_int ngids,
+				const uid_t *uids, mach_msg_type_number_t nuids, const uid_t *gids, mach_msg_type_number_t ngids,
 				int flags,
 				retry_type *do_retry, char *retry_name,
 				mach_port_t *node, mach_msg_type_name_t *node_type)
diff --git a/term/devio.c b/term/devio.c
index 3b4e4845..408543e6 100644
--- a/term/devio.c
+++ b/term/devio.c
@@ -348,7 +348,7 @@ error_t
 device_read_reply_inband (mach_port_t replypt,
 			  error_t error_code,
 			  char *data,
-			  u_int datalen)
+			  mach_msg_type_number_t datalen)
 {
   int i, flush;
   error_t err;
diff --git a/trans/firmlink.c b/trans/firmlink.c
index 5101b1bb..6e2798e6 100644
--- a/trans/firmlink.c
+++ b/trans/firmlink.c
@@ -140,7 +140,7 @@ static error_t
 getroot (struct trivfs_control *cntl,
 	 mach_port_t reply_port, mach_msg_type_name_t reply_port_type,
 	 mach_port_t dotdot,
-	 const uid_t *uids, u_int nuids, const uid_t *gids, u_int ngids,
+	 const uid_t *uids, mach_msg_type_number_t nuids, const uid_t *gids, mach_msg_type_number_t ngids,
 	 int flags,
 	 retry_type *do_retry, char *retry_name,
 	 mach_port_t *node, mach_msg_type_name_t *node_type)
diff --git a/trans/magic.c b/trans/magic.c
index 5c477df1..7c809fbc 100644
--- a/trans/magic.c
+++ b/trans/magic.c
@@ -150,7 +150,7 @@ magic_getroot (struct trivfs_control *cntl,
 	       mach_port_t reply_port,
 	       mach_msg_type_name_t reply_port_type,
 	       mach_port_t dotdot,
-	       const uid_t *uids, u_int nuids, const uid_t *gids, u_int ngids,
+	       const uid_t *uids, mach_msg_type_number_t nuids, const uid_t *gids, mach_msg_type_number_t ngids,
 	       int flags,
 	       retry_type *do_retry, char *retry_name,
 	       mach_port_t *node, mach_msg_type_name_t *node_type)
diff --git a/trans/streamio.c b/trans/streamio.c
index 272a002c..991f9ad5 100644
--- a/trans/streamio.c
+++ b/trans/streamio.c
@@ -1040,7 +1040,7 @@ dev_read (size_t amount, void **buf, size_t *len, int nowait)
 
 error_t
 device_read_reply_inband (mach_port_t reply, error_t errorcode,
-			  const io_buf_ptr_inband_t data, u_int datalen)
+			  const io_buf_ptr_inband_t data, mach_msg_type_number_t datalen)
 {
   if (reply != phys_reply)
     return EOPNOTSUPP;