Use the data_t type defined in hurd_types.h.

* boot/boot.c: Replace char* with data_t.
* console-client/trans.c: Likewise.
* exec/exec.c: Likewise.
* ext2fs/storeinfo.c: Likewise.
* fatfs/inode.c: Likewise.
* fatfs/main.c: Likewise.
* isofs/inode.c: Likewise.
* libdiskfs/boot-start.c: Likewise.
* libdiskfs/dir-readdir.c: Likewise.
* libdiskfs/file-exec.c: Likewise.
* libdiskfs/file-get-fs-opts.c: Likewise.
* libdiskfs/file-get-trans.c: Likewise.
* libdiskfs/file-getfh.c: Likewise.
* libdiskfs/file-set-trans.c: Likewise.
* libdiskfs/fsys-forward.c: Likewise.
* libdiskfs/fsys-getfile.c: Likewise.
* libdiskfs/fsys-options.c: Likewise.
* libdiskfs/io-read.c: Likewise.
* libdiskfs/io-write.c: Likewise.
* libnetfs/dir-readdir.c: Likewise.
* libnetfs/file-exec.c: Likewise.
* libnetfs/file-get-fs-options.c: Likewise.
* libnetfs/file-get-storage-info.c: Likewise.
* libnetfs/file-get-translator.c: Likewise.
* libnetfs/file-set-translator.c: Likewise.
* libnetfs/fsstubs.c: Likewise.
* libnetfs/fsys-get-options.c: Likewise.
* libnetfs/fsys-set-options.c: Likewise.
* libnetfs/fsysstubs.c: Likewise.
* libnetfs/io-read.c: Likewise.
* libnetfs/io-write.c: Likewise.
* libtrivfs/dir-readdir.c: Likewise.
* libtrivfs/file-get-fs-options.c: Likewise.
* libtrivfs/file-get-storage-info.c: Likewise.
* libtrivfs/file-get-trans.c: Likewise.
* libtrivfs/file-getfh.c: Likewise.
* libtrivfs/file-set-trans.c: Likewise.
* libtrivfs/fsys-forward.c: Likewise.
* libtrivfs/fsys-get-options.c: Likewise.
* libtrivfs/fsys-set-options.c: Likewise.
* libtrivfs/fsys-stubs.c: Likewise.
* libtrivfs/io-read.c: Likewise.
* libtrivfs/io-write.c: Likewise.
* pfinet/io-ops.c: Likewise.
* pfinet/pfinet-ops.c: Likewise.
* pfinet/socket-ops.c: Likewise.
* pfinet/tunnel.c: Likewise.
* pflocal/io.c: Likewise.
* pflocal/pf.c: Likewise.
* pflocal/socket.c: Likewise.
* proc/info.c: Likewise.
* startup/startup.c: Likewise.
* storeio/io.c: Likewise.
* term/users.c: Likewise.
* tmpfs/node.c: Likewise.
* trans/crash.c: Likewise.
* trans/fakeroot.c: Likewise.
* trans/fifo.c: Likewise.
* trans/firmlink.c: Likewise.
* trans/hello-mt.c: Likewise.
* trans/hello.c: Likewise.
* trans/mtab.c: Likewise.
* trans/new-fifo.c: Likewise.
* trans/null.c: Likewise.
* trans/proxy-defpager.c: Likewise.
* trans/streamio.c: Likewise.

66 files changed, 106 insertions, 106 deletions

diff --git a/boot/boot.c b/boot/boot.c
index 22319757..88d55c63 100644
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -1393,7 +1393,7 @@ kern_return_t
 S_io_write (mach_port_t object,
 	    mach_port_t reply_port,
 	    mach_msg_type_name_t reply_type,
-	    char *data,
+	    data_t data,
 	    mach_msg_type_number_t datalen,
 	    off_t offset,
 	    mach_msg_type_number_t *amtwritten)
@@ -1418,7 +1418,7 @@ kern_return_t
 S_io_read (mach_port_t object,
 	   mach_port_t reply_port,
 	   mach_msg_type_name_t reply_type,
-	   char **data,
+	   data_t *data,
 	   mach_msg_type_number_t *datalen,
 	   off_t offset,
 	   mach_msg_type_number_t amount)
