vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* stage2/char_io.c (convert_to_ascii): Remove "%b" support.

Browse source 
It's non-standard and is not used anymore.
(grub_printf): Likewise.
This commit is contained in:
proski 2004-05-03 13:27:34 +00:00
parent 3fa2fbb8bd
commit 6355ac9d94
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-05-03 Pavel Roskin <proski@gnu.org>
* stage2/char_io.c (convert_to_ascii): Remove "%b" support.
It's non-standard and is not used anymore.
(grub_printf): Likewise.
2004-04-29 Robert Millan <robertmh@gnu.org> 2004-04-29 Robert Millan <robertmh@gnu.org>
From Yann Dirson <dirson@debian.org>: From Yann Dirson <dirson@debian.org>:

9
stage2/char_io.c
View file

@ -107,7 +107,7 @@ convert_to_ascii (char *buf, int c,...)
char *ptr = buf; char *ptr = buf;
#ifndef STAGE1_5 #ifndef STAGE1_5
if (c == 'x' || c == 'X' || c == 'b') if (c == 'x' || c == 'X')
mult = 16; mult = 16;
if ((num & 0x80000000uL) && c == 'd') if ((num & 0x80000000uL) && c == 'd')
@ -154,7 +154,6 @@ grub_printf (const char *format,...)
{ {
int *dataptr = (int *) &format; int *dataptr = (int *) &format;
char c, str[16]; char c, str[16];
unsigned long mask = 0xFFFFFFFF;
dataptr++; dataptr++;
@ -166,16 +165,12 @@ grub_printf (const char *format,...)
switch (c = *(format++)) switch (c = *(format++))
{ {
#ifndef STAGE1_5 #ifndef STAGE1_5
case 'b':
mask = 0xFF;
/* Fall down intentionally! */
case 'd': case 'd':
case 'x': case 'x':
case 'X': case 'X':
#endif #endif
case 'u': case 'u':
*convert_to_ascii (str, c, *((unsigned long *) dataptr++) & mask) *convert_to_ascii (str, c, *((unsigned long *) dataptr++)) = 0;
= 0;
grub_putstr (str); grub_putstr (str);
break; break;