From 3c902477cb6d6fbac5be289c8e78c8f0316ca6a3 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Fri, 10 Jul 2009 22:09:41 +0400 Subject: [PATCH] TTY: use direct cast instead of str_unconst() funcion. Signed-off-by: Andrew Borodin --- src/tty/tty-ncurses.c | 3 +-- src/tty/tty-slang.c | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/tty/tty-ncurses.c b/src/tty/tty-ncurses.c index a81eb281b..e8ed0d6f3 100644 --- a/src/tty/tty-ncurses.c +++ b/src/tty/tty-ncurses.c @@ -47,7 +47,6 @@ #include "../../src/background.h" /* we_are_background */ #include "../../src/strutil.h" /* str_term_form */ -#include "../../src/util.h" /* str_unconst */ /* include at last !!! */ #ifdef WANT_TERM_H @@ -307,7 +306,7 @@ char * tty_tgetstr (const char *cap) { char *unused = NULL; - return tgetstr (str_unconst (cap), &unused); + return tgetstr ((char *) cap, &unused); } void diff --git a/src/tty/tty-slang.c b/src/tty/tty-slang.c index bd15d366d..1538d608a 100644 --- a/src/tty/tty-slang.c +++ b/src/tty/tty-slang.c @@ -50,7 +50,6 @@ #include "../../src/tty/win.h" #include "../../src/background.h" /* we_are_background */ -#include "../../src/util.h" /* str_unconst */ #include "../../src/strutil.h" /* str_term_form */ /*** global variables **************************************************/ @@ -523,7 +522,7 @@ tty_print_alt_char (int c) void tty_print_string (const char *s) { - SLsmg_write_string (str_unconst (str_term_form (s))); + SLsmg_write_string ((char *) str_term_form (s)); } void @@ -532,14 +531,14 @@ tty_printf (const char *fmt, ...) va_list args; va_start (args, fmt); - SLsmg_vprintf (str_unconst(fmt), args); + SLsmg_vprintf ((char *) fmt, args); va_end (args); } char * tty_tgetstr (const char *cap) { - return SLtt_tgetstr (str_unconst (cap)); + return SLtt_tgetstr ((char *) cap); } void