diff --git a/console-client/trans.c b/console-client/trans.c
index 69026b16..a636b3f5 100644
--- a/console-client/trans.c
+++ b/console-client/trans.c
@@ -575,7 +575,7 @@ netfs_attempt_write (struct iouser *cred, struct node *np,
 
 error_t
 netfs_S_io_read (struct protid *user,
-		 char **data,
+		 data_t *data,
 		 mach_msg_type_number_t *datalen,
 		 off_t offset,
 		 mach_msg_type_number_t amount)
@@ -594,7 +594,7 @@ netfs_S_io_read (struct protid *user,
 
 error_t
 netfs_S_io_write (struct protid *user,
-		  char *data,
+		  data_t data,
 		  mach_msg_type_number_t datalen,
 		  off_t offset,
 		  mach_msg_type_number_t *amount)
diff --git a/exec/exec.c b/exec/exec.c
index 3b4978d2..617dc8e8 100644
--- a/exec/exec.c
+++ b/exec/exec.c
@@ -1541,8 +1541,8 @@ S_exec_exec (struct trivfs_protid *protid,
 	     file_t file,
 	     task_t oldtask,
 	     int flags,
-	     char *argv, mach_msg_type_number_t argvlen, boolean_t argv_copy,
-	     char *envp, mach_msg_type_number_t envplen, boolean_t envp_copy,
+	     data_t argv, mach_msg_type_number_t argvlen, boolean_t argv_copy,
+	     data_t 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,
@@ -1667,8 +1667,8 @@ S_exec_startup_get_info (struct bootinfo *boot,
 			 vm_address_t *phdr_data, vm_size_t *phdr_size,
 			 vm_address_t *stack_base, vm_size_t *stack_size,
 			 int *flags,
-			 char **argvp, mach_msg_type_number_t *argvlen,
-			 char **envpp, mach_msg_type_number_t *envplen,
+			 data_t *argvp, mach_msg_type_number_t *argvlen,
+			 data_t *envpp, mach_msg_type_number_t *envplen,
 			 mach_port_t **dtable,
 			 mach_msg_type_name_t *dtablepoly,
 			 mach_msg_type_number_t *dtablesize,
diff --git a/ext2fs/storeinfo.c b/ext2fs/storeinfo.c
index d9a2be81..40e0f603 100644
--- a/ext2fs/storeinfo.c
+++ b/ext2fs/storeinfo.c
@@ -32,7 +32,7 @@ diskfs_S_file_get_storage_info (struct protid *cred,
 				int **ints, mach_msg_type_number_t *num_ints,
 				off_t **offsets,
 				mach_msg_type_number_t *num_offsets,
-				char **data, mach_msg_type_number_t *data_len)
+				data_t *data, mach_msg_type_number_t *data_len)
 {
   error_t err = 0;
   unsigned num_fs_blocks;
diff --git a/fatfs/inode.c b/fatfs/inode.c
index e92922f6..e2838af8 100644
--- a/fatfs/inode.c
+++ b/fatfs/inode.c
@@ -553,7 +553,7 @@ diskfs_S_file_get_storage_info (struct protid *cred,
 				int **ints, mach_msg_type_number_t *num_ints,
 				loff_t **offsets,
 				mach_msg_type_number_t *num_offsets,
-				char **data, mach_msg_type_number_t *data_len)
+				data_t *data, mach_msg_type_number_t *data_len)
 {
   /* XXX */
   return EOPNOTSUPP;
diff --git a/fatfs/main.c b/fatfs/main.c
index f0b3aa88..b3836f6f 100644
--- a/fatfs/main.c
+++ b/fatfs/main.c
@@ -275,7 +275,7 @@ diskfs_S_fsys_getfile (struct diskfs_control *pt,
                       mach_port_t reply, mach_msg_type_name_t reply_type,
                       uid_t *uids, mach_msg_type_number_t nuids,
                       gid_t *gids, mach_msg_type_number_t ngids,
-                      char *handle, mach_msg_type_number_t handle_len,
+                      data_t handle, mach_msg_type_number_t handle_len,
                       mach_port_t *file, mach_msg_type_name_t *file_type)
 {
   return EOPNOTSUPP;
diff --git a/isofs/inode.c b/isofs/inode.c
index 0783385f..70fcd87e 100644
--- a/isofs/inode.c
+++ b/isofs/inode.c
@@ -425,7 +425,7 @@ diskfs_S_file_get_storage_info (struct protid *cred,
 				int **ints, mach_msg_type_number_t *num_ints,
 				off_t **offsets,
 				mach_msg_type_number_t *num_offsets,
-				char **data, mach_msg_type_number_t *data_len)
+				data_t *data, mach_msg_type_number_t *data_len)
 {
   /* XXX */
   return EOPNOTSUPP;
diff --git a/libdiskfs/boot-start.c b/libdiskfs/boot-start.c
index ce999db1..a93a6227 100644
--- a/libdiskfs/boot-start.c
+++ b/libdiskfs/boot-start.c
@@ -311,7 +311,7 @@ diskfs_start_bootstrap ()
   printf (" %s", basename (exec_argv));
   fflush (stdout);
   err = exec_exec (diskfs_exec, startup_pt, MACH_MSG_TYPE_COPY_SEND,
-		   newt, 0, exec_argv, exec_argvlen, exec_env, exec_envlen,
+		   newt, 0, (data_t)exec_argv, exec_argvlen, (data_t)exec_env, exec_envlen,
 		   fdarray, MACH_MSG_TYPE_COPY_SEND, 3,
 		   portarray, MACH_MSG_TYPE_COPY_SEND, INIT_PORT_MAX,
 		   /* Supply no intarray, since we have no info for it.
@@ -337,9 +337,9 @@ diskfs_S_exec_startup_get_info (struct bootinfo *upt,
 				vm_address_t *base_addr,
 				vm_size_t *stack_size,
 				int *flags,
-				char **argvP,
+				data_t *argvP,
 				mach_msg_type_number_t *argvlen,
-				char **envpP __attribute__ ((unused)),
+				data_t *envpP __attribute__ ((unused)),
 				mach_msg_type_number_t *envplen,
 				mach_port_t **dtableP,
 				mach_msg_type_name_t *dtablepoly,
diff --git a/libdiskfs/dir-readdir.c b/libdiskfs/dir-readdir.c
index bda0bd97..2a62b367 100644
--- a/libdiskfs/dir-readdir.c
+++ b/libdiskfs/dir-readdir.c
@@ -25,7 +25,7 @@
 
 kern_return_t
 diskfs_S_dir_readdir (struct protid *cred,
-		      char **data,
+		      data_t *data,
 		      size_t *datacnt,
 		      boolean_t *data_dealloc,
 		      int entry,
diff --git a/libdiskfs/file-exec.c b/libdiskfs/file-exec.c
index 3e830161..f5939647 100644
--- a/libdiskfs/file-exec.c
+++ b/libdiskfs/file-exec.c
@@ -33,9 +33,9 @@ kern_return_t
 diskfs_S_file_exec (struct protid *cred,
 		    task_t task,
 		    int flags,
-		    char *argv,
+		    data_t argv,
 		    size_t argvlen,
-		    char *envp,
+		    data_t envp,
 		    size_t envplen,
 		    mach_port_t *fds,
 		    size_t fdslen,
diff --git a/libdiskfs/file-get-fs-opts.c b/libdiskfs/file-get-fs-opts.c
index d7593118..71d388f4 100644
--- a/libdiskfs/file-get-fs-opts.c
+++ b/libdiskfs/file-get-fs-opts.c
@@ -27,7 +27,7 @@
 
 error_t
 diskfs_S_file_get_fs_options (struct protid *cred,
-			      char **data, size_t *data_len)
+			      data_t *data, size_t *data_len)
 {
   error_t err;
   char *argz = 0;
diff --git a/libdiskfs/file-get-trans.c b/libdiskfs/file-get-trans.c
index be07605c..c5e495fc 100644
--- a/libdiskfs/file-get-trans.c
+++ b/libdiskfs/file-get-trans.c
@@ -24,7 +24,7 @@
 /* Implement file_get_translator as described in <hurd/fs.defs>. */
 kern_return_t
 diskfs_S_file_get_translator (struct protid *cred,
-			      char **trans,
+			      data_t *trans,
 			      size_t *translen)
 {
   struct node *np;
diff --git a/libdiskfs/file-getfh.c b/libdiskfs/file-getfh.c
index ce5c1998..291a70c3 100644
--- a/libdiskfs/file-getfh.c
+++ b/libdiskfs/file-getfh.c
@@ -26,7 +26,7 @@
 
 /* Return an NFS file handle for CRED in FH & FN_LEN.  */
 error_t
-diskfs_S_file_getfh (struct protid *cred, char **fh, size_t *fh_len)
+diskfs_S_file_getfh (struct protid *cred, data_t *fh, size_t *fh_len)
 {
   struct node *node;
   union diskfs_fhandle *f;
diff --git a/libdiskfs/file-set-trans.c b/libdiskfs/file-set-trans.c
index c71cb61a..4bcb918d 100644
--- a/libdiskfs/file-set-trans.c
+++ b/libdiskfs/file-set-trans.c
@@ -28,7 +28,7 @@ diskfs_S_file_set_translator (struct protid *cred,
 			      int passive_flags,
 			      int active_flags,
 			      int killtrans_flags,
-			      char *passive,
+			      data_t passive,
 			      size_t passivelen,
 			      fsys_t active)
 {
diff --git a/libdiskfs/fsys-forward.c b/libdiskfs/fsys-forward.c
index 87441573..0b88455c 100644
--- a/libdiskfs/fsys-forward.c
+++ b/libdiskfs/fsys-forward.c
@@ -31,7 +31,7 @@
 error_t
 diskfs_S_fsys_forward (mach_port_t server,
 		       mach_port_t reply, mach_msg_type_name_t reply_type,
-		       mach_port_t requestor, char *argz, size_t argz_len)
+		       mach_port_t requestor, data_t argz, size_t argz_len)
 {
   return EOPNOTSUPP;
 }
diff --git a/libdiskfs/fsys-getfile.c b/libdiskfs/fsys-getfile.c
index e4dbe365..fa242c5e 100644
--- a/libdiskfs/fsys-getfile.c
+++ b/libdiskfs/fsys-getfile.c
@@ -31,7 +31,7 @@ diskfs_S_fsys_getfile (struct diskfs_control *pt,
 		       mach_port_t reply, mach_msg_type_name_t reply_type,
 		       uid_t *uids, mach_msg_type_number_t nuids,
 		       gid_t *gids, mach_msg_type_number_t ngids,
-		       char *handle, mach_msg_type_number_t handle_len,
+		       data_t handle, mach_msg_type_number_t handle_len,
 		       mach_port_t *file, mach_msg_type_name_t *file_type)
 {
   int flags;
diff --git a/libdiskfs/fsys-options.c b/libdiskfs/fsys-options.c
index 61148823..8610fe50 100644
--- a/libdiskfs/fsys-options.c
+++ b/libdiskfs/fsys-options.c
@@ -50,7 +50,7 @@ kern_return_t
 diskfs_S_fsys_set_options (struct diskfs_control *pt,
 			   mach_port_t reply,
 			   mach_msg_type_name_t replytype,
-			   char *data, mach_msg_type_number_t len,
+			   data_t data, mach_msg_type_number_t len,
 			   int do_children)
 {
   error_t err = 0;
@@ -81,7 +81,7 @@ error_t
 diskfs_S_fsys_get_options (struct diskfs_control *port,
 			   mach_port_t reply,
 			   mach_msg_type_name_t replytype,
-			   char **data, mach_msg_type_number_t *data_len)
+			   data_t *data, mach_msg_type_number_t *data_len)
 {
   char *argz = 0;
   size_t argz_len = 0;
diff --git a/libdiskfs/io-read.c b/libdiskfs/io-read.c
index c849434b..71803517 100644
--- a/libdiskfs/io-read.c
+++ b/libdiskfs/io-read.c
@@ -22,7 +22,7 @@
 /* Implement io_read as described in <hurd/io.defs>. */
 kern_return_t
 diskfs_S_io_read (struct protid *cred,
-		  char **data,
+		  data_t *data,
 		  mach_msg_type_number_t *datalen,
 		  off_t offset,
 		  mach_msg_type_number_t maxread)
diff --git a/libdiskfs/io-write.c b/libdiskfs/io-write.c
index f3e191b6..ef5224d6 100644
--- a/libdiskfs/io-write.c
+++ b/libdiskfs/io-write.c
@@ -22,7 +22,7 @@
 /* Implement io_write as described in <hurd/io.defs>. */
 kern_return_t
 diskfs_S_io_write (struct protid *cred,
-		   char *data,
+		   data_t data,
 		   mach_msg_type_number_t datalen,
 		   off_t offset,
 		   mach_msg_type_number_t *amt)
diff --git a/libnetfs/dir-readdir.c b/libnetfs/dir-readdir.c
index 4ab03d8a..3d40dfa5 100644
--- a/libnetfs/dir-readdir.c
+++ b/libnetfs/dir-readdir.c
@@ -25,7 +25,7 @@
 
 error_t
 netfs_S_dir_readdir (struct protid *user,
-		     char **data,
+		     data_t *data,
 		     mach_msg_type_number_t *datacnt,
 		     boolean_t *data_dealloc,
 		     int entry,
diff --git a/libnetfs/file-exec.c b/libnetfs/file-exec.c
index 8153b1f4..0f0f2864 100644
--- a/libnetfs/file-exec.c
+++ b/libnetfs/file-exec.c
@@ -35,9 +35,9 @@ kern_return_t
 netfs_S_file_exec (struct protid *cred,
 		   task_t task,
 		   int flags,
-		   char *argv,
+		   data_t argv,
 		   size_t argvlen,
-		   char *envp,
+		   data_t envp,
 		   size_t envplen,
 		   mach_port_t *fds,
 		   size_t fdslen,
diff --git a/libnetfs/file-get-fs-options.c b/libnetfs/file-get-fs-options.c
index a8029916..7f759cc0 100644
--- a/libnetfs/file-get-fs-options.c
+++ b/libnetfs/file-get-fs-options.c
@@ -31,7 +31,7 @@
 /* Implement file_get_fs_options as described in <hurd/fs.defs>. */
 error_t
 netfs_S_file_get_fs_options (struct protid *user,
-			     char **data, mach_msg_type_number_t *data_len)
+			     data_t *data, mach_msg_type_number_t *data_len)
 {
   error_t err;
   char *argz = 0;
diff --git a/libnetfs/file-get-storage-info.c b/libnetfs/file-get-storage-info.c
index d2c9d8fc..18e9aa34 100644
--- a/libnetfs/file-get-storage-info.c
+++ b/libnetfs/file-get-storage-info.c
@@ -29,7 +29,7 @@ netfs_S_file_get_storage_info (struct protid *user,
 			       int **ints, mach_msg_type_number_t *num_ints,
 			       off_t **offsets,
 			       mach_msg_type_number_t *num_offsets,
-			       char **data, mach_msg_type_number_t *data_len)
+			       data_t *data, mach_msg_type_number_t *data_len)
 {
   error_t err;
 
diff --git a/libnetfs/file-get-translator.c b/libnetfs/file-get-translator.c
index fb23226e..635653de 100644
--- a/libnetfs/file-get-translator.c
+++ b/libnetfs/file-get-translator.c
@@ -28,7 +28,7 @@
 
 error_t
 netfs_S_file_get_translator (struct protid *user,
-			     char **trans,
+			     data_t *trans,
 			     mach_msg_type_number_t *translen)
 {
   struct node *np;
diff --git a/libnetfs/file-set-translator.c b/libnetfs/file-set-translator.c
index 5b2383b8..c73c0376 100644
--- a/libnetfs/file-set-translator.c
+++ b/libnetfs/file-set-translator.c
@@ -28,7 +28,7 @@
 error_t
 netfs_S_file_set_translator (struct protid *user,
 			     int passive_flags, int active_flags,
-			     int killtrans_flags, char *passive,
+			     int killtrans_flags, data_t passive,
 			     mach_msg_type_number_t passivelen,
 			     mach_port_t active)
 {
diff --git a/libnetfs/fsstubs.c b/libnetfs/fsstubs.c
index b260f5da..dffdad16 100644
--- a/libnetfs/fsstubs.c
+++ b/libnetfs/fsstubs.c
@@ -32,7 +32,7 @@ netfs_S_file_notice_changes (struct protid *user,
 
 error_t __attribute__((weak))
 netfs_S_file_getfh (struct protid *user,
-		    char **data, mach_msg_type_number_t *ndata)
+		    data_t *data, mach_msg_type_number_t *ndata)
 {
   return EOPNOTSUPP;
 }
diff --git a/libnetfs/fsys-get-options.c b/libnetfs/fsys-get-options.c
index 836806b2..ee333813 100644
--- a/libnetfs/fsys-get-options.c
+++ b/libnetfs/fsys-get-options.c
@@ -34,7 +34,7 @@ error_t
 netfs_S_fsys_get_options (struct netfs_control *port,
 			  mach_port_t reply,
 			  mach_msg_type_name_t reply_type,
-			  char **data, mach_msg_type_number_t *data_len)
+			  data_t *data, mach_msg_type_number_t *data_len)
 {
   error_t err;
   char *argz = 0;
diff --git a/libnetfs/fsys-set-options.c b/libnetfs/fsys-set-options.c
index afa480f8..7fa5e5ac 100644
--- a/libnetfs/fsys-set-options.c
+++ b/libnetfs/fsys-set-options.c
@@ -50,7 +50,7 @@ error_t
 netfs_S_fsys_set_options (struct netfs_control *pt,
 			  mach_port_t reply,
 			  mach_msg_type_name_t reply_type,
-			  char *data, mach_msg_type_number_t data_len,
+			  data_t data, mach_msg_type_number_t data_len,
 			  int do_children)
 {
   error_t err = 0;
diff --git a/libnetfs/fsysstubs.c b/libnetfs/fsysstubs.c
index 6cf12cc8..91e05cf0 100644
--- a/libnetfs/fsysstubs.c
+++ b/libnetfs/fsysstubs.c
@@ -28,7 +28,7 @@ netfs_S_fsys_getfile (struct netfs_control *cntl,
 		      mach_msg_type_name_t reply_type,
 		      uid_t *uids, mach_msg_type_number_t nuids,
 		      gid_t *gids, mach_msg_type_number_t ngids,
-		      char *handle, mach_msg_type_number_t handlelen,
+		      data_t handle, mach_msg_type_number_t handlelen,
 		      mach_port_t *file, mach_msg_type_name_t *filetype)
 {
   return EOPNOTSUPP;
@@ -59,7 +59,7 @@ netfs_S_fsys_forward (mach_port_t cntl,
 		      mach_port_t reply,
 		      mach_msg_type_name_t reply_type,
 		      mach_port_t request,
-		      char *argv, mach_msg_type_number_t argvlen)
+		      data_t argv, mach_msg_type_number_t argvlen)
 {
   return EOPNOTSUPP;
 }
diff --git a/libnetfs/io-read.c b/libnetfs/io-read.c
index 0ce75db1..2427ce6c 100644
--- a/libnetfs/io-read.c
+++ b/libnetfs/io-read.c
@@ -25,7 +25,7 @@
 
 error_t
 netfs_S_io_read (struct protid *user,
-		 char **data,
+		 data_t *data,
 		 mach_msg_type_number_t *datalen,
 		 off_t offset,
 		 mach_msg_type_number_t amount)
diff --git a/libnetfs/io-write.c b/libnetfs/io-write.c
index 19bcf09c..20769df8 100644
--- a/libnetfs/io-write.c
+++ b/libnetfs/io-write.c
@@ -24,7 +24,7 @@
 
 error_t
 netfs_S_io_write (struct protid *user,
-		  char *data,
+		  data_t data,
 		  mach_msg_type_number_t datalen,
 		  off_t offset,
 		  mach_msg_type_number_t *amount)
diff --git a/libtrivfs/dir-readdir.c b/libtrivfs/dir-readdir.c
index f1176f07..38710235 100644
--- a/libtrivfs/dir-readdir.c
+++ b/libtrivfs/dir-readdir.c
@@ -20,7 +20,7 @@
 kern_return_t
 trivfs_S_dir_readdir (struct trivfs_protid *cred,
 		      mach_port_t reply, mach_msg_type_name_t reply_type,
-		      char **data,
+		      data_t *data,
 		      size_t *datalen,
 		      boolean_t *data_dealloc,
 		      int entry,
diff --git a/libtrivfs/file-get-fs-options.c b/libtrivfs/file-get-fs-options.c
index 3c8bbca1..e3e033e6 100644
--- a/libtrivfs/file-get-fs-options.c
+++ b/libtrivfs/file-get-fs-options.c
@@ -28,7 +28,7 @@ error_t
 trivfs_S_file_get_fs_options (struct trivfs_protid *cred,
 			      mach_port_t reply,
 			      mach_msg_type_name_t reply_type,
-			      char **data, mach_msg_type_number_t *len)
+			      data_t *data, mach_msg_type_number_t *len)
 {
   error_t err;
   char *argz = 0;
diff --git a/libtrivfs/file-get-storage-info.c b/libtrivfs/file-get-storage-info.c
index 60fdc989..a4a44bb2 100644
--- a/libtrivfs/file-get-storage-info.c
+++ b/libtrivfs/file-get-storage-info.c
@@ -28,7 +28,7 @@ trivfs_S_file_get_storage_info (struct trivfs_protid *cred,
 				int **ints, mach_msg_type_number_t *num_ints,
 				off_t **offsets,
 				mach_msg_type_number_t *num_offsets,
-				char **data, mach_msg_type_number_t *data_len)
+				data_t *data, mach_msg_type_number_t *data_len)
 {
   return EOPNOTSUPP;
 }
diff --git a/libtrivfs/file-get-trans.c b/libtrivfs/file-get-trans.c
index 69de4532..66cc1cd8 100644
--- a/libtrivfs/file-get-trans.c
+++ b/libtrivfs/file-get-trans.c
@@ -22,7 +22,7 @@ kern_return_t
 trivfs_S_file_get_translator (struct trivfs_protid *cred,
 			      mach_port_t reply,
 			      mach_msg_type_name_t reply_type,
-			      char **trans, size_t *translen)
+			      data_t *trans, size_t *translen)
 {
   return EOPNOTSUPP;
 }
diff --git a/libtrivfs/file-getfh.c b/libtrivfs/file-getfh.c
index d585936e..ce2c3f60 100644
--- a/libtrivfs/file-getfh.c
+++ b/libtrivfs/file-getfh.c
@@ -21,7 +21,7 @@
 kern_return_t
 trivfs_S_file_getfh (struct trivfs_protid *cred,
 		     mach_port_t reply, mach_msg_type_name_t reply_type,
-		     char **data, size_t *datalen)
+		     data_t *data, size_t *datalen)
 {
   return EOPNOTSUPP;
 }
diff --git a/libtrivfs/file-set-trans.c b/libtrivfs/file-set-trans.c
index 47a7f7c4..5a011184 100644
--- a/libtrivfs/file-set-trans.c
+++ b/libtrivfs/file-set-trans.c
@@ -25,7 +25,7 @@ trivfs_S_file_set_translator (struct trivfs_protid *cred,
 			      int actflags,
 			      int passflags,
 			      int oldtransflags,
-			      char *trans,
+			      data_t trans,
 			      size_t translen,
 			      mach_port_t existing)
 {
diff --git a/libtrivfs/fsys-forward.c b/libtrivfs/fsys-forward.c
index 8f92d454..f1480d16 100644
--- a/libtrivfs/fsys-forward.c
+++ b/libtrivfs/fsys-forward.c
@@ -33,7 +33,7 @@ trivfs_S_fsys_forward (mach_port_t server,
 		       mach_port_t reply,
 		       mach_msg_type_name_t replytype,
 		       mach_port_t requestor,
-		       char *argz, size_t argz_len)
+		       data_t argz, size_t argz_len)
 {
   return EOPNOTSUPP;
 }
diff --git a/libtrivfs/fsys-get-options.c b/libtrivfs/fsys-get-options.c
index 8030435c..37247035 100644
--- a/libtrivfs/fsys-get-options.c
+++ b/libtrivfs/fsys-get-options.c
@@ -27,7 +27,7 @@
 error_t
 trivfs_S_fsys_get_options (struct trivfs_control *fsys,
 			   mach_port_t reply, mach_msg_type_name_t reply_type,
-			   char **data, mach_msg_type_number_t *len)
+			   data_t *data, mach_msg_type_number_t *len)
 {
   error_t err;
   char *argz = 0;
diff --git a/libtrivfs/fsys-set-options.c b/libtrivfs/fsys-set-options.c
index 135bc746..033f5dcc 100644
--- a/libtrivfs/fsys-set-options.c
+++ b/libtrivfs/fsys-set-options.c
@@ -26,7 +26,7 @@
 error_t
 trivfs_S_fsys_set_options (struct trivfs_control *cntl,
 			   mach_port_t reply, mach_msg_type_name_t reply_type,
-			   char *data, mach_msg_type_number_t len,
+			   data_t data, mach_msg_type_number_t len,
 			   int do_children)
 {
   if (cntl)
diff --git a/libtrivfs/fsys-stubs.c b/libtrivfs/fsys-stubs.c
index 44d411cc..96b3d122 100644
--- a/libtrivfs/fsys-stubs.c
+++ b/libtrivfs/fsys-stubs.c
@@ -63,7 +63,7 @@ trivfs_S_fsys_getfile (struct trivfs_control *cntl,
 		       size_t ngenuids,
 		       uid_t *gengids,
 		       size_t ngengids,
-		       char *handle,
+		       data_t handle,
 		       size_t handlesize,
 		       mach_port_t *file,
 		       mach_msg_type_name_t *filetype)
diff --git a/libtrivfs/io-read.c b/libtrivfs/io-read.c
index cd8e2d8b..a911f778 100644
--- a/libtrivfs/io-read.c
+++ b/libtrivfs/io-read.c
@@ -23,7 +23,7 @@ kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply,
 		  mach_msg_type_name_t replytype,
-		  char **data,
+		  data_t *data,
 		  mach_msg_type_number_t *datalen,
 		  off_t off,
 		  mach_msg_type_number_t amt)
diff --git a/libtrivfs/io-write.c b/libtrivfs/io-write.c
index d5b32524..31e05548 100644
--- a/libtrivfs/io-write.c
+++ b/libtrivfs/io-write.c
@@ -24,7 +24,7 @@ kern_return_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply,
 		   mach_msg_type_name_t replytype,
-		   char *data,
+		   data_t data,
 		   mach_msg_type_number_t datalen,
 		   off_t off,
 		   mach_msg_type_number_t *amt)
diff --git a/pfinet/io-ops.c b/pfinet/io-ops.c
index ddda1110..e0e1875b 100644
--- a/pfinet/io-ops.c
+++ b/pfinet/io-ops.c
@@ -36,7 +36,7 @@
 
 error_t
 S_io_write (struct sock_user *user,
-	    char *data,
+	    data_t data,
 	    size_t datalen,
 	    off_t offset,
 	    mach_msg_type_number_t *amount)
@@ -69,7 +69,7 @@ S_io_write (struct sock_user *user,
 
 error_t
 S_io_read (struct sock_user *user,
-	   char **data,
+	   data_t *data,
 	   size_t *datalen,
 	   off_t offset,
 	   mach_msg_type_number_t amount)
diff --git a/pfinet/pfinet-ops.c b/pfinet/pfinet-ops.c
index 6724575c..5db66978 100644
--- a/pfinet/pfinet-ops.c
+++ b/pfinet/pfinet-ops.c
@@ -42,7 +42,7 @@ extern int dev_ifconf(char *arg);
 error_t
 S_pfinet_siocgifconf (io_t port,
 		      vm_size_t amount,
-		      char **ifr,
+		      data_t *ifr,
 		      mach_msg_type_number_t *len)
 {
   error_t err = 0;
diff --git a/pfinet/socket-ops.c b/pfinet/socket-ops.c
index c7686026..71b458c8 100644
--- a/pfinet/socket-ops.c
+++ b/pfinet/socket-ops.c
@@ -292,7 +292,7 @@ S_socket_connect2 (struct sock_user *user1,
 error_t
 S_socket_create_address (mach_port_t server,
 			 int sockaddr_type,
-			 char *data,
+			 data_t data,
 			 mach_msg_type_number_t data_len,
 			 mach_port_t *addr_port,
 			 mach_msg_type_name_t *addr_port_type)
@@ -337,7 +337,7 @@ S_socket_fabricate_address (mach_port_t server,
 error_t
 S_socket_whatis_address (struct sock_addr *addr,
 			 int *type,
-			 char **data,
+			 data_t *data,
 			 mach_msg_type_number_t *datalen)
 {
   if (!addr)
@@ -374,7 +374,7 @@ error_t
 S_socket_getopt (struct sock_user *user,
 		 int level,
 		 int option,
-		 char **data,
+		 data_t *data,
 		 size_t *datalen)
 {
   error_t err;
@@ -403,7 +403,7 @@ error_t
 S_socket_setopt (struct sock_user *user,
 		 int level,
 		 int option,
-		 char *data,
+		 data_t data,
 		 size_t datalen)
 {
   error_t err;
@@ -430,11 +430,11 @@ error_t
 S_socket_send (struct sock_user *user,
 	       struct sock_addr *addr,
 	       int flags,
-	       char *data,
+	       data_t data,
 	       size_t datalen,
 	       mach_port_t *ports,
 	       size_t nports,
-	       char *control,
+	       data_t control,
 	       size_t controllen,
 	       mach_msg_type_number_t *amount)
 {
@@ -477,12 +477,12 @@ S_socket_recv (struct sock_user *user,
 	       mach_port_t *addrport,
 	       mach_msg_type_name_t *addrporttype,
 	       int flags,
-	       char **data,
+	       data_t *data,
 	       size_t *datalen,
 	       mach_port_t **ports,
 	       mach_msg_type_name_t *portstype,
 	       size_t *nports,
-	       char **control,
+	       data_t *control,
 	       size_t *controllen,
 	       int *outflags,
 	       mach_msg_type_number_t amount)
diff --git a/pfinet/tunnel.c b/pfinet/tunnel.c
index b57f8dbb..d140b657 100644
--- a/pfinet/tunnel.c
+++ b/pfinet/tunnel.c
@@ -290,7 +290,7 @@ void (*trivfs_protid_destroy_hook) (struct trivfs_protid *) = pi_destroy_hook;
 error_t
 trivfs_S_io_read (struct trivfs_protid *cred,
                   mach_port_t reply, mach_msg_type_name_t reply_type,
-                  char **data, mach_msg_type_number_t *data_len,
+                  data_t *data, mach_msg_type_number_t *data_len,
                   loff_t offs, size_t amount)
 {
   struct tunnel_device *tdev;
@@ -369,7 +369,7 @@ error_t
 trivfs_S_io_write (struct trivfs_protid *cred,
                    mach_port_t reply,
                    mach_msg_type_name_t replytype,
-                   char *data,
+                   data_t data,
                    mach_msg_type_number_t datalen,
                    off_t offset,
                    mach_msg_type_number_t *amount)
diff --git a/pflocal/io.c b/pflocal/io.c
index 2c23df4a..23e71ea4 100644
--- a/pflocal/io.c
+++ b/pflocal/io.c
@@ -43,7 +43,7 @@
    ignored.  The amount desired to be read is in amount.  */
 error_t
 S_io_read (struct sock_user *user,
-	   char **data, mach_msg_type_number_t *data_len,
+	   data_t *data, mach_msg_type_number_t *data_len,
 	   off_t offset, mach_msg_type_number_t amount)
 {
   error_t err;
@@ -79,7 +79,7 @@ S_io_read (struct sock_user *user,
    if they recevie more than one write when not prepared for it.  */
 error_t
 S_io_write (struct sock_user *user,
-	    char *data, mach_msg_type_number_t data_len,
+	    data_t data, mach_msg_type_number_t data_len,
 	    off_t offset, mach_msg_type_number_t *amount)
 {
   error_t err;
diff --git a/pflocal/pf.c b/pflocal/pf.c
index 55824d41..35b3d8c3 100644
--- a/pflocal/pf.c
+++ b/pflocal/pf.c
@@ -83,7 +83,7 @@ S_socket_create (mach_port_t pf,
 
 error_t
 S_socket_create_address (mach_port_t pf, int sockaddr_type,
-			 char *data, size_t data_len,
+			 data_t data, size_t data_len,
 			 mach_port_t *addr_port,
 			 mach_msg_type_name_t *addr_port_type)
 {
@@ -121,7 +121,7 @@ S_socket_fabricate_address (mach_port_t pf,
 error_t
 S_socket_whatis_address (struct addr *addr,
 			 int *sockaddr_type,
-			 char **sockaddr, size_t *sockaddr_len)
+			 data_t *sockaddr, size_t *sockaddr_len)
 {
   socklen_t addr_len = (offsetof (struct sockaddr, sa_data) + 1);
   
diff --git a/pflocal/socket.c b/pflocal/socket.c
index 0fcf4843..47ad037f 100644
--- a/pflocal/socket.c
+++ b/pflocal/socket.c
@@ -276,9 +276,9 @@ S_socket_peername (struct sock_user *user,
 /* Send data over a socket, possibly including Mach ports.  */
 error_t
 S_socket_send (struct sock_user *user, struct addr *dest_addr, int flags,
-	       char *data, size_t data_len,
+	       data_t data, size_t data_len,
 	       mach_port_t *ports, size_t num_ports,
-	       char *control, size_t control_len,
+	       data_t control, size_t control_len,
 	       size_t *amount)
 {
   error_t err = 0;
@@ -367,10 +367,10 @@ error_t
 S_socket_recv (struct sock_user *user,
 	       mach_port_t *addr, mach_msg_type_name_t *addr_type,
 	       int in_flags,
-	       char **data, size_t *data_len,
+	       data_t *data, size_t *data_len,
 	       mach_port_t **ports, mach_msg_type_name_t *ports_type,
 	       size_t *num_ports,
-	       char **control, size_t *control_len,
+	       data_t *control, size_t *control_len,
 	       int *out_flags, size_t amount)
 {
   error_t err;
@@ -431,7 +431,7 @@ S_socket_recv (struct sock_user *user,
 error_t
 S_socket_getopt (struct sock_user *user,
 		 int level, int opt,
-		 char **value, size_t *value_len)
+		 data_t *value, size_t *value_len)
 {
   int ret = 0;
 
@@ -488,7 +488,7 @@ S_socket_getopt (struct sock_user *user,
 
 error_t
 S_socket_setopt (struct sock_user *user,
-		 int level, int opt, char *value, size_t value_len)
+		 int level, int opt, data_t value, size_t value_len)
 {
   int ret = 0;
 
diff --git a/proc/info.c b/proc/info.c
index 0c77c622..f2e60114 100644
--- a/proc/info.c
+++ b/proc/info.c
@@ -379,7 +379,7 @@ get_string_array (task_t t,
 kern_return_t
 S_proc_getprocargs (struct proc *callerp,
 		  pid_t pid,
-		  char **buf,
+		  data_t *buf,
 		  size_t *buflen)
 {
   struct proc *p = pid_find (pid);
@@ -417,7 +417,7 @@ S_proc_getprocargs (struct proc *callerp,
 kern_return_t
 S_proc_getprocenv (struct proc *callerp,
 		 pid_t pid,
-		 char **buf,
+		 data_t *buf,
 		 size_t *buflen)
 {
   struct proc *p = pid_find (pid);
@@ -462,7 +462,7 @@ S_proc_getprocinfo (struct proc *callerp,
 		    int *flags,
 		    int **piarray,
 		    size_t *piarraylen,
-		    char **waits, mach_msg_type_number_t *waits_len)
+		    data_t *waits, mach_msg_type_number_t *waits_len)
 {
   struct proc *p = pid_find (pid);
   struct procinfo *pi;
diff --git a/startup/startup.c b/startup/startup.c
index fd16eb73..00d58989 100644
--- a/startup/startup.c
+++ b/startup/startup.c
@@ -1875,7 +1875,7 @@ S_fsys_getroot (mach_port_t fsys_t,
 
 error_t
 S_fsys_get_options (mach_port_t control,
-		    char **data, mach_msg_type_number_t *len)
+		    data_t *data, mach_msg_type_number_t *len)
 {
   /* XXX Implement me.  */
   return EOPNOTSUPP;
diff --git a/storeio/io.c b/storeio/io.c
index 2295615e..62bc514f 100644
--- a/storeio/io.c
+++ b/storeio/io.c
@@ -83,7 +83,7 @@ trivfs_S_io_map (struct trivfs_protid *cred,
 error_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
-		  char **data, mach_msg_type_number_t *data_len,
+		  data_t *data, mach_msg_type_number_t *data_len,
 		  loff_t offs, mach_msg_type_number_t amount)
 {
   if (! cred)
@@ -125,7 +125,7 @@ trivfs_S_io_readable (struct trivfs_protid *cred,
 error_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
-		   char *data, mach_msg_type_number_t data_len,
+		   data_t data, mach_msg_type_number_t data_len,
 		   loff_t offs, mach_msg_type_number_t *amount)
 {
   if (! cred)
@@ -314,7 +314,7 @@ trivfs_S_file_get_storage_info (struct trivfs_protid *cred,
 				int **ints, mach_msg_type_number_t *num_ints,
 				off_t **offsets,
 				mach_msg_type_number_t *num_offsets,
-				char **data, mach_msg_type_number_t *data_len)
+				data_t *data, mach_msg_type_number_t *data_len)
 {
   *ports_type = MACH_MSG_TYPE_COPY_SEND;
 
diff --git a/term/users.c b/term/users.c
index ff9888e1..1a3209c7 100644
--- a/term/users.c
+++ b/term/users.c
@@ -561,7 +561,7 @@ error_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply,
 		   mach_msg_type_name_t replytype,
-		   char *data,
+		   data_t data,
 		   size_t datalen,
 		   loff_t offset,
 		   size_t *amt)
@@ -639,14 +639,14 @@ error_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply,
 		  mach_msg_type_name_t replytype,
-		  char **data,
+		  data_t *data,
 		  size_t *datalen,
 		  loff_t offset,
 		  size_t amount)
 {
   int cancel;
   int i, max;
-  char *cp;
+  data_t cp;
   int avail;
 
   if (!cred)
diff --git a/tmpfs/node.c b/tmpfs/node.c
index c606f94e..02d213ed 100644
--- a/tmpfs/node.c
+++ b/tmpfs/node.c
@@ -609,7 +609,7 @@ diskfs_S_file_get_storage_info (struct protid *cred,
 				int **ints, mach_msg_type_number_t *num_ints,
 				off_t **offsets,
 				mach_msg_type_number_t *num_offsets,
-				char **data, mach_msg_type_number_t *data_len)
+				data_t *data, mach_msg_type_number_t *data_len)
 {
   mach_port_t memobj = diskfs_get_filemap (cred->po->np, VM_PROT_ALL);
   if (memobj == MACH_PORT_NULL)
diff --git a/trans/crash.c b/trans/crash.c
index aceebf07..68cde9a6 100644
--- a/trans/crash.c
+++ b/trans/crash.c
@@ -997,5 +997,5 @@ S_msg_report_wait (mach_port_t process, thread_t thread,
 error_t
 S_msg_describe_ports (mach_port_t msgport, mach_port_t refport,
 		      mach_port_t *ports, mach_msg_type_number_t nports,
-		      char **desc, mach_msg_type_number_t *desclen)
+		      data_t *desc, mach_msg_type_number_t *desclen)
 { return EBUSY; }
diff --git a/trans/fakeroot.c b/trans/fakeroot.c
index 64240f6b..7084d4a5 100644
--- a/trans/fakeroot.c
+++ b/trans/fakeroot.c
@@ -984,9 +984,9 @@ kern_return_t
 netfs_S_file_exec (struct protid *user,
                    task_t task,
                    int flags,
-                   char *argv,
+                   data_t argv,
                    size_t argvlen,
-                   char *envp,
+                   data_t envp,
                    size_t envplen,
                    mach_port_t *fds,
                    size_t fdslen,
diff --git a/trans/fifo.c b/trans/fifo.c
index ac31f495..326e9a1d 100644
--- a/trans/fifo.c
+++ b/trans/fifo.c
@@ -339,7 +339,7 @@ trivfs_S_io_map (struct trivfs_protid *cred,
 error_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
-		  char **data, size_t *data_len,
+		  data_t *data, size_t *data_len,
 		  off_t offs, size_t amount)
 {
   error_t err;
@@ -502,7 +502,7 @@ trivfs_S_io_select_timeout (struct trivfs_protid *cred,
 error_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
-		   char *data, size_t data_len,
+		   data_t data, size_t data_len,
 		   off_t offs, size_t *amount)
 {
   error_t err;
diff --git a/trans/firmlink.c b/trans/firmlink.c
index 1c656a6f..dba5e4ef 100644
--- a/trans/firmlink.c
+++ b/trans/firmlink.c
@@ -206,7 +206,7 @@ trivfs_goaway (struct trivfs_control *cntl, int flags)
 error_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
-		  char **data, mach_msg_type_number_t *data_len,
+		  data_t *data, mach_msg_type_number_t *data_len,
 		  loff_t offs, mach_msg_type_number_t amount)
 {
   error_t err = 0;
diff --git a/trans/hello-mt.c b/trans/hello-mt.c
index 44d54dea..92f814d6 100644
--- a/trans/hello-mt.c
+++ b/trans/hello-mt.c
@@ -124,7 +124,7 @@ close_hook (struct trivfs_peropen *peropen)
 error_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
-		  char **data, mach_msg_type_number_t *data_len,
+		  data_t *data, mach_msg_type_number_t *data_len,
 		  loff_t offs, mach_msg_type_number_t amount)
 {
   struct open *op;
diff --git a/trans/hello.c b/trans/hello.c
index d1884df1..f8f9e7ab 100644
--- a/trans/hello.c
+++ b/trans/hello.c
@@ -115,7 +115,7 @@ close_hook (struct trivfs_peropen *peropen)
 error_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
-		  char **data, mach_msg_type_number_t *data_len,
+		  data_t *data, mach_msg_type_number_t *data_len,
 		  loff_t offs, mach_msg_type_number_t amount)
 {
   struct open *op;
diff --git a/trans/mtab.c b/trans/mtab.c
index 794c07f4..f21377b7 100644
--- a/trans/mtab.c
+++ b/trans/mtab.c
@@ -640,7 +640,7 @@ close_hook (struct trivfs_peropen *peropen)
 error_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
-		  char **data, mach_msg_type_number_t *data_len,
+		  data_t *data, mach_msg_type_number_t *data_len,
 		  loff_t offs, mach_msg_type_number_t amount)
 {
   error_t err = 0;
diff --git a/trans/new-fifo.c b/trans/new-fifo.c
index efa36c24..f674837f 100644
--- a/trans/new-fifo.c
+++ b/trans/new-fifo.c
@@ -524,7 +524,7 @@ trivfs_S_io_map (struct trivfs_protid *cred,
 error_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
-		  char **data, size_t *data_len,
+		  data_t *data, size_t *data_len,
 		  off_t offs, size_t amount)
 {
   error_t err;
@@ -689,7 +689,7 @@ trivfs_S_io_select_timeout (struct trivfs_protid *cred,
 error_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
-		   char *data, size_t data_len,
+		   data_t data, size_t data_len,
 		   off_t offs, size_t *amount)
 {
   error_t err;
@@ -821,7 +821,7 @@ trivfs_S_fsys_forward (mach_port_t server,
 		       mach_port_t reply,
 		       mach_msg_type_name_t replytype,
 		       mach_port_t requestor,
-		       char *argz, size_t argz_len)
+		       data_t argz, size_t argz_len)
 {
   error_t err;
   struct fifo_trans *server_trans, *trans;
diff --git a/trans/null.c b/trans/null.c
index 92717ed8..5f7660f5 100644
--- a/trans/null.c
+++ b/trans/null.c
@@ -147,7 +147,7 @@ trivfs_S_io_map (struct trivfs_protid *cred,
 kern_return_t
 trivfs_S_io_read(struct trivfs_protid *cred,
 		 mach_port_t reply, mach_msg_type_name_t replytype,
-		 char **data,
+		 data_t *data,
 		 mach_msg_type_number_t *datalen,
 		 loff_t offs,
 		 mach_msg_type_number_t amt)
@@ -227,7 +227,7 @@ trivfs_S_io_select_timeout (struct trivfs_protid *cred,
 kern_return_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t replytype,
-		   char *data, mach_msg_type_number_t datalen,
+		   data_t data, mach_msg_type_number_t datalen,
 		   loff_t offs, mach_msg_type_number_t *amt)
 {
   if (!cred)
diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c
index e2b15ea8..1bb13b7d 100644
--- a/trans/proxy-defpager.c
+++ b/trans/proxy-defpager.c
@@ -167,7 +167,7 @@ trivfs_goaway (struct trivfs_control *fsys, int flags)
 kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t replytype,
-		  char **data,
+		  data_t *data,
 		  mach_msg_type_number_t *datalen,
 		  loff_t offs,
 		  mach_msg_type_number_t amt)
@@ -180,7 +180,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
 kern_return_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t replytype,
-		   char *data, mach_msg_type_number_t datalen,
+		   data_t data, mach_msg_type_number_t datalen,
 		   loff_t offs, mach_msg_type_number_t *amt)
 {
   if (!cred)
diff --git a/trans/streamio.c b/trans/streamio.c
index 84588248..44aabef1 100644
--- a/trans/streamio.c
+++ b/trans/streamio.c
@@ -481,7 +481,7 @@ trivfs_goaway (struct trivfs_control *fsys, int flags)
 error_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
-		  char **data, mach_msg_type_number_t *data_len,
+		  data_t *data, mach_msg_type_number_t *data_len,
 		  loff_t offs, mach_msg_type_number_t amount)
 {
   error_t err;
@@ -520,7 +520,7 @@ trivfs_S_io_readable (struct trivfs_protid *cred,
 error_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
-		   char *data, mach_msg_type_number_t data_len,
+		   data_t data, mach_msg_type_number_t data_len,
 		   loff_t offs, mach_msg_type_number_t *amount)
 {
   error_t err;