12 files changed, 16 insertions, 16 deletions

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)