summaryrefslogtreecommitdiff
path: root/console-client/vga-dynafont.c
diff options
context:
space:
mode:
authorFlavio Cruz <flaviocruz@gmail.com>2015-12-29 17:35:00 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-12-29 20:47:40 +0100
commitcc3e97aa0141410eb8b05cab34aecf65f44a164c (patch)
treef7b72d19129e8172cdde52706634b3935f329f61 /console-client/vga-dynafont.c
parentb4cf10f408d50e4caaeda6d2bc9df2db3398a9cd (diff)
fix compiler warnings in hurd/console-client
console-client: Fix several compiler warnings. * console-client/bdf.c: Use size_t instead of int. * console-client/driver.c: Remove unused variable errstring. * console-client/pc-kbd.c: Cast sc to scancode_x1 before comparing with enum values. * console-client/vga-dynacolor.h: Use an explicit if in reference counting. * console-client/vga-dynafont.c: Use usigned char for bitmaps. * console-client/vga-support.c: Use unsigned char instead of char. * console-client/vga-support.h: Likewise. * console-client/vga.c: Use conchar_attr_equal instead of casting structures to integers. * hurd/console.h: Add conchar_attr_equal to compare conchar_attr_t structures.
Diffstat (limited to 'console-client/vga-dynafont.c')
-rw-r--r--console-client/vga-dynafont.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/console-client/vga-dynafont.c b/console-client/vga-dynafont.c
index 573d63b4..2cee47ed 100644
--- a/console-client/vga-dynafont.c
+++ b/console-client/vga-dynafont.c
@@ -46,7 +46,7 @@ static dynafont_t active_dynafont;
/* One glyph in a VGA font is 8 pixels wide and 32 pixels high. Only
the first N lines are visible, and N depends on the VGA register
settings. */
-typedef char vga_font_glyph[VGA_FONT_HEIGHT];
+typedef unsigned char vga_font_glyph[VGA_FONT_HEIGHT];
/* For each glyph in the VGA font, one instance of this structure is
@@ -329,7 +329,7 @@ create_system_font (void)
else
{
int i;
- char glyph_bitmap[32];
+ unsigned char glyph_bitmap[32];
for (i = 0; i < 16; i++)
{
@@ -591,7 +591,7 @@ dynafont_new (bdf_font_t font, bdf_font_t font_italic, bdf_font_t font_bold,
else
{
int i;
- char *gl = df->vga_font[FONT_INDEX_UNKNOWN];
+ unsigned char *gl = df->vga_font[FONT_INDEX_UNKNOWN];
/* XXX Take font height into account. */
gl[0] = 0x7E; /* ****** */
gl[1] = 0xC3; /* ** ** */
@@ -988,7 +988,7 @@ dynafont_activate (dynafont_t df)
{
int height = (df->font->bbox.height > 32) ? 32 : df->font->bbox.height;
- vga_write_font_buffer (0, 0, (char *) df->vga_font,
+ vga_write_font_buffer (0, 0, (unsigned char *) df->vga_font,
df->size * VGA_FONT_HEIGHT);
vga_select_font_buffer (0, (df->size == 512) ? 1 : 0);