From 0099b6412a0e59730b60632b95468ce1f05f8d8c Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Thu, 6 Oct 1994 21:52:35 +0000
Subject: Formerly boot-parse.c.~8~
---
libdiskfs/boot-parse.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
(limited to 'libdiskfs/boot-parse.c')
diff --git a/libdiskfs/boot-parse.c b/libdiskfs/boot-parse.c
index 58685464..20799ca1 100644
--- a/libdiskfs/boot-parse.c
+++ b/libdiskfs/boot-parse.c
@@ -72,17 +72,17 @@ diskfs_parse_bootargs (int argc, char **argv)
};
msg.Head.msgh_bits =
- MACH_MSGH_BITS(19, MACH_MSG_TYPE_MAKE_SEND_ONCE);
+ MACH_MSGH_BITS (MACH_MSG_TYPE_MOVE_SEND, MACH_MSG_TYPE_MAKE_SEND_ONCE);
/* msgh_size passed as argument */
msg.Head.msgh_remote_port = bootstrap;
msg.Head.msgh_local_port = mig_get_reply_port ();
msg.Head.msgh_seqno = 0;
msg.Head.msgh_id = 999999;
- msg_result = mach_msg(&msg.Head, MACH_SEND_MSG|MACH_RCV_MSG,
- sizeof msg.Head, sizeof msg,
- msg.Head.msgh_local_port,
- MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
+ msg_result = mach_msg (&msg.Head, MACH_SEND_MSG|MACH_RCV_MSG,
+ sizeof msg.Head, sizeof msg,
+ msg.Head.msgh_local_port,
+ MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
if (msg_result != MACH_MSG_SUCCESS)
{
if ((msg_result == MACH_SEND_INVALID_REPLY) ||
@@ -98,11 +98,13 @@ diskfs_parse_bootargs (int argc, char **argv)
}
mig_put_reply_port (msg.Head.msgh_local_port);
+#if 0
assert (msg.Head.msgh_id == 999999 + 100);
assert (msg.Head.msgh_size == sizeof msg);
assert (msg.Head.msgh_bits & MACH_MSGH_BITS_COMPLEX);
assert (*(int *) &msg.priv_hostType == *(int *) &portCheck);
assert (*(int *) &msg.priv_deviceType == *(int *) &portCheck);
+#endif
diskfs_host_priv = msg.priv_host;
diskfs_master_device = msg.priv_device;
--
cgit v1.2.3