[PATCH 06/41] libtrivfs: Port to x86_64

[Sergey Bugaev]

---
 libtrivfs/file-get-trans.c   |  7 ++++---
 libtrivfs/file-getfh.c       |  2 +-
 libtrivfs/file-set-trans.c   |  2 +-
 libtrivfs/fsys-forward.c     |  3 ++-
 libtrivfs/fsys-getroot.c     |  6 ++++--
 libtrivfs/fsys-stubs.c       |  6 +++---
 libtrivfs/io-restrict-auth.c | 10 ++++++----
 7 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/libtrivfs/file-get-trans.c b/libtrivfs/file-get-trans.c
index 66cc1cd8..6733daaf 100644
--- a/libtrivfs/file-get-trans.c
+++ b/libtrivfs/file-get-trans.c
@@ -20,9 +20,10 @@
 
 kern_return_t
 trivfs_S_file_get_translator (struct trivfs_protid *cred,
-                             mach_port_t reply,
-                             mach_msg_type_name_t reply_type,
-                             data_t *trans, size_t *translen)
+                              mach_port_t reply,
+                              mach_msg_type_name_t reply_type,
+                              data_t *trans,
+                              mach_msg_type_name_t *translen)
 {
   return EOPNOTSUPP;
 }
diff --git a/libtrivfs/file-getfh.c b/libtrivfs/file-getfh.c
index ce2c3f60..932996de 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,
-                    data_t *data, size_t *datalen)
+                    data_t *data, mach_msg_type_number_t *datalen)
 {
   return EOPNOTSUPP;
 }
diff --git a/libtrivfs/file-set-trans.c b/libtrivfs/file-set-trans.c
index 02a679f0..2acc6d44 100644
--- a/libtrivfs/file-set-trans.c
+++ b/libtrivfs/file-set-trans.c
@@ -26,7 +26,7 @@ trivfs_S_file_set_translator (struct trivfs_protid *cred,
                              int passflags,
                              int oldtransflags,
                              const_data_t trans,
-                             size_t translen,
+                             mach_msg_type_number_t translen,
                              mach_port_t existing)
 {
   return EOPNOTSUPP;
diff --git a/libtrivfs/fsys-forward.c b/libtrivfs/fsys-forward.c
index 4e4e2703..a3be1849 100644
--- a/libtrivfs/fsys-forward.c
+++ b/libtrivfs/fsys-forward.c
@@ -33,7 +33,8 @@ trivfs_S_fsys_forward (mach_port_t server,
                       mach_port_t reply,
                       mach_msg_type_name_t replytype,
                       mach_port_t requestor,
-                      const_data_t argz, size_t argz_len)
+                      const_data_t argz,
+                      mach_msg_type_number_t argz_len)
 {
   return EOPNOTSUPP;
 }
diff --git a/libtrivfs/fsys-getroot.c b/libtrivfs/fsys-getroot.c
index cf44657c..7728318a 100644
--- a/libtrivfs/fsys-getroot.c
+++ b/libtrivfs/fsys-getroot.c
@@ -31,8 +31,10 @@ trivfs_S_fsys_getroot (struct trivfs_control *cntl,
                       mach_port_t reply_port,
                       mach_msg_type_name_t reply_port_type,
                       mach_port_t dotdot,
-                      const id_t *uids, size_t nuids,
-                      const id_t *gids, size_t ngids,
+                      const id_t *uids,
+                      mach_msg_type_number_t nuids,
+                      const id_t *gids,
+                      mach_msg_type_number_t ngids,
                       int flags,
                       retry_type *do_retry,
                       string_t retry_name,
diff --git a/libtrivfs/fsys-stubs.c b/libtrivfs/fsys-stubs.c
index 430ea382..4a9d823a 100644
--- a/libtrivfs/fsys-stubs.c
+++ b/libtrivfs/fsys-stubs.c
@@ -60,11 +60,11 @@ trivfs_S_fsys_getfile (struct trivfs_control *cntl,
                       mach_port_t reply,
                       mach_msg_type_name_t replytype,
                       const uid_t *genuids,
-                      size_t ngenuids,
+                      mach_msg_type_number_t ngenuids,
                       const uid_t *gengids,
-                      size_t ngengids,
+                      mach_msg_type_number_t ngengids,
                       const_data_t handle,
-                      size_t handlesize,
+                      mach_msg_type_number_t handlesize,
                       mach_port_t *file,
                       mach_msg_type_name_t *filetype)
 {
diff --git a/libtrivfs/io-restrict-auth.c b/libtrivfs/io-restrict-auth.c
index 38ab06a7..967efeeb 100644
--- a/libtrivfs/io-restrict-auth.c
+++ b/libtrivfs/io-restrict-auth.c
@@ -25,9 +25,9 @@
 
 /* Tell if the array LIST (of size N) contains a member equal to QUERY. */
 static inline int
-listmember (const uid_t *list, uid_t query, int n)
+listmember (const uid_t *list, uid_t query, mach_msg_type_number_t n)
 {
-  int i;
+  mach_msg_type_number_t i;
   for (i = 0; i < n; i++)
     if (list[i] == query)
       return 1;
@@ -40,8 +40,10 @@ trivfs_S_io_restrict_auth (struct trivfs_protid *cred,
                           mach_msg_type_name_t replytype,
                           mach_port_t *newport,
                           mach_msg_type_name_t *newporttype,
-                          const uid_t *uids, size_t nuids,
-                          const uid_t *gids, size_t ngids)
+                          const uid_t *uids,
+                          mach_msg_type_number_t nuids,
+                          const uid_t *gids,
+                          mach_msg_type_number_t ngids)
 {
   unsigned int i;
   error_t err;
-- 
2.40.1