From f3496ae098d3fb930565c52336431e78be63eee8 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Mon, 21 Feb 2022 18:25:11 +0100
Subject: [PATCH] [terminfo] const char *

---
 src/terminal/screen.c   |  5 +++--
 src/terminal/terminfo.c | 14 +++++++-------
 src/terminal/terminfo.h | 14 +++++++-------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/terminal/screen.c b/src/terminal/screen.c
index 83c013ba..984c9f68 100644
--- a/src/terminal/screen.c
+++ b/src/terminal/screen.c
@@ -668,7 +668,8 @@ add_cursor_move_to_string(struct string *screen, int y, int x)
 {
 #ifdef CONFIG_TERMINFO
 	if (get_cmd_opt_bool("terminfo")) {
-		return add_to_string(screen, terminfo_cursor_address(y-1, x-1));
+		const char *aa = terminfo_cursor_address(y-1, x-1);
+		return add_to_string(screen, aa);
 	} else
 #endif
 #define CURSOR_NUM_LEN 10 /* 10 chars for @y and @x numbers should be more than enough. */
@@ -1453,7 +1454,7 @@ erase_screen(struct terminal *term)
 
 #ifdef CONFIG_TERMINFO
 	if (get_cmd_opt_bool("terminfo")) {
-		char *text = terminfo_clear_screen();
+		const char *text = terminfo_clear_screen();
 		hard_write(term->fdout, text, strlen(text));
 	} else 
 #endif
diff --git a/src/terminal/terminfo.c b/src/terminal/terminfo.c
index 3da97a02..049a3471 100644
--- a/src/terminal/terminfo.c
+++ b/src/terminal/terminfo.c
@@ -26,7 +26,7 @@ terminfo_setupterm(char *term, int fildes)
 	return setupterm(term, fildes, NULL);
 }
 
-char *
+const char *
 terminfo_clear_screen(void)
 {
 	char *res = tiparm(clear_screen);
@@ -35,7 +35,7 @@ terminfo_clear_screen(void)
 	return "";
 }
 
-char *
+const char *
 terminfo_set_bold(int arg)
 {
 	char *res = tiparm(arg ? enter_bold_mode : exit_attribute_mode);
@@ -44,7 +44,7 @@ terminfo_set_bold(int arg)
 	return "";
 }
 
-char *
+const char *
 terminfo_set_italics(int arg)
 {
 	char *res = tiparm(arg ? enter_italics_mode : exit_italics_mode);
@@ -53,7 +53,7 @@ terminfo_set_italics(int arg)
 	return "";
 }
 
-char *
+const char *
 terminfo_set_underline(int arg)
 {
 	char *res = tiparm(arg ? enter_underline_mode : exit_underline_mode);
@@ -62,7 +62,7 @@ terminfo_set_underline(int arg)
 	return "";
 }
 
-char *
+const char *
 terminfo_set_background(int arg)
 {
 	char *res = tiparm(set_a_background, arg);
@@ -71,7 +71,7 @@ terminfo_set_background(int arg)
 	return "";
 }
 
-char *
+const char *
 terminfo_set_foreground(int arg)
 {
 	char *res = tiparm(set_a_foreground, arg);
@@ -86,7 +86,7 @@ terminfo_max_colors(void)
 	return max_colors;
 }
 
-char *
+const char *
 terminfo_cursor_address(int y, int x)
 {
 	char *res = tiparm(cursor_address, y, x);
diff --git a/src/terminal/terminfo.h b/src/terminal/terminfo.h
index afbba0c0..3a9f5a6c 100644
--- a/src/terminal/terminfo.h
+++ b/src/terminal/terminfo.h
@@ -6,14 +6,14 @@ extern "C" {
 #endif
 
 int terminfo_setupterm(char *term, int fildes);
-char *terminfo_clear_screen(void);
-char *terminfo_set_bold(int arg);
-char *terminfo_set_italics(int arg);
-char *terminfo_set_underline(int arg);
-char *terminfo_set_foreground(int arg);
-char *terminfo_set_background(int arg);
+const char *terminfo_clear_screen(void);
+const char *terminfo_set_bold(int arg);
+const char *terminfo_set_italics(int arg);
+const char *terminfo_set_underline(int arg);
+const char *terminfo_set_foreground(int arg);
+const char *terminfo_set_background(int arg);
 int terminfo_max_colors(void);
-char *terminfo_cursor_address(int y, int x);
+const char *terminfo_cursor_address(int y, int x);
 
 #ifdef __cplusplus
 }