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

It's non-standard and is not used anymore.
(grub_printf): Likewise.

diff --git a/ChangeLog b/ChangeLog
index ca150f11bf9d8064355340c0ac14c9dd8ca18d52..9d407a3f6d20e2bf5b02fe3db90934bffe67a8f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        From Yann Dirson  <dirson@debian.org>:

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