summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2001-08-17 05:26:16 +0000
committerRoland McGrath <roland@gnu.org>2001-08-17 05:26:16 +0000
commitf33bc6ec3f92240bb8deb529eca08c6e9f7209b2 (patch)
treee25af9950c8b16b7ff07486a74cdb170be97296a
parentc3040a1e324a55b6d8ca64395fc4bc2c99d5d00d (diff)
2001-08-16 Roland McGrath <roland@frob.com>
* userland-boot.c (boot_script_insert_right): New function. * boot_script.h: Declare it. * boot_script.c (boot_script_exec): Use that instead of mach_port_insert_right. * boot_script.h: Protect from multiple inclusion. (safe_gets): Remove decl. * boot_script.h (boot_script_exec_cmd): Change TASK arg type to task_t. * userland-boot.c: Likewise.
-rw-r--r--boot/boot_script.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/boot/boot_script.h b/boot/boot_script.h
index 6a30f09f..f63200a8 100644
--- a/boot/boot_script.h
+++ b/boot/boot_script.h
@@ -1,5 +1,8 @@
/* Definitions for boot script parser for Mach. */
+#ifndef _boot_script_h
+#define _boot_script_h
+
/* Written by Shantanu Goel (goel@cs.columbia.edu). */
/* Error codes returned by boot_script_parse_line()
@@ -62,7 +65,7 @@ void boot_script_free (void *, size_t);
strings are STRINGS. STRINGS has length STRINGLEN.
Return 0 for success, non-zero otherwise. */
int boot_script_exec_cmd (void *hook,
- mach_port_t task, char *path, int argc,
+ task_t task, char *path, int argc,
char **argv, char *strings, int stringlen);
/* The user must define this function. Load the contents of FILE
@@ -74,6 +77,7 @@ mach_port_t boot_script_read_file (const char *file);
int boot_script_task_create (struct cmd *); /* task_create + task_suspend */
int boot_script_task_resume (struct cmd *);
int boot_script_prompt_task_resume (struct cmd *);
+int boot_script_insert_right (struct cmd *, mach_port_t); /* same name */
/* The user must define this function to clean up the `task_t'
returned by boot_script_task_create. */
@@ -105,5 +109,5 @@ int boot_script_define_function (const char *name, int ret_type,
/* Returns a string describing the error ERR. */
char *boot_script_error_string (int err);
-
-void safe_gets (char *, int);
+
+#endif /* _boot_script_h */