From 43f2652caae5d8d1f3cdcd56c192f2352c40ac78 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 21 Aug 2008 14:34:47 +0000 Subject: 2008-08-21 Joel Sherrill * display.c, histexpand.c, terminal.c: Fix warnings. * ChangeLog: New file. --- readline-4.3/ChangeLog | 5 +++++ readline-4.3/display.c | 2 +- readline-4.3/histexpand.c | 4 ++-- readline-4.3/terminal.c | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 readline-4.3/ChangeLog diff --git a/readline-4.3/ChangeLog b/readline-4.3/ChangeLog new file mode 100644 index 0000000..9e5af6b --- /dev/null +++ b/readline-4.3/ChangeLog @@ -0,0 +1,5 @@ +2008-08-21 Joel Sherrill + + * display.c, histexpand.c, terminal.c: Fix warnings. + * ChangeLog: New file. + diff --git a/readline-4.3/display.c b/readline-4.3/display.c index 5150ea6..1488036 100644 --- a/readline-4.3/display.c +++ b/readline-4.3/display.c @@ -1604,7 +1604,7 @@ _rl_move_cursor_relative (new, data) } if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) - _rl_last_c_pos = _rl_col_width (data, 0, new); + _rl_last_c_pos = _rl_col_width ((char *)data, 0, new); else _rl_last_c_pos = new; } diff --git a/readline-4.3/histexpand.c b/readline-4.3/histexpand.c index 6c81196..5ed8bae 100644 --- a/readline-4.3/histexpand.c +++ b/readline-4.3/histexpand.c @@ -211,8 +211,8 @@ get_history_event (string, caller_index, delimiting_quote) memset (&ps, 0, sizeof (mbstate_t)); /* These produce warnings because we're passing a const string to a function that takes a non-const string. */ - _rl_adjust_point (string, i, &ps); - if ((v = _rl_get_char_len (string + i, &ps)) > 1) + _rl_adjust_point ((char *)string, i, &ps); + if ((v = _rl_get_char_len ((char *)string + i, &ps)) > 1) { i += v - 1; continue; diff --git a/readline-4.3/terminal.c b/readline-4.3/terminal.c index f3f5b6c..4788247 100644 --- a/readline-4.3/terminal.c +++ b/readline-4.3/terminal.c @@ -350,7 +350,7 @@ get_term_capabilities (bp) # ifdef __LCC__ *(tc_strings[i].tc_value) = tgetstr ((char *)tc_strings[i].tc_var, bp); # else - *(tc_strings[i].tc_value) = tgetstr (tc_strings[i].tc_var, bp); + *(tc_strings[i].tc_value) = tgetstr ((char *)tc_strings[i].tc_var, bp); # endif #endif tcap_initialized = 1; -- cgit v1.2.3