* 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-children.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-children.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-children.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/fs.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.
* trans/symlink.c: Likewise.
---
boot/boot.c | 4 ++--
console-client/trans.c | 4 ++--
exec/exec.c | 8 ++++----
ext2fs/storeinfo.c | 2 +-
fatfs/inode.c | 2 +-
fatfs/main.c | 2 +-
isofs/inode.c | 2 +-
libdiskfs/boot-start.c | 6 +++---
libdiskfs/dir-readdir.c | 2 +-
libdiskfs/file-exec.c | 4 ++--
libdiskfs/file-get-children.c | 2 +-
libdiskfs/file-get-fs-opts.c | 2 +-
libdiskfs/file-get-trans.c | 2 +-
libdiskfs/file-getfh.c | 2 +-
libdiskfs/file-set-trans.c | 2 +-
libdiskfs/fsys-forward.c | 2 +-
libdiskfs/fsys-getfile.c | 2 +-
libdiskfs/fsys-options.c | 4 ++--
libdiskfs/io-read.c | 2 +-
libdiskfs/io-write.c | 2 +-
libnetfs/dir-readdir.c | 2 +-
libnetfs/file-exec.c | 4 ++--
libnetfs/file-get-children.c | 2 +-
libnetfs/file-get-fs-options.c | 2 +-
libnetfs/file-get-storage-info.c | 2 +-
libnetfs/file-get-translator.c | 2 +-
libnetfs/file-set-translator.c | 2 +-
libnetfs/fsstubs.c | 2 +-
libnetfs/fsys-get-options.c | 2 +-
libnetfs/fsys-set-options.c | 2 +-
libnetfs/fsysstubs.c | 4 ++--
libnetfs/io-read.c | 2 +-
libnetfs/io-write.c | 2 +-
libtrivfs/dir-readdir.c | 2 +-
libtrivfs/file-get-children.c | 2 +-
libtrivfs/file-get-fs-options.c | 2 +-
libtrivfs/file-get-storage-info.c | 2 +-
libtrivfs/file-get-trans.c | 2 +-
libtrivfs/file-getfh.c | 2 +-
libtrivfs/file-set-trans.c | 2 +-
libtrivfs/fsys-forward.c | 2 +-
libtrivfs/fsys-get-options.c | 2 +-
libtrivfs/fsys-set-options.c | 2 +-
libtrivfs/fsys-stubs.c | 2 +-
libtrivfs/io-read.c | 2 +-
libtrivfs/io-write.c | 2 +-
pfinet/io-ops.c | 4 ++--
pfinet/pfinet-ops.c | 2 +-
pfinet/socket-ops.c | 16 ++++++++--------
pfinet/tunnel.c | 4 ++--
pflocal/fs.c | 18 +++++++++---------
pflocal/io.c | 4 ++--
pflocal/pf.c | 4 ++--
pflocal/socket.c | 12 ++++++------
proc/info.c | 6 +++---
startup/startup.c | 2 +-
storeio/io.c | 6 +++---
term/users.c | 6 +++---
tmpfs/node.c | 2 +-
trans/crash.c | 2 +-
trans/fakeroot.c | 4 ++--
trans/fifo.c | 4 ++--
trans/firmlink.c | 2 +-
trans/hello-mt.c | 2 +-
trans/hello.c | 2 +-
trans/mtab.c | 2 +-
trans/new-fifo.c | 6 +++---
trans/null.c | 4 ++--
trans/proxy-defpager.c | 4 ++--
trans/streamio.c | 4 ++--
trans/symlink.c | 8 ++++----
71 files changed, 122 insertions(+), 122 deletions(-)
diff --git a/boot/boot.c b/boot/boot.c
index 462243c..fd38335 100644
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -1342,7 +1342,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)
@@ -1367,7 +1367,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 224229e..a3331be 100644
--- a/console-client/trans.c
+++ b/console-client/trans.c
@@ -579,7 +579,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)
@@ -598,7 +598,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 3b63b7f..153866f 100644
--- a/exec/exec.c
+++ b/exec/exec.c
@@ -1410,8 +1410,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,
@@ -1496,8 +1496,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 d9a2be8..40e0f60 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 4f28d14..95e4150 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 00c56bc..e373113 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 eef2a6a..632f78d 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 0fb3e89..2e498d2 100644
--- a/libdiskfs/boot-start.c
+++ b/libdiskfs/boot-start.c
@@ -285,7 +285,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.
@@ -311,9 +311,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 bda0bd9..2a62b36 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 e544b14..daa2ed9 100644
--- a/libdiskfs/file-exec.c
+++ b/libdiskfs/file-exec.c
@@ -32,9 +32,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-children.c b/libdiskfs/file-get-children.c
index 98d5d60..e8b4a0b 100644
--- a/libdiskfs/file-get-children.c
+++ b/libdiskfs/file-get-children.c
@@ -29,7 +29,7 @@
CRED. */
error_t
diskfs_S_file_get_children (struct protid *cred,
- char **children,
+ data_t *children,
mach_msg_type_number_t *children_len)
{
error_t err;
diff --git a/libdiskfs/file-get-fs-opts.c b/libdiskfs/file-get-fs-opts.c
index d759311..71d388f 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 e6e994d..ce72bfa 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 e4bc892..afb7d3d 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 6e1a61d..b1cb77e 100644
--- a/libdiskfs/file-set-trans.c
+++ b/libdiskfs/file-set-trans.c
@@ -27,7 +27,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 8744157..0b88455 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 9dd5d73..d6098d7 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 b366d14..40215f9 100644
--- a/libdiskfs/fsys-options.c
+++ b/libdiskfs/fsys-options.c
@@ -31,7 +31,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;
@@ -84,7 +84,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 c849434..7180351 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 2967c4c..742645d 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 4ab03d8..3d40dfa 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 638f0ae..774d6d2 100644
--- a/libnetfs/file-exec.c
+++ b/libnetfs/file-exec.c
@@ -34,9 +34,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-children.c b/libnetfs/file-get-children.c
index e8ceddf..bb2f6d9 100644
--- a/libnetfs/file-get-children.c
+++ b/libnetfs/file-get-children.c
@@ -29,7 +29,7 @@
CRED. */
error_t
netfs_S_file_get_children (struct protid *cred,
- char **children,
+ data_t *children,
mach_msg_type_number_t *children_len)
{
error_t err;
diff --git a/libnetfs/file-get-fs-options.c b/libnetfs/file-get-fs-options.c
index a802991..7f759cc 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 d2c9d8f..18e9aa3 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 3a54ff1..39aa8ca 100644
--- a/libnetfs/file-get-translator.c
+++ b/libnetfs/file-get-translator.c
@@ -27,7 +27,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 02c5583..c20fafc 100644
--- a/libnetfs/file-set-translator.c
+++ b/libnetfs/file-set-translator.c
@@ -27,7 +27,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 75bd790..7f1f862 100644
--- a/libnetfs/fsstubs.c
+++ b/libnetfs/fsstubs.c
@@ -32,7 +32,7 @@ netfs_S_file_notice_changes (struct protid *user,
error_t
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 836806b..ee33381 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 fb1c87e..73988d0 100644
--- a/libnetfs/fsys-set-options.c
+++ b/libnetfs/fsys-set-options.c
@@ -34,7 +34,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 a64fd64..988ac71 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 0ce75db..2427ce6 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 19bcf09..20769df 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 f1176f0..3871023 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-children.c b/libtrivfs/file-get-children.c
index 4126119..3b3b7de 100644
--- a/libtrivfs/file-get-children.c
+++ b/libtrivfs/file-get-children.c
@@ -29,7 +29,7 @@ error_t
trivfs_S_file_get_children (struct trivfs_protid *cred,
mach_port_t reply,
mach_msg_type_name_t replyPoly,
- char **children,
+ data_t *children,
mach_msg_type_number_t *children_len)
{
return EOPNOTSUPP;
diff --git a/libtrivfs/file-get-fs-options.c b/libtrivfs/file-get-fs-options.c
index 3c8bbca..e3e033e 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 60fdc98..a4a44bb 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 69de453..66cc1cd 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 d585936..ce2c3f6 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 47a7f7c..5a01118 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 8f92d45..f1480d1 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 8030435..3724703 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 135bc74..033f5dc 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 313328a..b72a308 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 7dfdc19..fcff325 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 c479c55..ac1ca25 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 742d64f..a8d47da 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 6724575..5db6697 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 14b3120..b8c8ecf 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 02e9ee8..e69f065 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/fs.c b/pflocal/fs.c
index d77f00b..6ee9d21 100644
--- a/pflocal/fs.c
+++ b/pflocal/fs.c
@@ -74,7 +74,7 @@ S_dir_mkfile (struct sock_user *cred,
error_t
S_dir_readdir (struct sock_user *cred,
- char **data,
+ data_t *data,
size_t *datacnt,
boolean_t *data_dealloc,
int entry,
@@ -159,9 +159,9 @@ error_t
S_file_exec (struct sock_user *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,
@@ -179,7 +179,7 @@ S_file_exec (struct sock_user *cred,
error_t
S_file_get_children (struct sock_user *cred,
- char **children,
+ data_t *children,
mach_msg_type_number_t *children_len)
{
return EOPNOTSUPP;
@@ -194,13 +194,13 @@ S_file_getcontrol (struct sock_user *cred,
}
error_t
-S_file_getfh (struct sock_user *cred, char **fh, size_t *fh_len)
+S_file_getfh (struct sock_user *cred, data_t *fh, size_t *fh_len)
{
return EOPNOTSUPP;
}
error_t
-S_file_get_fs_options (struct sock_user *cred, char **data, size_t *data_len)
+S_file_get_fs_options (struct sock_user *cred, data_t *data, size_t *data_len)
{
return EOPNOTSUPP;
}
@@ -227,13 +227,13 @@ S_file_get_storage_info (struct sock_user *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;
}
error_t
-S_file_get_translator (struct sock_user *cred, char **trans, size_t *translen)
+S_file_get_translator (struct sock_user *cred, data_t *trans, size_t *translen)
{
return EOPNOTSUPP;
}
@@ -276,7 +276,7 @@ S_file_set_translator (struct sock_user *cred,
int passive_flags,
int active_flags,
int killtrans_flags,
- char *passive,
+ data_t passive,
size_t passivelen,
fsys_t active)
{
diff --git a/pflocal/io.c b/pflocal/io.c
index c562274..56bbb4a 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 55824d4..35b3d8c 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 f2b75a7..765b57d 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;
@@ -365,10 +365,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;
@@ -427,7 +427,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;
@@ -484,7 +484,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 0f5ca0f..601ee47 100644
--- a/proc/info.c
+++ b/proc/info.c
@@ -331,7 +331,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);
@@ -348,7 +348,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);
@@ -372,7 +372,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 f90b524..38c16b9 100644
--- a/startup/startup.c
+++ b/startup/startup.c
@@ -1692,7 +1692,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 2295615..62bc514 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 8151dc7..d25fc4d 100644
--- a/term/users.c
+++ b/term/users.c
@@ -563,7 +563,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)
@@ -641,14 +641,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 2a4489c..7cf1d10 100644
--- a/tmpfs/node.c
+++ b/tmpfs/node.c
@@ -607,7 +607,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 9279bab..6d5137f 100644
--- a/trans/crash.c
+++ b/trans/crash.c
@@ -802,5 +802,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 ad7bec9..8787559 100644
--- a/trans/fakeroot.c
+++ b/trans/fakeroot.c
@@ -827,9 +827,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 f52baba..84faf8e 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;
@@ -504,7 +504,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 19382f1..1149962 100644
--- a/trans/firmlink.c
+++ b/trans/firmlink.c
@@ -205,7 +205,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 44d54de..92f814d 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 d1884df..f8f9e7a 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 e0fcb46..2348291 100644
--- a/trans/mtab.c
+++ b/trans/mtab.c
@@ -688,7 +688,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 0ceb842..100f277 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;
@@ -691,7 +691,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;
@@ -823,7 +823,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 bd082dc..c5c12a0 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)
@@ -231,7 +231,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 e2b15ea..1bb13b7 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 16916f8..d18e561 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;
diff --git a/trans/symlink.c b/trans/symlink.c
index 845a112..68fa737 100644
--- a/trans/symlink.c
+++ b/trans/symlink.c
@@ -185,7 +185,7 @@ S_fsys_syncfs (mach_port_t control,
error_t
S_fsys_set_options (mach_port_t control,
- char *data, mach_msg_type_number_t len,
+ data_t data, mach_msg_type_number_t len,
int do_children)
{
return EOPNOTSUPP;
@@ -193,7 +193,7 @@ S_fsys_set_options (mach_port_t control,
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)
{
return EOPNOTSUPP;
}
@@ -202,7 +202,7 @@ error_t
S_fsys_getfile (mach_port_t control,
uid_t *uids, size_t nuids,
uid_t *gids, size_t ngids,
- char *handle, size_t handllen,
+ data_t handle, size_t handllen,
mach_port_t *pt,
mach_msg_type_name_t *pttype)
{
@@ -230,7 +230,7 @@ S_fsys_init (mach_port_t control,
error_t
S_fsys_forward (mach_port_t server, mach_port_t requestor,
- char *argz, size_t argz_len)
+ data_t argz, size_t argz_len)
{
return EOPNOTSUPP;
}
--
2.8.1
