From fcc980a5192e96261e78c9aaa423f1067640c4fa Mon Sep 17 00:00:00 2001 From: axel Date: Sun, 25 Sep 2005 05:55:58 +1000 Subject: [PATCH] Fix compiler warnings darcs-hash:20050924195558-ac50b-1ad53fa963f71ce5b4aa42490789add2a3d48ab3.gz --- builtin.c | 1 + builtin_set.c | 1 - highlight.c | 4 ---- input_common.c | 6 +++++- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin.c b/builtin.c index 6dd429ea6..e82ac8458 100644 --- a/builtin.c +++ b/builtin.c @@ -35,6 +35,7 @@ #include #include #include +#include #include "config.h" #include "util.h" diff --git a/builtin_set.c b/builtin_set.c index 20e9dfe81..b79ece134 100644 --- a/builtin_set.c +++ b/builtin_set.c @@ -224,7 +224,6 @@ static int fill_buffer_from_list(string_buffer_t *sb, array_list_t *list) static void print_variables(int include_values, int escape, int scope) { array_list_t names; - wchar_t **names_arr; int i; al_init( &names ); diff --git a/highlight.c b/highlight.c index 39385cad5..8630f464e 100644 --- a/highlight.c +++ b/highlight.c @@ -78,11 +78,7 @@ int highlight_get_color( int highlight ) return FISH_COLOR_NORMAL; } - int i; - int color; - return output_color_code( val ); - } diff --git a/input_common.c b/input_common.c index 0f92a314b..920fbbf43 100644 --- a/input_common.c +++ b/input_common.c @@ -175,12 +175,16 @@ wchar_t input_common_readch( int timed ) while(1) { wint_t b = readb(); + char bb; + int sz; if( b == R_NULL ) return R_NULL; - sz = mbrtowc( &res, &b, 1, &state ); + bb=b; + + sz = mbrtowc( &res, &bb, 1, &state ); switch( sz ) {