diff options
| author | marcus <marcus> | 2003-09-19 18:50:12 +0000 |
|---|---|---|
| committer | marcus <marcus> | 2003-09-19 18:50:12 +0000 |
| commit | 96bdd1fb4ad848fefb9f75a3033681389c72752d (patch) | |
| tree | 945365330ccb3920666f02c4138b072bec07d1fc /laden | |
| parent | 2a650d9b2c023bf3a1462773703a62534ca98fe7 (diff) | |
2003-09-19 Marcus Brinkmann <marcus@gnu.org>
* ia32-cmain.c (debug_dump): Cast mod[nr].string to char *.
* laden.c (parse_args): Remove superfluous arguments.
* loader.c: Include <string.h>.
* kip-fixup.c (kip_fixup): Use %p for pointer.
* output-serial.c: Include <stdlib.h>.
Diffstat (limited to 'laden')
| -rw-r--r-- | laden/ChangeLog | 6 | ||||
| -rw-r--r-- | laden/ia32-cmain.c | 3 | ||||
| -rw-r--r-- | laden/kip-fixup.c | 2 | ||||
| -rw-r--r-- | laden/laden.c | 2 | ||||
| -rw-r--r-- | laden/loader.c | 2 | ||||
| -rw-r--r-- | laden/output-serial.c | 1 |
6 files changed, 13 insertions, 3 deletions
diff --git a/laden/ChangeLog b/laden/ChangeLog index 2568a5a..7883e15 100644 --- a/laden/ChangeLog +++ b/laden/ChangeLog @@ -1,5 +1,11 @@ 2003-09-19 Marcus Brinkmann <marcus@gnu.org> + * ia32-cmain.c (debug_dump): Cast mod[nr].string to char *. + * laden.c (parse_args): Remove superfluous arguments. + * loader.c: Include <string.h>. + * kip-fixup.c (kip_fixup): Use %p for pointer. + * output-serial.c: Include <stdlib.h>. + * Makefile.am (laden_CFLAGS): Add -I$(top_srcdir)/libc-parts. * output.c: Include <stdlib.h> and <string.h>. * output.h (struct output_driver): Add CFG argument to INIT diff --git a/laden/ia32-cmain.c b/laden/ia32-cmain.c index d3de59a..317973c 100644 --- a/laden/ia32-cmain.c +++ b/laden/ia32-cmain.c @@ -140,7 +140,8 @@ debug_dump (void) for (nr = 0; nr < mbi->mods_count; nr++) debug ("Module %i: Start 0x%x, End 0x%x, Cmd %s\n", - nr + 1, mod[nr].mod_start, mod[nr].mod_end, mod[nr].string); + nr + 1, mod[nr].mod_start, mod[nr].mod_end, + (char *) mod[nr].string); } if (CHECK_FLAG (mbi->flags, 6)) diff --git a/laden/kip-fixup.c b/laden/kip-fixup.c index 7ca2f75..dd8498a 100644 --- a/laden/kip-fixup.c +++ b/laden/kip-fixup.c @@ -35,7 +35,7 @@ kip_fixup (void) if ((l4_word_t) kip >= kernel.high) panic ("No KIP found in the kernel.\n"); - debug ("KIP found at address 0x%x.\n", kip); + debug ("KIP found at address %p.\n", kip); kip2 = kip + 0x1000; while ((l4_word_t) kip2 < kernel.high diff --git a/laden/laden.c b/laden/laden.c index 1b728a1..e7ce290 100644 --- a/laden/laden.c +++ b/laden/laden.c @@ -150,7 +150,7 @@ parse_args (int argc, char *argv[]) printf (".\n\n"); } - printf ("Report bugs to " BUG_ADDRESS ".\n", argv[0]); + printf ("Report bugs to " BUG_ADDRESS ".\n"); shutdown (); } else if (!strcmp (argv[i], "--version")) diff --git a/laden/loader.c b/laden/loader.c index 6b35e8f..54fcba7 100644 --- a/laden/loader.c +++ b/laden/loader.c @@ -18,6 +18,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ +#include <string.h> + #include "loader.h" #include "output.h" #include "shutdown.h" diff --git a/laden/output-serial.c b/laden/output-serial.c index 9b5e2e7..7a2436c 100644 --- a/laden/output-serial.c +++ b/laden/output-serial.c @@ -24,6 +24,7 @@ #include <sys/io.h> #include <string.h> +#include <stdlib.h> #include <errno.h> #include "output.h" |