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

Remove trivial getcharwidth (now implicit)

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-16 21:33:23 +01:00
parent 6c363dfd54
commit 703cbe63d6
6 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
term/efi/console.c
View file

@ -112,13 +112,6 @@ grub_console_putchar (const struct grub_unicode_glyph *c)
efi_call_2 (o->output_string, o, str); efi_call_2 (o->output_string, o, str);
} }
static grub_ssize_t
grub_console_getcharwidth (const struct grub_unicode_glyph *c __attribute__ ((unused)))
{
/* For now, every printable character has the width 1. */
return 1;
}
static int static int
grub_console_checkkey (void) grub_console_checkkey (void)
{ {
@ -349,7 +342,6 @@ static struct grub_term_output grub_console_term_output =
{ {
.name = "console", .name = "console",
.putchar = grub_console_putchar, .putchar = grub_console_putchar,
.getcharwidth = grub_console_getcharwidth,
.getwh = grub_console_getwh, .getwh = grub_console_getwh,
.getxy = grub_console_getxy, .getxy = grub_console_getxy,
.gotoxy = grub_console_gotoxy, .gotoxy = grub_console_gotoxy,

1
term/i386/pc/console.c
View file

@ -57,7 +57,6 @@ static struct grub_term_output grub_console_term_output =
{ {
.name = "console", .name = "console",
.putchar = grub_console_putchar, .putchar = grub_console_putchar,
.getcharwidth = grub_console_getcharwidth,
.getwh = grub_console_getwh, .getwh = grub_console_getwh,
.getxy = grub_console_getxy, .getxy = grub_console_getxy,
.gotoxy = grub_console_gotoxy, .gotoxy = grub_console_gotoxy,

1
term/i386/pc/vga_text.c
View file

@ -155,7 +155,6 @@ static struct grub_term_output grub_vga_text_term =
.init = grub_vga_text_init_fini, .init = grub_vga_text_init_fini,
.fini = grub_vga_text_init_fini, .fini = grub_vga_text_init_fini,
.putchar = grub_console_putchar, .putchar = grub_console_putchar,
.getcharwidth = grub_console_getcharwidth,
.getwh = grub_console_getwh, .getwh = grub_console_getwh,
.getxy = grub_vga_text_getxy, .getxy = grub_vga_text_getxy,
.gotoxy = grub_vga_text_gotoxy, .gotoxy = grub_vga_text_gotoxy,

7
term/i386/vga_common.c
View file

@ -31,13 +31,6 @@ grub_console_putchar (const struct grub_unicode_glyph *c)
grub_console_real_putchar (c->base); grub_console_real_putchar (c->base);
} }
grub_ssize_t
grub_console_getcharwidth (const struct grub_unicode_glyph *c __attribute__ ((unused)))
{
/* For now, every printable character has the width 1. */
return 1;
}
grub_uint16_t grub_uint16_t
grub_console_getwh (void) grub_console_getwh (void)
{ {

7
term/ieee1275/ofconsole.c
View file

@ -107,12 +107,6 @@ grub_ofconsole_putchar (const struct grub_unicode_glyph *c)
grub_ieee1275_write (stdout_ihandle, &chr, 1, 0); grub_ieee1275_write (stdout_ihandle, &chr, 1, 0);
} }
static grub_ssize_t
grub_ofconsole_getcharwidth (const struct grub_unicode_glyph *c __attribute__((unused)))
{
return 1;
}
static void static void
grub_ofconsole_setcolorstate (grub_term_color_state state) grub_ofconsole_setcolorstate (grub_term_color_state state)
{ {
@ -449,7 +443,6 @@ static struct grub_term_output grub_ofconsole_term_output =
.init = grub_ofconsole_init_output, .init = grub_ofconsole_init_output,
.fini = grub_ofconsole_fini, .fini = grub_ofconsole_fini,
.putchar = grub_ofconsole_putchar, .putchar = grub_ofconsole_putchar,
.getcharwidth = grub_ofconsole_getcharwidth,
.getxy = grub_ofconsole_getxy, .getxy = grub_ofconsole_getxy,
.getwh = grub_ofconsole_getwh, .getwh = grub_ofconsole_getwh,
.gotoxy = grub_ofconsole_gotoxy, .gotoxy = grub_ofconsole_gotoxy,

7
util/console.c
View file

@ -69,12 +69,6 @@ grub_ncurses_putchar (const struct grub_unicode_glyph *c)
addch (c->base | grub_console_attr); addch (c->base | grub_console_attr);
} }
static grub_ssize_t
grub_ncurses_getcharwidth (const struct grub_unicode_glyph * c __attribute__ ((unused)))
{
return 1;
}
static void static void
grub_ncurses_setcolorstate (grub_term_color_state state) grub_ncurses_setcolorstate (grub_term_color_state state)
{ {
@ -317,7 +311,6 @@ static struct grub_term_output grub_ncurses_term_output =
.init = grub_ncurses_init, .init = grub_ncurses_init,
.fini = grub_ncurses_fini, .fini = grub_ncurses_fini,
.putchar = grub_ncurses_putchar, .putchar = grub_ncurses_putchar,
.getcharwidth = grub_ncurses_getcharwidth,
.getxy = grub_ncurses_getxy, .getxy = grub_ncurses_getxy,
.getwh = grub_ncurses_getwh, .getwh = grub_ncurses_getwh,
.gotoxy = grub_ncurses_gotoxy, .gotoxy = grub_ncurses_gotoxy,