summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2014-03-25 23:09:55 +0100
committerJustus Winter <4winter@informatik.uni-hamburg.de>2014-03-26 00:01:08 +0100
commit120847a0c4b72da43ac2764ba73548e8916b1c0d (patch)
treee5fdd5bd99e244b33229339a5f9b43869ce465f4
parent50cc5152ebb4872b57a764d7b5ad62636f674e01 (diff)
kern: fix formatting of multiboot modules
Previously, bootstrap_create would print the multiboot modules with padding applied to the end of the line. As multiboot modules as used by the Hurd span more than one line. This makes the list of modules hard to read and it looks unclean, more like an accident. Furthermore, it is not clear what the intend of this was, as the padding is applied at the end of the line, with no further information printed thereafter. * kern/bootstrap.c (bootstrap_create): Remove variable maxlen and len, update printfs.
-rw-r--r--kern/bootstrap.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/kern/bootstrap.c b/kern/bootstrap.c
index 3e24d7b..7cfff3a 100644
--- a/kern/bootstrap.c
+++ b/kern/bootstrap.c
@@ -150,7 +150,7 @@ void bootstrap_create(void)
}
else
{
- int i, losers, maxlen;
+ int i, losers;
/* Initialize boot script variables. We leak these send rights. */
losers = boot_script_set_variable
@@ -241,15 +241,11 @@ void bootstrap_create(void)
}
#endif
- maxlen = 0;
for (i = 0; i < boot_info.mods_count; ++i)
{
int err;
char *line = (char*)phystokv(bmods[i].string);
- int len = strlen (line) + 1;
- if (len > maxlen)
- maxlen = len;
- printf ("\rmodule %d: %*s", i, -maxlen, line);
+ printf ("module %d: %s\n", i, line);
err = boot_script_parse_line (&bmods[i], line);
if (err)
{
@@ -257,7 +253,7 @@ void bootstrap_create(void)
++losers;
}
}
- printf ("\r%d multiboot modules %*s", i, -maxlen, "");
+ printf ("%d multiboot modules\n", i);
if (losers)
panic ("%d of %d boot script commands could not be parsed",
losers, boot_info.mods_count);