Cleanup misc warnings http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00034.html --- readline-5.1/bind.c +++ readline-5.1/bind.c @@ -1506,8 +1506,6 @@ rl_variable_value (name) const char *name; { register int i; - int v; - char *ret; /* Check for simple variables first. */ i = find_boolean_var (name); @@ -2170,7 +2168,6 @@ _rl_get_string_variable_value (name) { static char numbuf[32]; char *ret; - int n; if (_rl_stricmp (name, "bell-style") == 0) { --- readline-5.1/callback.c +++ readline-5.1/callback.c @@ -43,6 +43,7 @@ #include "rldefs.h" #include "readline.h" #include "rlprivate.h" +#include "xmalloc.h" /* Private data for callback registration functions. See comments in rl_callback_read_char for more details. */ --- readline-5.1/display.c +++ readline-5.1/display.c @@ -1164,7 +1166,7 @@ update_line (old, new, current_line, oma int col_lendiff, col_temp; #if defined (HANDLE_MULTIBYTE) mbstate_t ps_new, ps_old; - int new_offset, old_offset, tmp; + int new_offset, old_offset; #endif /* If we're at the right edge of a terminal that supports xn, we're --- readline-5.1/isearch.c +++ readline-5.1/isearch.c @@ -67,10 +67,6 @@ static _rl_search_cxt *_rl_isearch_init static void _rl_isearch_fini PARAMS((_rl_search_cxt *)); static int _rl_isearch_cleanup PARAMS((_rl_search_cxt *, int)); -/* Last line found by the current incremental search, so we don't `find' - identical lines many times in a row. */ -static char *prev_line_found; - /* Last search string and its length. */ static char *last_isearch_string; static int last_isearch_string_len; --- readline-5.1/misc.c +++ readline-5.1/misc.c @@ -212,6 +212,8 @@ rl_digit_loop () if (r <= 0 || (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)) break; } + + return 0; } /* Create a default argument. */ --- readline-5.1/readline.c +++ readline-5.1/readline.c @@ -85,7 +85,7 @@ static void bind_arrow_keys_internal PAR static void bind_arrow_keys PARAMS((void)); static void readline_default_bindings PARAMS((void)); -static void reset_default_bindings PARAMS((void)); +/* static void reset_default_bindings PARAMS((void)); */ static int _rl_subseq_result PARAMS((int, Keymap, int, int)); static int _rl_subseq_getchar PARAMS((int)); @@ -1054,6 +1054,7 @@ readline_default_bindings () /* Reset the default bindings for the terminal special characters we're interested in back to rl_insert and read the new ones. */ +/* Unused function static void reset_default_bindings () { @@ -1063,6 +1064,7 @@ reset_default_bindings () rl_tty_set_default_bindings (_rl_keymap); } } +*/ /* Bind some common arrow key sequences in MAP. */ static void --- readline-5.1/rltty.c +++ readline-5.1/rltty.c @@ -933,7 +933,6 @@ rltty_set_default_bindings (kmap) #if !defined (NO_TTY_DRIVER) TIOTYPE ttybuff; int tty; - static int called = 0; tty = fileno (rl_instream); --- readline-5.1/search.c +++ readline-5.1/search.c @@ -70,7 +70,6 @@ static int rl_history_search_pos; static char *history_search_string; static int history_string_size; -static UNDO_LIST *noninc_saved_undo_list; static void make_history_line_current PARAMS((HIST_ENTRY *)); static int noninc_search_from_pos PARAMS((char *, int, int)); static int noninc_dosearch PARAMS((char *, int)); --- readline-5.1/text.c +++ readline-5.1/text.c @@ -1239,7 +1239,7 @@ rl_change_case (count, op) #if defined (HANDLE_MULTIBYTE) wchar_t wc, nwc; char mb[MB_LEN_MAX+1]; - int mblen, p; + int mblen; mbstate_t ps; #endif --- readline-5.1/vi_mode.c +++ readline-5.1/vi_mode.c @@ -1111,7 +1111,7 @@ int rl_vi_rubout (count, key) int count, key; { - int p, opoint; + int opoint; if (count < 0) return (rl_vi_delete (-count, key));