[PATCH 01/41] libshouldbeinlibc: Port to x86_64

[Sergey Bugaev]

---
 libshouldbeinlibc/fsysops.c    |  2 +-
 libshouldbeinlibc/idvec-auth.c |  4 ++--
 libshouldbeinlibc/portinfo.c   | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libshouldbeinlibc/fsysops.c b/libshouldbeinlibc/fsysops.c
index dbcae672..eb04c397 100644
--- a/libshouldbeinlibc/fsysops.c
+++ b/libshouldbeinlibc/fsysops.c
@@ -49,7 +49,7 @@ fsys_get_readonly (fsys_t fsys, int *readonly)
 {
   error_t err;
   char _opts[200], *opts = _opts;
-  size_t opts_len = sizeof opts;
+  mach_msg_type_number_t opts_len = sizeof opts;
 
   err = fsys_get_options (fsys, &opts, &opts_len);
   if (! err)
diff --git a/libshouldbeinlibc/idvec-auth.c b/libshouldbeinlibc/idvec-auth.c
index 1858bd6a..09fe08ee 100644
--- a/libshouldbeinlibc/idvec-auth.c
+++ b/libshouldbeinlibc/idvec-auth.c
@@ -37,10 +37,10 @@ idvec_merge_auth (struct idvec *eff_uids, struct idvec 
*avail_uids,
   error_t err;
   uid_t eff_uid_buf[10], avail_uid_buf[20];
   uid_t *_eff_uids = eff_uid_buf, *_avail_uids = avail_uid_buf;
-  size_t num_eff_uids = 10, num_avail_uids = 20;
+  mach_msg_type_number_t num_eff_uids = 10, num_avail_uids = 20;
   uid_t eff_gid_buf[10], avail_gid_buf[20];
   uid_t *_eff_gids = eff_gid_buf, *_avail_gids = avail_gid_buf;
-  size_t num_eff_gids = 10, num_avail_gids = 20;
+  mach_msg_type_number_t num_eff_gids = 10, num_avail_gids = 20;
 
   err = auth_getids (auth,
                     &_eff_uids, &num_eff_uids, &_avail_uids, &num_avail_uids,
diff --git a/libshouldbeinlibc/portinfo.c b/libshouldbeinlibc/portinfo.c
index f2564a3a..0829c17c 100644
--- a/libshouldbeinlibc/portinfo.c
+++ b/libshouldbeinlibc/portinfo.c
@@ -62,7 +62,7 @@ print_port_info (mach_port_t name, mach_port_type_t type, 
task_t task,
       mach_port_urefs_t refs;
       error_t err = mach_port_get_refs (task, name, right, &refs);
       if (! err)
-       fprintf (stream, " (refs: %zu)", refs);
+       fprintf (stream, " (refs: %u)", refs);
     }
 
   if (type == 0)
@@ -303,12 +303,12 @@ print_port_info (mach_port_t name, mach_port_type_t type, 
task_t task,
 
              /* pci_t */
              {
-               vm_size_t ndevs;
+               mach_msg_type_number_t ndevs;
 
                err = pci_get_ndevs (port, &ndevs);
 
                if (!err)
-                 fprintf (stream, " pci(%d)", ndevs);
+                 fprintf (stream, " pci(%u)", ndevs);
              }
 
              /* process_t */
@@ -482,13 +482,13 @@ print_port_info (mach_port_t name, mach_port_type_t type, 
task_t task,
                fprintf (stream,
                         hex_names ? "port-set: %#x, " : "port-set: %u, ",
                         status.mps_pset);
-             fprintf (stream, "seqno: %zu", status.mps_seqno);
+             fprintf (stream, "seqno: %u", status.mps_seqno);
              if (status.mps_mscount)
-               fprintf (stream, ", ms-count: %zu", status.mps_mscount);
+               fprintf (stream, ", ms-count: %u", status.mps_mscount);
              if (status.mps_qlimit != MACH_PORT_QLIMIT_DEFAULT)
-               fprintf (stream, ", qlimit: %zu", status.mps_qlimit);
+               fprintf (stream, ", qlimit: %u", status.mps_qlimit);
              if (status.mps_msgcount)
-               fprintf (stream, ", msgs: %zu", status.mps_msgcount);
+               fprintf (stream, ", msgs: %u", status.mps_msgcount);
              fprintf (stream, "%s%s%s)",
                       status.mps_srights ? ", send-rights" : "",
                       status.mps_pdrequest ? ", pd-req" : "",
-- 
2.40.1