2001-12-31 Roland McGrath <roland@frob.com>

	* auth_reply.defs: Change return code parameters to use `RetCode'
	keyword, for compatibility with OSF Mach mig.
	* crash_reply.defs: Likewise.
	* fsys_reply.defs: Likewise.
	* io_reply.defs: Likewise.
	* msg_reply.defs: Likewise.
	* process_reply.defs: Likewise.
	* startup_reply.defs: Likewise.

7 files changed, 60 insertions, 63 deletions

diff --git a/hurd/auth_reply.defs b/hurd/auth_reply.defs
index 10530fa7..bea6379d 100644
--- a/hurd/auth_reply.defs
+++ b/hurd/auth_reply.defs
@@ -1,5 +1,5 @@
 /* Reply-only side of auth interface
-   Copyright (C) 1991, 1993, 1994 Free Software Foundation
+   Copyright (C) 1991,93,94,2001 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -31,14 +31,13 @@ skip; /* auth_makeauth */
 
 simpleroutine auth_user_authenticate_reply (
 	reply_port: reply_port_t;
-	in return_code: kern_return_t;
+	in return_code: kern_return_t, RetCode;
 	in newhandle: mach_port_send_t);
 
 simpleroutine auth_server_authenticate_reply (
 	reply_port: reply_port_t;
-	in return_code: kern_return_t;
+	in return_code: kern_return_t, RetCode;
 	in gen_uids: idarray_t;
 	in aux_uids: idarray_t;
 	in gen_gids: idarray_t;
 	in aux_gids: idarray_t);
-	
diff --git a/hurd/crash_reply.defs b/hurd/crash_reply.defs
index 6231650a..de06242d 100644
--- a/hurd/crash_reply.defs
+++ b/hurd/crash_reply.defs
@@ -1,5 +1,5 @@
 /* MiG protocol for handling program crashes, reply half.
-   Copyright (C) 1992, 1994, 1995 Free Software Foundation
+   Copyright (C) 1992,94,95,2001 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -27,4 +27,4 @@ subsystem crash_reply 32100;	/* must match crash + 100 */
 
 simpleroutine crash_dump_task_reply (
 	ureply_port: mach_port_poly_t;
-	result: int);
+	result: int, RetCode);
diff --git a/hurd/fsys_reply.defs b/hurd/fsys_reply.defs
index b3676e64..b1397041 100644
--- a/hurd/fsys_reply.defs
+++ b/hurd/fsys_reply.defs
@@ -1,5 +1,5 @@
 /* Reply half of fsys
-   Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation
+   Copyright (C) 1991,93,94,95,2001 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -27,24 +27,24 @@ type reply_port_t = polymorphic | MACH_MSG_TYPE_PORT_SEND_ONCE
 	ctype: mach_port_t;
 
 simpleroutine fsys_startup_reply (
-	repsy_port: reply_port_t;
-	retcode: kern_return_t;
+	reply_port: reply_port_t;
+	errorcode: kern_return_t, retcode;
 	realnode: mach_port_send_t);
 
 simpleroutine fsys_goaway_reply (
 	reply_port: reply_port_t;
-	retcode: kern_return_t);
+	errorcode: kern_return_t, retcode);
 
 simpleroutine fsys_getroot_reply (
 	reply_port: reply_port_t;
-	retcode: kern_return_t;
+	errorcode: kern_return_t, retcode;
 	do_retry: retry_type;
 	retry_name: string_t;
 	file: mach_port_send_t);
 
 simpleroutine fsys_getfile_reply (
 	reply_port: reply_port_t;
-	retcode: kern_return_t;
+	errorcode: kern_return_t, retcode;
 	file: mach_port_send_t);
 
 simpleroutine fsys_syncfs_reply (
@@ -53,25 +53,24 @@ simpleroutine fsys_syncfs_reply (
 
 simpleroutine fsys_set_options_reply (
 	reply_port: reply_port_t;
-	retcode: kern_return_t);
+	errorcode: kern_return_t, retcode);
 
 simpleroutine fsys_getpriv_reply (
 	reply_port_: reply_port_t;
-	retcode: kern_return_t;
+	errorcode: kern_return_t, retcode;
 	host_priv: mach_port_send_t;
 	device_master: mach_port_send_t;
 	fstask: mach_port_send_t);
 
 simpleroutine fsys_init_reply (
 	reply_port: reply_port_t;
-	retcode: kern_return_t);
+	errorcode: kern_return_t, retcode);
 
 simpleroutine fsys_forward_reply (
 	reply_port: reply_port_t;
-	retcode: kern_return_t);
+	errorcode: kern_return_t, retcode);
 
 simpleroutine fsys_get_options_reply (
 	reply_port: reply_port_t;
-	retcode: kern_return_t;
+	errorcode: kern_return_t, retcode;
 	options: data_t);
-
diff --git a/hurd/io_reply.defs b/hurd/io_reply.defs
index 09f5595b..865b27a6 100644
--- a/hurd/io_reply.defs
+++ b/hurd/io_reply.defs
@@ -1,5 +1,5 @@
 /* Definitions for generic IO interface
-   Copyright (C) 1991,93,94,95,2000 Free Software Foundation, Inc.
+   Copyright (C) 1991,93,94,95,2000,01 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -33,121 +33,121 @@ type reply_port_t = polymorphic | MACH_MSG_TYPE_MAKE_SEND_ONCE
 
 simpleroutine io_write_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	amount: int);
 
 simpleroutine io_read_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	data: data_t);
 
 simpleroutine io_seek_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	newp: off_t);
 
 simpleroutine io_readable_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	amount: int);
 
 simpleroutine io_set_all_openmodes_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t);
+	return_code: kern_return_t, RetCode);
 
 simpleroutine io_get_openmodes_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	bits: int);
 
 simpleroutine io_set_some_openmodes_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t);
+	return_code: kern_return_t, RetCode);
 
 simpleroutine io_clear_some_openmodes_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t);
+	return_code: kern_return_t, RetCode);
 
 simpleroutine io_async_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	async_id_port: mach_port_send_t);
 
 simpleroutine io_mod_owner_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t);
+	return_code: kern_return_t, RetCode);
 
 simpleroutine io_get_owner_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	owner: pid_t);
 
 simpleroutine io_get_icky_async_id_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	id_port: mach_port_send_t);
 
 simpleroutine io_select_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	select_result: int);
 
 simpleroutine io_stat_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	stat_info: io_statbuf_t);
 
 skip;  /* io_reauthenticate has no reply */
 
 simpleroutine io_restrict_auth_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	new_object: mach_port_send_t);
 
 simpleroutine io_duplicate_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	newport: mach_port_send_t);
 
 simpleroutine io_map_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	rdobject: mach_port_send_t;
 	wrobject: mach_port_send_t);
 
 simpleroutine io_map_cntl_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t;
+	return_code: kern_return_t, RetCode;
 	memobj: mach_port_send_t);
 
 simpleroutine io_get_conch_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t);
+	return_code: kern_return_t, RetCode);
 
 simpleroutine io_release_conch_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t);
+	return_code: kern_return_t, RetCode);
 
 simpleroutine io_eofnotify_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t);
+	return_code: kern_return_t, RetCode);
 
 simpleroutine io_prenotify_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t);
+	return_code: kern_return_t, RetCode);
 
 simpleroutine io_postnotify_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t);
+	return_code: kern_return_t, RetCode);
 
 simpleroutine io_readnotify_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t);
+	return_code: kern_return_t, RetCode);
 
 simpleroutine io_readsleep_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t);
+	return_code: kern_return_t, RetCode);
 
 simpleroutine io_sigio_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t);
+	return_code: kern_return_t, RetCode);
diff --git a/hurd/msg_reply.defs b/hurd/msg_reply.defs
index 357224f9..f824f136 100644
--- a/hurd/msg_reply.defs
+++ b/hurd/msg_reply.defs
@@ -1,5 +1,5 @@
 /* Reply side of miscellaneous callbacks from Hurd servers to their clients
-   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1994,95,2001 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -26,7 +26,7 @@ type reply_port_t = polymorphic | MACH_MSG_TYPE_PORT_SEND_ONCE
 
 simpleroutine msg_sig_post_reply (
 	reply_port: reply_port_t;
-	in return_code: kern_return_t);
+	in return_code: kern_return_t, RetCode);
 
 skip; /* msg_proc_newids */
 skip; /* msg_add_auth */
@@ -52,4 +52,4 @@ skip; /* msg_startup_dosync */
 
 simpleroutine msg_sig_post_untraced_reply (
 	reply_port: reply_port_t;
-	in return_code: kern_return_t);
+	in return_code: kern_return_t, RetCode);
diff --git a/hurd/process_reply.defs b/hurd/process_reply.defs
index c8a6c3c0..96d59ae8 100644
--- a/hurd/process_reply.defs
+++ b/hurd/process_reply.defs
@@ -1,5 +1,5 @@
 /* Reply half of wait
-   Copyright (C) 1991, 1993, 1994, 1996 Free Software Foundation
+   Copyright (C) 1991,93,94,96,2001 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -39,9 +39,9 @@ skip; /* child */
 
 simpleroutine proc_setmsgport_reply (
 	reply_port: reply_port_t;
-	retcode: kern_return_t;
+	errorcode: kern_return_t, retcode;
 	in oldmsgport: mach_port_t);
-	
+
 skip; /* reassign */
 skip; /* setowner */
 skip; /* getpids */
@@ -50,14 +50,13 @@ skip; /* get_arg_locations */
 
 simpleroutine proc_getmsgport_reply (
 	reply_port: reply_port_t;
-	retcode: kern_return_t;
+	errorcode: kern_return_t, retcode;
 	in msgports: mach_port_t);
 
 simpleroutine proc_wait_reply (
 	reply_port: reply_port_t;
-	retcode: kern_return_t;
+	errorcode: kern_return_t, retcode;
 	in status: int;
 	in sigcode: int;
 	in rusage: rusage_t;
 	in pid_status: pid_t);
-
diff --git a/hurd/startup_reply.defs b/hurd/startup_reply.defs
index 1776dc3d..e78df852 100644
--- a/hurd/startup_reply.defs
+++ b/hurd/startup_reply.defs
@@ -1,6 +1,6 @@
 /* Server-reply definitions for startup server interface
    NOTE: All changes here must be reflected in startup.defs.
-   Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation
+   Copyright (C) 1991,92,93,94,2001 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -9,7 +9,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -33,14 +33,14 @@ STARTUP_IMPORTS
 
 simpleroutine startup_essential_task_reply (
 	reply_port: reply_port_t;
-	retcode: kern_return_t);
+	errorcode: kern_return_t, retcode);
 
 skip;	/* startup_request_notification */
 skip;	/* startup_reboot */
 
 simpleroutine startup_procinit_reply (
 	reply_port: reply_port_t;
-	retcode: kern_return_t;
+	errorcode: kern_return_t, retcode;
 	startup_task: task_t;
 	auth: auth_t;
 	host_priv: mach_port_send_t;
@@ -48,5 +48,5 @@ simpleroutine startup_procinit_reply (
 
 simpleroutine startup_authinit_reply (
 	reply_port: reply_port_t;
-	retcode: kern_return_t;
+	errorcode: kern_return_t, retcode;
 	proc: mach_port_send_t);