From 1594ee5f0e8bf43e3cd122719be9c81fcf26a897 Mon Sep 17 00:00:00 2001 From: Hiltjo Posthuma Date: Sun, 6 Feb 2022 11:25:36 +0100 Subject: fix a warning with tparm on some systems Older POSIX standards also defined it as a char * parameter (not const char *) for tparm(). https://pubs.opengroup.org/onlinepubs/7908799/xcurses/term.h.html --- minicurses.h | 30 +++++++++++++++--------------- sfeed_curses.c | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/minicurses.h b/minicurses.h index 3bc3e8a..3e01e80 100644 --- a/minicurses.h +++ b/minicurses.h @@ -3,20 +3,20 @@ #undef OK #define OK (0) -const char *clr_eol = "\x1b[K"; -const char *clear_screen = "\x1b[H\x1b[2J"; -const char *cursor_address = "\x1b[%ld;%ldH"; -const char *cursor_normal = "\x1b[?25h"; /* DECTCEM (in)Visible cursor */ -const char *cursor_invisible = "\x1b[?25l"; /* DECTCEM (in)Visible cursor */ -const char *eat_newline_glitch = (void *)1; -const char *enter_ca_mode = "\x1b[?1049h"; /* smcup */ -const char *exit_ca_mode = "\x1b[?1049l"; /* rmcup */ -const char *save_cursor = "\x1b""7"; -const char *restore_cursor = "\x1b""8"; -const char *exit_attribute_mode = "\x1b[0m"; -const char *enter_bold_mode = "\x1b[1m"; -const char *enter_dim_mode = "\x1b[2m"; -const char *enter_reverse_mode = "\x1b[7m"; +char *clr_eol = "\x1b[K"; +char *clear_screen = "\x1b[H\x1b[2J"; +char *cursor_address = "\x1b[%ld;%ldH"; +char *cursor_normal = "\x1b[?25h"; /* DECTCEM (in)Visible cursor */ +char *cursor_invisible = "\x1b[?25l"; /* DECTCEM (in)Visible cursor */ +char *eat_newline_glitch = (void *)1; +char *enter_ca_mode = "\x1b[?1049h"; /* smcup */ +char *exit_ca_mode = "\x1b[?1049l"; /* rmcup */ +char *save_cursor = "\x1b""7"; +char *restore_cursor = "\x1b""8"; +char *exit_attribute_mode = "\x1b[0m"; +char *enter_bold_mode = "\x1b[1m"; +char *enter_dim_mode = "\x1b[2m"; +char *enter_reverse_mode = "\x1b[7m"; int setupterm(char *term, int fildes, int *errret) @@ -25,7 +25,7 @@ setupterm(char *term, int fildes, int *errret) } char * -tparm(const char *s, long p1, long p2, ...) +tparm(char *s, long p1, long p2, ...) { static char buf[32]; diff --git a/sfeed_curses.c b/sfeed_curses.c index 734427c..4087369 100644 --- a/sfeed_curses.c +++ b/sfeed_curses.c @@ -267,8 +267,8 @@ estrdup(const char *s) /* Wrapper for tparm which allows NULL parameter for str. */ char * -tparmnull(const char *str, long p1, long p2, long p3, long p4, long p5, - long p6, long p7, long p8, long p9) +tparmnull(char *str, long p1, long p2, long p3, long p4, long p5, long p6, + long p7, long p8, long p9) { if (!str) return NULL; -- cgit v1.2.3