From e7f4319ac6c1341c0a31582693de54a02458a2b9 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 26 Nov 2009 22:47:14 +0000 Subject: [PATCH] Fix type - attributes should be u_char not int. --- tty.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tty.c b/tty.c index 999c3919..1ed965ff 100644 --- a/tty.c +++ b/tty.c @@ -36,8 +36,8 @@ void tty_fill_acs(struct tty *); int tty_try_256(struct tty *, u_char, const char *); int tty_try_88(struct tty *, u_char, const char *); -void tty_colours(struct tty *, const struct grid_cell *, int *); -void tty_colours_fg(struct tty *, const struct grid_cell *, int *); +void tty_colours(struct tty *, const struct grid_cell *, u_char *); +void tty_colours_fg(struct tty *, const struct grid_cell *, u_char *); void tty_colours_bg(struct tty *, const struct grid_cell *); void tty_redraw_region(struct tty *, const struct tty_ctx *); @@ -1145,8 +1145,7 @@ void tty_attributes(struct tty *tty, const struct grid_cell *gc) { struct grid_cell *tc = &tty->cell, gc2; - u_char changed; - u_int new_attr; + u_char changed, new_attr; /* If the character is space, don't care about foreground. */ if (gc->data == ' ' && !(gc->flags & GRID_FLAG_UTF8)) { @@ -1217,7 +1216,7 @@ tty_attributes(struct tty *tty, const struct grid_cell *gc) } void -tty_colours(struct tty *tty, const struct grid_cell *gc, int *attr) +tty_colours(struct tty *tty, const struct grid_cell *gc, u_char *attr) { struct grid_cell *tc = &tty->cell; u_char fg = gc->fg, bg = gc->bg, flags = gc->flags; @@ -1284,7 +1283,7 @@ tty_colours(struct tty *tty, const struct grid_cell *gc, int *attr) } void -tty_colours_fg(struct tty *tty, const struct grid_cell *gc, int *attr) +tty_colours_fg(struct tty *tty, const struct grid_cell *gc, u_char *attr) { struct grid_cell *tc = &tty->cell; u_char fg = gc->fg;