summaryrefslogtreecommitdiff
path: root/serverboot
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-06-23 04:29:11 +0000
committerRoland McGrath <roland@gnu.org>2002-06-23 04:29:11 +0000
commit304f9572ac282409da58a67ac979673c15a15e18 (patch)
tree94de702d721f61d5d8722d4ce4466f8ac37f5bba /serverboot
parentb4cdf8eaeef981ce7f1962302ad79e94de18f1bf (diff)
2002-06-22 Roland McGrath <roland@frob.com>
* load.c (boot_script_exec_cmd): Twiddle decls of serverboot_bunzip2 and serverboot_gunzip. * load.c (boot_script_exec_cmd): Cast int to intptr_t before char *.
Diffstat (limited to 'serverboot')
-rw-r--r--serverboot/load.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/serverboot/load.c b/serverboot/load.c
index 21289bf1..e95a64d7 100644
--- a/serverboot/load.c
+++ b/serverboot/load.c
@@ -318,8 +318,8 @@ boot_script_exec_cmd (void *hook,
* It might be gzip file.
*/
int err;
- extern int
- serverboot_gunzip(struct file *, void **, size_t *);
+ extern int serverboot_gunzip(struct file *,
+ vm_offset_t *, size_t *);
err = serverboot_gunzip(st.fp,
&(st.image_addr),
@@ -343,8 +343,8 @@ boot_script_exec_cmd (void *hook,
* It might be bzip2 file.
*/
int err;
- extern int
- serverboot_bunzip2(struct file *, void **, size_t *);
+ extern int serverboot_bunzip2(struct file *,
+ vm_offset_t *, size_t *);
err = serverboot_bunzip2(st.fp,
&(st.image_addr),
@@ -449,7 +449,7 @@ boot_script_exec_cmd (void *hook,
/*
* first the argument count
*/
- *k_ap++ = (char *)arg_count;
+ *k_ap++ = (char *)(intptr_t)arg_count;
/*
* Then the strings and string pointers for each argument